From adamg at pld-linux.org Mon Aug 22 00:14:37 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: mutt.spec - a year has passed, time for an integer release ... In-Reply-To: References: Message-ID: Author: adamg Date: Sun Aug 21 22:14:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - a year has passed, time for an integer release :) - release 9 ---- Files affected: SPECS: mutt.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.181 SPECS/mutt.spec:1.182 --- SPECS/mutt.spec:1.181 Sun Aug 21 21:38:55 2005 +++ SPECS/mutt.spec Mon Aug 22 00:14:31 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 8.1 +Release: 9 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/21 22:14:31 adamg +- a year has passed, time for an integer release :) +- release 9 + Revision 1.181 2005/08/21 19:38:55 saq - bump ncurses BR for ncursesw - paths.patch for deterministic build with{,out} external progs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.181&r2=1.182&f=u From cvs at pld-linux.org Mon Aug 22 02:31:23 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 09:13:59 2005 Subject: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Message-ID: <6326@svn.pld-linux.org> Author: qwiat Date: Mon Aug 22 02:31:20 2005 New Revision: 6326 Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Log: - garsc roznych poprawek nadajacych rece i nogi rozdzialowi Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec ============================================================================== --- PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec (original) +++ PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Mon Aug 22 02:31:20 2005 @@ -32,8 +32,22 @@ do niego za? prowadzi ??cze o nazwie initrd. - Uwaga! Opr?cz sterownika kontrolera b?dziemy musieli doda? - modu? obs?ugi systemu plik?w dla partycji "/". + Poni?ej przedstawiono trzy metody generowania initrd. W + wi?kszo?ci wypadk?w najwygodniejszy b?dzie pierwszy spos?b, w + przypadku dw?ch pozosta?ych musimy zna? nasz sprz?t i system + plik?w partycji "/" aby wskaza? nazwy w?a?ciwych modu??w. Dwie + ostatnie maj? jedn? zasadnicz? przewag?, mog? by? + przeprowadzane na dowolnej maszynie. + + + Opis wykrywania sprz?tu i dobierania w?a?ciwych modu??w + opisano w . Przy + tworzeniu initrd przewa?nie musimy skorzysta? z operacji + chroot-a, mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba + najwygodniejsze b?dzie u?ycie systemu uruchamianego z + p?yty CD np.: PLD-Live lub + RescueCD. Opis procedury chroot-a + z p?yty typu Live znajdziemy w . @@ -42,14 +56,11 @@
Automatyczne generowanie initrd - Ca?y proces mo?emy zautomatyzowa?, pod??czaj?c dysk do - docelowej maszyny, musimy wtedy pos?u?y? si? inn? dystrybucj? - i wykona? operacj? chroot-a - opis jak to zrobi? znajduje - si? tutaj . - Mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba - najwygodniejsze b?dzie u?ycie systemu uruchamianego z - p?yty CD np.: PLD-Live lub - RescueCD. + Przewa?nie sprz?t i u?ywany system plik?w partycji + "/" mog? zosta? wykryte automatycznie. Proces ten zaczynamy + od pod??czenia dysku twardego do docelowej maszyny i + pos?u?enia si? inn? dystrybucj? w celu wykonania operacji + chroot-a. Je?li zmieni?y si? nazwy urz?dze? masowych po pod??czeniu dysku @@ -85,13 +96,13 @@
R?czne generowanie initrd - Ta operacja mo?e by? przeprowadzona z dowolnego komputera, - je?li nie jest to macierzysta maszyna u?yjemy dowolnej + Je?li nie jest to macierzysta maszyna u?yjemy dowolnej dystrybucji i operacji chroot-a. Metoda ta wymaga precyzyjnej znajomo?ci u?ywanego sprz?tu i systemu plik?w, gdy? sami musimy wskaza? odpowiednie modu?y. Jest jednak konieczna, - np. w sytuacji problemu z automatycznym wykryciem wymaganych - sterownik?w. + w przypadku problem?w z automatycznym wykryciem wymaganych + sterownik?w lub je?li chcemy operacj? wykona? na innej + maszynie ni? docelowa. Mo?emy wpisa? list? koniecznych modu??w do odpowiedniej @@ -112,30 +123,11 @@ {$nowy_initrd} {$wersja_j?dra} - np.: - -# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7 - - Powy?sze wywo?anie wymusi dodanie dodatkowo modu??w obs?ugi + Poni?ej zamieszczono przyk?adowe wywo?anie geninitrd dla systemu plik?w ext3 i kontrolera IDE - PDC20268 firmy Promise. - -
- - -
- Generowanie uniwersalnego initrd - - Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe. - Mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? - modu??w przy pomocy opcji - --with - tak jak to - przedstawiono w powy?szym rozdziale. - Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e - to spowodowa? wolniejszy start systemu i niepotrzebne - zu?ycie pami?ci operacyjnej przez nieu?ywane - sterowniki. + PDC20268 firmy Promise: +# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7
@@ -210,6 +202,27 @@
+
+ Uwagi + + Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe, + mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? + modu??w. Aby to zrobi? mo?emy dopisa? nazwy modu??w do + przedstawionych poni?ej opcji w pliku + /etc/sysconfig/geninitrd: +## Basic modules to be loaded +BASICMODULES="" +## Modules that should be loaded before anything (i.e. jbd for ext3) +PREMODS="" + mo?emy te? u?y? opcji + --with programu geninitrd, lub doda? + dodatkowe modu?y przy "r?cznym" budowaniu obrazu. + Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e + to spowodowa? wolniejszy start systemu i niepotrzebne + zu?ycie pami?ci operacyjnej przez nieu?ywane + sterowniki. + +
From adamg at pld-linux.org Mon Aug 22 06:29:33 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: Net_SMTP-1.2.7.tgz Message-ID: <19691.1124684973@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_SMTP-1.2.7.tgz 11c4de943b07206aab6193eefd8f328e Net_SMTP-1.2.7.tgz Size: 10240 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: php-pear-Net_SMTP.spec - updated to 1.2.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.7 ---- Files affected: SPECS: php-pear-Net_SMTP.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_SMTP.spec diff -u SPECS/php-pear-Net_SMTP.spec:1.16 SPECS/php-pear-Net_SMTP.spec:1.17 --- SPECS/php-pear-Net_SMTP.spec:1.16 Sat Dec 4 14:21:59 2004 +++ SPECS/php-pear-Net_SMTP.spec Mon Aug 22 06:29:29 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - implementation of the SMTP protocol Summary(pl): %{_pearname} - implementacja protoko?u SMTP Name: php-pear-%{_pearname} -Version: 1.2.6 -Release: 2 +Version: 1.2.7 +Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 69bcb47d571b72060beed0a7d8d852a5 +# Source0-md5: 11c4de943b07206aab6193eefd8f328e URL: http://pear.php.net/package/Net_SMTP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 04:29:29 adamg +- updated to 1.2.7 + Revision 1.16 2004/12/04 13:21:59 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_SMTP.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Mon Aug 22 06:29:50 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: Mail-1.1.7.tgz Message-ID: <19805.1124684990@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.7.tgz f6307041810d18da6c6d04acdcc9b72a Mail-1.1.7.tgz Size: 16165 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.7 ---- Files affected: SPECS: php-pear-Mail.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.21 SPECS/php-pear-Mail.spec:1.22 --- SPECS/php-pear-Mail.spec:1.21 Fri Dec 3 23:22:53 2004 +++ SPECS/php-pear-Mail.spec Mon Aug 22 06:29:44 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.4 -Release: 2 +Version: 1.1.7 +Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 3e14fef5bd418de87214a3271ffc4549 +# Source0-md5: f6307041810d18da6c6d04acdcc9b72a URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 04:29:44 adamg +- updated to 1.1.7 + Revision 1.21 2004/12/03 22:22:53 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.21&r2=1.22&f=u From aredridel at pld-linux.org Mon Aug 22 07:18:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: nss-mdns-0.6.tar.gz Message-ID: <7846.1124687938@distfiles.pld-linux.org> Files fetched: 1 STORED: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.6.tar.gz 46e4e6c200ee9dc4a466be5ff9247fbd nss-mdns-0.6.tar.gz Size: 323682 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Mon Aug 22 07:18:51 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: nss_mdns.spec - up to 0.6 In-Reply-To: References: Message-ID: Author: aredridel Date: Mon Aug 22 05:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6 ---- Files affected: SPECS: nss_mdns.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/nss_mdns.spec diff -u SPECS/nss_mdns.spec:1.4 SPECS/nss_mdns.spec:1.5 --- SPECS/nss_mdns.spec:1.4 Fri Feb 4 19:54:12 2005 +++ SPECS/nss_mdns.spec Mon Aug 22 07:18:44 2005 @@ -2,12 +2,12 @@ Summary: mDNS Service Switch Module Summary(pl): Modu? NSS mDNS Name: nss_mdns -Version: 0.3 +Version: 0.6 Release: 1 -License: LGPL +License: LGPL v2.1 Group: Base Source0: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz -# Source0-md5: 8fae540908567a96c2c8d71d22ccf210 +# Source0-md5: 46e4e6c200ee9dc4a466be5ff9247fbd URL: http://0pointer.de/lennart/projects/nss-mdns/ BuildRequires: autoconf BuildRequires: automake @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 05:18:44 aredridel +- up to 0.6 + Revision 1.4 2005/02/04 18:54:12 matowy - up to 0.3, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nss_mdns.spec?r1=1.4&r2=1.5&f=u From adamg at pld-linux.org Mon Aug 22 08:52:42 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: grabcartoons.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:52:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: grabcartoons.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u /dev/null SPECS/grabcartoons.spec:1.1 --- /dev/null Mon Aug 22 08:52:42 2005 +++ SPECS/grabcartoons.spec Mon Aug 22 08:52:36 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +Summary: commic-summarizing utility +Name: grabcartoons +Version: 1.11 +Release: 0.1 +License: BSD +Group: Applications +Source0: http://dl.sourceforge.net/grabcartoons/%{name}-%{version}.tar.gz +# Source0-md5: 751234c5072bb4a65a8f8d9b1775cc8c +Patch0: %{name}-DESTDIR.patch +URL: http://grabcartoons.sourceforge.net/ +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +GrabCartoons is a comic-summarizing utility. It is modular, and it is +very easy to write modules for new comics. + +%prep +%setup -q +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + PREFIX=%{_prefix} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/* +/usr/lib/grabcartoons + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 06:52:36 adamg +- new + ================================================================ From adamg at pld-linux.org Mon Aug 22 08:52:44 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: grabcartoons-1.11.tar.gz Message-ID: <18171.1124693564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/grabcartoons/grabcartoons-1.11.tar.gz 751234c5072bb4a65a8f8d9b1775cc8c grabcartoons-1.11.tar.gz Size: 16881 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 08:53:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:13:59 2005 Subject: SOURCES: grabcartoons-DESTDIR.patch (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:53:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: grabcartoons-DESTDIR.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/grabcartoons-DESTDIR.patch diff -u /dev/null SOURCES/grabcartoons-DESTDIR.patch:1.1 --- /dev/null Mon Aug 22 08:53:05 2005 +++ SOURCES/grabcartoons-DESTDIR.patch Mon Aug 22 08:52:59 2005 @@ -0,0 +1,17 @@ +--- grabcartoons-1.11/Makefile~ 2004-05-18 11:33:59.000000000 +0200 ++++ grabcartoons-1.11/Makefile 2005-08-22 08:45:49.937799616 +0200 +@@ -8,10 +8,10 @@ + @echo "Valid Targets: install targz. Use with care." + + install: +- mkdir -p -m 755 $(PREFIX)/bin +- mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules +- install -m 755 grabcartoons.pl $(PREFIX)/bin +- install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/bin ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules ++ install -m 755 grabcartoons.pl $(DESTDIR)$(PREFIX)/bin ++ install -m 644 modules/*.pl $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules + + targz: + cd $(TARGZDIR); rm -rf grabcartoon*; cvs -d :ext:zamboni@cvs.sourceforge.net:/cvsroot/grabcartoons export -Dtoday -d grabcartoons-$(VERSION) grabcartoons; tar zcvf $(TARGZFILE) grabcartoons-$(VERSION) ================================================================ From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: amavisd-new.spec - updated to 2.3.3 - release 2 ( rel 1 is ... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:08:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.3 - release 2 ( rel 1 is for Ra ) ---- Files affected: SPECS: amavisd-new.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/amavisd-new.spec diff -u SPECS/amavisd-new.spec:1.88 SPECS/amavisd-new.spec:1.89 --- SPECS/amavisd-new.spec:1.88 Tue Aug 9 21:50:14 2005 +++ SPECS/amavisd-new.spec Mon Aug 22 09:08:24 2005 @@ -5,13 +5,13 @@ Summary: A Mail Virus Scanner with SpamAssassin support - daemon Summary(pl): Antywirusowy skaner poczty elektronicznej z obs?ug? SpamAssasina - demon Name: amavisd-new -Version: 2.3.2 +Version: 2.3.3 Release: 2 Epoch: 1 License: GPL Group: Applications/Mail Source0: http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz -# Source0-md5: 4af47f7e0b2aaf71bd5783dc26a576a8 +# Source0-md5: 0b02df514c1a2bf8af346bc9c7e97111 Source1: %{name}.init Source2: %{name}-milter.init Patch0: %{name}-config.patch @@ -183,6 +183,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/22 07:08:24 paszczus +- updated to 2.3.3 +- release 2 ( rel 1 is for Ra ) + Revision 1.88 2005/08/09 19:50:14 hawk - updated to 2.3.2 - works for me, release 2 (1 will go to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/amavisd-new.spec?r1=1.88&r2=1.89&f=u From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: amavisd-new-2.3.3.tar.gz Message-ID: <26767.1124694511@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ijs.si/software/amavisd/amavisd-new-2.3.3.tar.gz 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz Size: 772280 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:15:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: awstats.spec - use apache config triggers, rel 1.10 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:15:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use apache config triggers, rel 1.10 ---- Files affected: SPECS: awstats.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/awstats.spec diff -u SPECS/awstats.spec:1.37 SPECS/awstats.spec:1.38 --- SPECS/awstats.spec:1.37 Sun Aug 21 19:59:25 2005 +++ SPECS/awstats.spec Mon Aug 22 09:15:07 2005 @@ -10,7 +10,7 @@ Summary(pl): Zaawansowany program do analizowania log?w serwera Name: awstats Version: 6.5 -Release: 1.5 +Release: 1.10 License: GPL Group: Applications/Networking Source0: http://awstats.sourceforge.net/files/%{name}-%{version}.tgz @@ -22,6 +22,8 @@ Patch1: %{name}-created_dir_mode.patch URL: http://awstats.sourceforge.net/ BuildRequires: rpm-perlprov +BuildRequires: rpmbuild(macros) >= 1.221 +Requires(triggerpostun): sed >= 4.0 Requires: perl-Geo-IP Requires: perl-Time-HiRes Requires: perl-Storable @@ -76,47 +78,51 @@ mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/awstats.model.conf $RPM_BUILD_ROOT%{_sysconfdir}/awstats mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/{lang,lib,plugins} $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/awstats -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf ln -s %{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl $RPM_BUILD_ROOT%{_bindir} -%post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf +%clean +rm -rf $RPM_BUILD_ROOT + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/awstats/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + +%triggerpostun -- %{name} < 6.5-1.10 +# migrate from old config location (only apache2, as there was no apache1 support) +if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then + cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} + mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/awstats/apache.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf +fi + +# nuke very-old config location +if [ ! -d /etc/httpd/httpd.conf ]; then + sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi +# apache2 +if [ -d /etc/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/awstats/apache.conf /etc/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %doc README.TXT docs/* tools/webmin tools/xslt %dir %{_sysconfdir}/awstats -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/*.conf -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/awstats*.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/apache.conf %attr(640,root,root) /etc/cron.d/awstats %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/%{name} @@ -138,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/22 07:15:07 glen +- use apache config triggers, rel 1.10 + Revision 1.37 2005/08/21 17:59:25 jajcus - Release: 1.5 - Awstats is started with uid of stats. Parsing logs with root privileges is a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/awstats.spec?r1=1.37&r2=1.38&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: neon.spec - updated to 0.25.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:19:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.25.3 ---- Files affected: SPECS: neon.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/neon.spec diff -u SPECS/neon.spec:1.48 SPECS/neon.spec:1.49 --- SPECS/neon.spec:1.48 Wed Jul 6 21:39:39 2005 +++ SPECS/neon.spec Mon Aug 22 09:19:21 2005 @@ -6,12 +6,12 @@ Summary: An HTTP and WebDAV client library Summary(pl): Biblioteka kliencka HTTP i WebDAV Name: neon -Version: 0.24.7 -Release: 5 +Version: 0.25.3 +Release: 1 License: GPL Group: Libraries Source0: http://www.webdav.org/neon/%{name}-%{version}.tar.gz -# Source0-md5: 5108bcbe41de4afe2e19cc58500fb9f2 +# Source0-md5: 7f0f9fe66dd8349b2aff2d8ab4d8683b URL: http://www.webdav.org/neon/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -139,6 +139,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/22 07:19:21 paszczus +- updated to 0.25.3 + Revision 1.48 2005/07/06 19:39:39 arekm - br heimdal >= 0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/neon.spec?r1=1.48&r2=1.49&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: neon-0.25.3.tar.gz Message-ID: <531.1124695174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.webdav.org/neon/neon-0.25.3.tar.gz 7f0f9fe66dd8349b2aff2d8ab4d8683b neon-0.25.3.tar.gz Size: 730495 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:54:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: kde-splash-gartoon.spec - rel 0.2 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:54:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2 ---- Files affected: SPECS: kde-splash-gartoon.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.1 SPECS/kde-splash-gartoon.spec:1.2 --- SPECS/kde-splash-gartoon.spec:1.1 Sat Aug 20 21:41:00 2005 +++ SPECS/kde-splash-gartoon.spec Mon Aug 22 09:54:49 2005 @@ -4,7 +4,7 @@ Summary(pl): Ekran startowy KDE Name: kde-splash-%{_splash} Version: 0.1 -Release: 0.1 +Release: 0.2 License: GPL Group: X11/Amusements Source0: http://www.kde-look.org/content/files/20031-gartoonss.tar.gz @@ -40,6 +40,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 07:54:49 glen +- rel 0.2 + Revision 1.1 2005/08/20 19:41:00 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 10:09:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: PLD-doc: uid_gid.db.txt - register jserv (154) In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 08:09:18 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - register jserv (154) ---- Files affected: PLD-doc: uid_gid.db.txt (1.180 -> 1.181) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.180 PLD-doc/uid_gid.db.txt:1.181 --- PLD-doc/uid_gid.db.txt:1.180 Mon Aug 1 18:14:07 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 10:09:13 2005 @@ -166,6 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -328,6 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.180&r2=1.181&f=u From havner at pld-linux.org Mon Aug 22 10:17:15 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: openvpn.spec - dont use such releases ! In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:17:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - dont use such releases ! ---- Files affected: SPECS: openvpn.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.90 SPECS/openvpn.spec:1.91 --- SPECS/openvpn.spec:1.90 Fri Jul 22 11:15:00 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:17:08 2005 @@ -3,7 +3,7 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.7.1 +Release: 0.8 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/22 08:17:08 havner +- dont use such releases ! + Revision 1.90 2005/07/22 09:15:00 areq - 2.0.1_rc7 - lzo-2.01 ready ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.90&r2=1.91&f=u From havner at pld-linux.org Mon Aug 22 10:22:39 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: openvpn.spec - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:22:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ---- Files affected: SPECS: openvpn.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.91 SPECS/openvpn.spec:1.92 --- SPECS/openvpn.spec:1.91 Mon Aug 22 10:17:08 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:22:33 2005 @@ -3,11 +3,11 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.8 +Release: 1 License: GPL Group: Networking/Daemons -Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz -# Source0-md5: 258430d04413b430ceee6317f23c3b5f +Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz +# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version}_rc7 +%setup -q -n %{name}-%{version} %build %{__aclocal} @@ -93,6 +93,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/22 08:22:33 havner +- 2.0.1 final +- CAN-2005-2531, CAN-2005-2532 + Revision 1.91 2005/08/22 08:17:08 havner - dont use such releases ! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.91&r2=1.92&f=u From havner at pld-linux.org Mon Aug 22 10:22:47 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: openvpn-2.0.1.tar.gz Message-ID: <4959.1124698967@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.1.tar.gz fad7a08c0d68371c2c0e6428bcb98fa5 openvpn-2.0.1.tar.gz Size: 662428 bytes -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 10:46:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:13:59 2005 Subject: SOURCES (LINUX_2_6): dev-list, linux-static-dev.patch - revert /de... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 08:46:15 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - revert /dev/inotify minor change. ---- Files affected: SOURCES: dev-list (1.28 -> 1.29) , linux-static-dev.patch (1.1.6.2 -> 1.1.6.3) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.28 SOURCES/dev-list:1.29 --- SOURCES/dev-list:1.28 Fri Aug 19 16:58:17 2005 +++ SOURCES/dev-list Mon Aug 22 10:46:10 2005 @@ -3932,7 +3932,7 @@ %dev(c,185,1) %attr(600,root,root) /dev/intermezzo1 %dev(c,185,2) %attr(600,root,root) /dev/intermezzo2 %dev(c,185,3) %attr(600,root,root) /dev/intermezzo3 -%dev(c,10,62) %attr(444,root,root) /dev/inotify +%dev(c,10,61) %attr(444,root,root) /dev/inotify %dev(c,95,3) %attr(600,root,root) /dev/ipauth %dev(c,254,0) %attr(600,root,root) /dev/ipmi0 %dev(c,10,173) %attr(600,root,root) /dev/ipmikcs ================================================================ Index: SOURCES/linux-static-dev.patch diff -u SOURCES/linux-static-dev.patch:1.1.6.2 SOURCES/linux-static-dev.patch:1.1.6.3 --- SOURCES/linux-static-dev.patch:1.1.6.2 Fri Aug 19 16:58:17 2005 +++ SOURCES/linux-static-dev.patch Mon Aug 22 10:46:10 2005 @@ -5,7 +5,7 @@ if (misc->minor == MISC_DYNAMIC_MINOR) { - int i = DYNAMIC_MINORS; -+ int i = DYNAMIC_MINORS - 2 /* reserved */; ++ int i = DYNAMIC_MINORS - 3 /* reserved */; while (--i >= 0) if ( (misc_minors[i>>3] & (1 << (i&7))) == 0) break; @@ -27,7 +27,7 @@ static struct miscdevice inotify_device = { - .minor = MISC_DYNAMIC_MINOR, -+ .minor = 62 /* MISC_DYNAMIC_MINOR */, ++ .minor = 61 /* MISC_DYNAMIC_MINOR */, .name = "inotify", .fops = &inotify_fops, }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SOURCES/linux-static-dev.patch?r1=1.1.6.2&r2=1.1.6.3&f=u From glen at pld-linux.org Mon Aug 22 11:31:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: openvpn.spec - initscript is not config In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:31:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initscript is not config ---- Files affected: SPECS: openvpn.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.92 SPECS/openvpn.spec:1.93 --- SPECS/openvpn.spec:1.92 Mon Aug 22 10:22:33 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:31:14 2005 @@ -83,7 +83,7 @@ %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/openvpn %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name} -%attr(754,root,root) %config(noreplace) /etc/rc.d/init.d/%{name} +%attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man?/* %dir /var/run/openvpn @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/22 09:31:14 glen +- initscript is not config + Revision 1.92 2005/08/22 08:22:33 havner - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.92&r2=1.93&f=u From glen at pld-linux.org Mon Aug 22 11:33:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: openvpn.spec - simplify %prep In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:33:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - simplify %prep ---- Files affected: SPECS: openvpn.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.93 SPECS/openvpn.spec:1.94 --- SPECS/openvpn.spec:1.93 Mon Aug 22 11:31:14 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:33:20 2005 @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version} +%setup -q %build %{__aclocal} @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/22 09:33:20 glen +- simplify %prep + Revision 1.93 2005/08/22 09:31:14 glen - initscript is not config @@ -375,9 +378,9 @@ - doesn't seem to build on Ra (old automake/autoconf) Revision 1.2 2002/05/21 23:14:19 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.1 2002/03/25 12:03:11 misiek - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.93&r2=1.94&f=u From glen at pld-linux.org Mon Aug 22 11:48:00 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: PLD-doc: uid_gid.db.txt - corrections In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:48:00 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - corrections ---- Files affected: PLD-doc: uid_gid.db.txt (1.181 -> 1.182) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.181 PLD-doc/uid_gid.db.txt:1.182 --- PLD-doc/uid_gid.db.txt:1.181 Mon Aug 22 10:09:13 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 11:47:55 2005 @@ -166,7 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -329,7 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.181&r2=1.182&f=u From glen at pld-linux.org Mon Aug 22 12:21:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: mysql-connector-j.spec (NEW) - new In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:21:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: mysql-connector-j.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u /dev/null SPECS/mysql-connector-j.spec:1.1 --- /dev/null Mon Aug 22 12:21:35 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:21:26 2005 @@ -0,0 +1,70 @@ +# $Revision$, $Date$ +%bcond_without bindist # don't use binary distribution (not finished) +Summary: MySQL Connector/J +Name: mysql-connector-j +Version: 3.1.10 +Release: 0.1 +License: GPL v2+ + MySQL FLOSS Exception +Group: Libraries +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +# Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 +URL: http://www.mysql.com/products/connector/j/ +%{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL +and connect all corporate data, even in a heterogeneous environment. +MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC +feature set that supports the capabilities of MySQL. + +%package doc +Summary: Documentation for MySQL Connector/J +Group: Documentation + +%description doc +Documentation for MySQL Connector/J. + +%prep +%setup -q -n mysql-connector-java-%{version} +rm -f docs/README # duplicate + +%build +%{!?with_bindist:ant} + +%install +rm -rf $RPM_BUILD_ROOT + +%if %{with bindist} +install -d $RPM_BUILD_ROOT%{_javadir} +install mysql-connector-java-%{version}-bin.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java-%{version}.jar +ln -s mysql-connector-java-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java.jar +%else +%{error:not finished} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CHANGES EXCEPTIONS-CONNECTOR-J README +%{_javadir}/* + +%files doc +%defattr(644,root,root,755) +%doc docs + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:21:26 glen +- new + ================================================================ From glen at pld-linux.org Mon Aug 22 12:22:22 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: mysql-connector-j.spec - updated description In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:22:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated description ---- Files affected: SPECS: mysql-connector-j.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.1 SPECS/mysql-connector-j.spec:1.2 --- SPECS/mysql-connector-j.spec:1.1 Mon Aug 22 12:21:26 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:22:17 2005 @@ -22,6 +22,8 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. + %package doc Summary: Documentation for MySQL Connector/J Group: Documentation @@ -65,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:22:17 glen +- updated description + Revision 1.1 2005/08/22 10:21:26 glen - new ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 12:23:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <14816.1124706183@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <15411.1124706216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:29:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: mysql-connector-j.spec - adapterized, no extra subdir on -d... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:29:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterized, no extra subdir on -doc package ---- Files affected: SPECS: mysql-connector-j.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.2 SPECS/mysql-connector-j.spec:1.3 --- SPECS/mysql-connector-j.spec:1.2 Mon Aug 22 12:22:17 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:29:40 2005 @@ -6,7 +6,7 @@ Release: 0.1 License: GPL v2+ + MySQL FLOSS Exception Group: Libraries -Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/%{name}ava-%{version}.tar.gz # Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 URL: http://www.mysql.com/products/connector/j/ %{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} @@ -22,7 +22,7 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. -MySQL Connector/J is the official JDBC driver for MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. %package doc Summary: Documentation for MySQL Connector/J @@ -59,7 +59,7 @@ %files doc %defattr(644,root,root,755) -%doc docs +%doc docs/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -67,9 +67,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 10:29:40 glen +- adapterized, no extra subdir on -doc package + Revision 1.2 2005/08/22 10:22:17 glen - updated description Revision 1.1 2005/08/22 10:21:26 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.2&r2=1.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS (DEVEL): abiword.spec - verison 2.3.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 10:39:12 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - verison 2.3.5 ---- Files affected: SPECS: abiword.spec (1.106.2.2 -> 1.106.2.3) ---- Diffs: ================================================================ Index: SPECS/abiword.spec diff -u SPECS/abiword.spec:1.106.2.2 SPECS/abiword.spec:1.106.2.3 --- SPECS/abiword.spec:1.106.2.2 Tue Jul 26 00:19:22 2005 +++ SPECS/abiword.spec Mon Aug 22 12:39:04 2005 @@ -11,13 +11,13 @@ Summary: Multi-platform word processor Summary(pl): Wieloplatformowy procesor tekstu Name: abiword -Version: 2.3.4 +Version: 2.3.5 Release: 1 Epoch: 1 License: GPL Group: X11/Applications Source0: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2 -# Source0-md5: b205d8bb5240fdcb126daf8a7a9e45c8 +# Source0-md5: 2b2f2b5f5379b6dd7fe4145b3f7a28d4 Patch0: %{name}-desktop.patch Patch1: %{name}-home_etc.patch Patch2: %{name}-mailmerge.patch @@ -958,6 +958,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106.2.3 2005/08/22 10:39:04 aflinta +- verison 2.3.5 + Revision 1.106.2.2 2005/07/25 22:19:22 freetz - renumbered patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.106.2.2&r2=1.106.2.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: abiword-2.3.5.tar.bz2 Message-ID: <25708.1124707190@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.abisource.com/downloads/abiword/2.3.5/source/abiword-2.3.5.tar.bz2 2b2f2b5f5379b6dd7fe4145b3f7a28d4 abiword-2.3.5.tar.bz2 Size: 24112015 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:50 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:13:59 2005 Subject: DISTFILES: kchmviewer-1.0.tar.gz Message-ID: <29803.1124707550@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/kchmviewer/kchmviewer-1.0.tar.gz 0f9595cbb13eb950261e660c168dc033 kchmviewer-1.0.tar.gz Size: 558754 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:49 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: kchmviewer.spec (NEW) - init In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:45:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init ---- Files affected: SPECS: kchmviewer.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u /dev/null SPECS/kchmviewer.spec:1.1 --- /dev/null Mon Aug 22 12:45:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:45:44 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_with kde # enable KDE support +%bcond_without arts # build without aRts default=no +# +Summary: KchmViewer is a chm (MS HTML help file format) viewer +Name: kchmviewer +Version: 1.0 +Release: 0.6 +License: GPL v2 +Group: Applications/Publishing +Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz +# Source0-md5: 0f9595cbb13eb950261e660c168dc033 +URL: http://kchmviewer.sourceforge.net/ +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +%{?with_kde:BuildRequires: kdelibs-devel} +BuildRequires: qt-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget +library, and does not depend on KDE or Gnome. However, it may be +compiled with full KDE support, including KDE widgets and KIO/KHTML. + +%prep +%setup -q + +%build +%configure \ + %{?with_kde:--with-kde} + %{?without_arts:--without-arts} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc ChangeLog +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:45:44 spider +- init + ================================================================ From spider at pld-linux.org Mon Aug 22 12:47:54 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: kchmviewer.spec - missing br In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:47:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br ---- Files affected: SPECS: kchmviewer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.1 SPECS/kchmviewer.spec:1.2 --- SPECS/kchmviewer.spec:1.1 Mon Aug 22 12:45:44 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:47:49 2005 @@ -16,6 +16,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel +BuildRequires: zlib-devel %{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:47:49 spider +- missing br + Revision 1.1 2005/08/22 10:45:44 spider - init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.1&r2=1.2&f=u From havner at pld-linux.org Mon Aug 22 13:19:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: evolution-webcal.spec - rebuild against gnutls SONAME chang... In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:19:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gnutls SONAME change - rel 2 ---- Files affected: SPECS: evolution-webcal.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20 SPECS/evolution-webcal.spec:1.21 --- SPECS/evolution-webcal.spec:1.20 Wed Apr 13 21:25:21 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 13:19:20 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal Version: 2.2.1 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.2/%{name}-%{version}.tar.bz2 @@ -72,6 +72,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 11:19:20 havner +- rebuild against gnutls SONAME change +- rel 2 + Revision 1.20 2005/04/13 19:25:21 paladine - updated to 2.2.1 - new style macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20&r2=1.21&f=u From havner at pld-linux.org Mon Aug 22 13:53:12 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:13:59 2005 Subject: SPECS: gpc.spec - rebuild against gcc 3.3.6 - rel 2 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:53:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gcc 3.3.6 - rel 2 ---- Files affected: SPECS: gpc.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gpc.spec diff -u SPECS/gpc.spec:1.26 SPECS/gpc.spec:1.27 --- SPECS/gpc.spec:1.26 Mon Jun 20 10:17:40 2005 +++ SPECS/gpc.spec Mon Aug 22 13:53:05 2005 @@ -7,7 +7,7 @@ Summary(pl): Kompilator Pascala GNU Name: gpc Version: %{GPC_VERSION} -Release: 1 +Release: 2 License: GPL Group: Development/Languages Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/gcc-%{GCC_VERSION}.tar.bz2 @@ -151,6 +151,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 11:53:05 havner +- rebuild against gcc 3.3.6 +- rel 2 + Revision 1.26 2005/06/20 08:17:40 qboosh - use gcc 3.3.6 (gpc patch for 3.3.5 still applies) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpc.spec?r1=1.26&r2=1.27&f=u From adamg at pld-linux.org Mon Aug 22 14:11:41 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: abridge.spec, libcfu.spec, muttprint.spec, patchutils.spec, ... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:11:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: ---- Files affected: SPECS: abridge.spec (1.7 -> 1.8) , libcfu.spec (1.2 -> 1.3) , muttprint.spec (1.27 -> 1.28) , patchutils.spec (1.27 -> 1.28) , pcre.spec (1.62 -> 1.63) , php-pear-HTML_Template_IT.spec (1.17 -> 1.18) , php-pear-MDB2.spec (1.7 -> 1.8) , php.spec (1.464 -> 1.465) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.62&r2=1.63&f=u http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php.spec?r1=1.464&r2=1.465&f=u From adamg at pld-linux.org Mon Aug 22 14:13:38 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: abridge.spec - reverted last commit In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: abridge.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/abridge.spec diff -u SPECS/abridge.spec:1.8 SPECS/abridge.spec:1.9 --- SPECS/abridge.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/abridge.spec Mon Aug 22 14:13:33 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: wxGTK2-devel -BuildRequires: wxWidgets-devel +BuildRequires: wxWindows-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -34,7 +34,7 @@ %{__autoheader} %{__automake} %configure \ - --with-wx-config=/usr/bin/wx-gtk2-ansi-config + --with-wx-config=/usr/bin/wxgtk2-2.4-config %{__make} %install @@ -58,8 +58,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.9 2005/08/22 12:13:33 adamg +- reverted last commit Revision 1.7 2005/05/21 15:59:17 ankry - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.8&r2=1.9&f=u From adamg at pld-linux.org Mon Aug 22 14:15:09 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: libcfu.spec, muttprint.spec, patchutils.spec - reverted las... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:15:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: libcfu.spec (1.3 -> 1.4) , muttprint.spec (1.28 -> 1.29) , patchutils.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/libcfu.spec diff -u SPECS/libcfu.spec:1.3 SPECS/libcfu.spec:1.4 --- SPECS/libcfu.spec:1.3 Mon Aug 22 14:11:35 2005 +++ SPECS/libcfu.spec Mon Aug 22 14:15:03 2005 @@ -9,7 +9,6 @@ Source0: http://dl.sourceforge.net/libcfu/%{name}-%{version}.tar.bz2 # Source0-md5: 5e9e1a474119c8340509323f81c4c527 Patch0: %{name}-shared.patch -Patch1: %{name}-64bit.patch URL: http://www.sourceforge.net/projects/libcfu/ BuildRequires: autoconf BuildRequires: automake @@ -56,7 +55,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -110,8 +108,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.3 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.4 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.2 2005/08/02 22:07:17 qboosh - BR: ac,am,lt ================================================================ Index: SPECS/muttprint.spec diff -u SPECS/muttprint.spec:1.28 SPECS/muttprint.spec:1.29 --- SPECS/muttprint.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/muttprint.spec Mon Aug 22 14:15:03 2005 @@ -2,12 +2,12 @@ Summary: Formats the output of mail clients to a good-looking printing Summary(pl): Program formatuj?cy wyj?cie klient?w pocztowych w dobrze wygl?daj?cy wydruk Name: muttprint -Version: 0.72d +Version: 0.72c Release: 1 License: GPL Group: Applications/Printing Source0: http://dl.sourceforge.net/muttprint/%{name}-%{version}.tar.gz -# Source0-md5: cab04c11b7dfb29a9c3a6348a07b86a3 +# Source0-md5: b3e99f8f6f37c0711f6e20f8cf3ef6cb URL: http://muttprint.sourceforge.net/ Requires: perl-Text-Iconv Requires: psutils @@ -28,7 +28,7 @@ %{__make} -C langinfo clean %build -%{__make} \ +%{__make} -C langinfo \ CC="%{__cc}" \ CCFLAGS="%{rpmcflags}" @@ -90,8 +90,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2005/06/21 19:05:22 czucz - changed md5 ================================================================ Index: SPECS/patchutils.spec diff -u SPECS/patchutils.spec:1.28 SPECS/patchutils.spec:1.29 --- SPECS/patchutils.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/patchutils.spec Mon Aug 22 14:15:03 2005 @@ -5,12 +5,12 @@ Summary(ru): ????? ???????????? ??? ?????? ? patch-??????? Summary(uk): ????? ???????????? ??? ?????? ? patch-??????? Name: patchutils -Version: 0.2.31 +Version: 0.2.30 Release: 1 License: GPL Group: Applications/Text Source0: http://cyberelk.net/tim/data/%{name}/stable/%{name}-%{version}.tar.bz2 -# Source0-md5: 3aa902cb7a57a4aa09427de603ebf17b +# Source0-md5: 6a33888e34c23f7fde09a6e94e4f5950 Patch1: %{name}-fixcvsdiff.patch URL: http://cyberelk.net/tim/patchutils/ BuildRequires: autoconf @@ -170,8 +170,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2004/10/29 22:55:04 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.28&r2=1.29&f=u From adamg at pld-linux.org Mon Aug 22 14:17:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: pcre.spec - fixed previous changelog entry In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:17:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed previous changelog entry ---- Files affected: SPECS: pcre.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.63 SPECS/pcre.spec:1.64 --- SPECS/pcre.spec:1.63 Mon Aug 22 14:11:35 2005 +++ SPECS/pcre.spec Mon Aug 22 14:16:57 2005 @@ -275,8 +275,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.64 2005/08/22 12:16:57 adamg +- fixed previous changelog entry + Revision 1.63 2005/08/22 12:11:35 adamg -*** empty log message *** +- updated to 6.3 +- -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.63&r2=1.64&f=u From adamg at pld-linux.org Mon Aug 22 14:17:06 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: pcre-6.3.tar.bz2 Message-ID: <27121.1124713026@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.3.tar.bz2 e6779ead12cd20fa055fb3a05b004f2c pcre-6.3.tar.bz2 Size: 565852 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 14:23:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES: ApacheJServ.init - still not finished In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 12:23:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - still not finished ---- Files affected: SOURCES: ApacheJServ.init (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ.init diff -u SOURCES/ApacheJServ.init:1.1 SOURCES/ApacheJServ.init:1.2 --- SOURCES/ApacheJServ.init:1.1 Fri Aug 19 19:14:27 2005 +++ SOURCES/ApacheJServ.init Mon Aug 22 14:23:36 2005 @@ -27,14 +27,13 @@ exit 0 fi - # See how we were called. case "$1" in start) # Check if the service is already running? if [ ! -f /var/lock/subsys/jserv ]; then msg_starting jserv - daemon jserv + daemon --user jserv jserv RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/jserv else @@ -58,12 +57,10 @@ ;; reload) if [ -f /var/lock/subsys/jserv ]; then - # show "Reload %s service" jserv msg_reloading jserv killproc jserv -HUP RETVAL=$? else - # show "%s service is not running." jserv msg_not_running jserv >&2 RETVAL=7 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/ApacheJServ.init?r1=1.1&r2=1.2&f=u From pluto at pld-linux.org Mon Aug 22 15:00:56 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES: qt4-buildsystem.patch, qt4-tools.patch - updated for 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:00:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.0.1. ---- Files affected: SOURCES: qt4-buildsystem.patch (1.4 -> 1.5) , qt4-tools.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/qt4-buildsystem.patch diff -u SOURCES/qt4-buildsystem.patch:1.4 SOURCES/qt4-buildsystem.patch:1.5 --- SOURCES/qt4-buildsystem.patch:1.4 Mon May 16 14:39:06 2005 +++ SOURCES/qt4-buildsystem.patch Mon Aug 22 15:00:49 2005 @@ -15,15 +15,14 @@ --- qt-copy/tools/assistant/lib/lib.pro.orig 2005-05-13 16:39:04.000000000 +0200 +++ qt-copy/tools/assistant/lib/lib.pro 2005-05-13 20:21:32.014137768 +0200 -@@ -4,9 +4,9 @@ +@@ -4,9 +4,8 @@ VERSION = 1.0 CONFIG += qt warn_on --CONFIG += staticlib debug_and_release -+CONFIG += dll debug_and_release +-CONFIG += staticlib debug_and_release ++CONFIG += dll debug_and_release mac:unix:CONFIG += explicitlib -CONFIG -= dll -+ HEADERS = qassistantclient.h SOURCES = qassistantclient.cpp ================================================================ Index: SOURCES/qt4-tools.patch diff -u SOURCES/qt4-tools.patch:1.3 SOURCES/qt4-tools.patch:1.4 --- SOURCES/qt4-tools.patch:1.3 Thu Jun 16 21:20:09 2005 +++ SOURCES/qt4-tools.patch Mon Aug 22 15:00:50 2005 @@ -7,6 +7,6 @@ - porting + porting \ + qvfb - !contains(QT_PRODUCT, .*Console.*):SUBDIRS += designer + !contains(QT_EDITION, Console):SUBDIRS += designer unix:SUBDIRS += qtconfig } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qt4-buildsystem.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.3&r2=1.4&f=u From pluto at pld-linux.org Mon Aug 22 15:01:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: qt4.spec - updated to 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.0.1. ---- Files affected: SPECS: qt4.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.35 SPECS/qt4.spec:1.36 --- SPECS/qt4.spec:1.35 Tue Aug 16 12:02:06 2005 +++ SPECS/qt4.spec Mon Aug 22 15:01:45 2005 @@ -28,20 +28,18 @@ %define _withsql 1 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}} -%define _packager djurban - Summary: The Qt GUI application framework Summary(es): Biblioteca para ejecutar aplicaciones GUI Qt Summary(pl): Biblioteka Qt do tworzenia GUI Summary(pt_BR): Estrutura para rodar aplica??es GUI Qt Name: qt4 -Version: 4.0.0 +Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.3 +Release: 0.1 License: GPL/QPL Group: X11/Libraries -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-%{version}.tar.bz2 -# Source0-md5: a6183269fab293282daf2da9ac940577 +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz +# Source0-md5: 2db4a4d797d37d0605b776420327503a Source2: qtconfig.desktop Source3: designer.desktop Source4: assistant.desktop @@ -598,15 +596,15 @@ %prep #setup -q -n %{_name}-copy-%{_snap} -%setup -q -n qt-x11-opensource-desktop-%{version} +%setup -q -n qt-x11-opensource-src-%{version} %patch0 -p1 %if %{with dont_enable} %patch1 -p1 %patch3 -p1 %endif -%patch2 -p1 -b .niedakh -%patch4 -p1 -b .niedakh -%patch8 -p1 -b .niedakh +%patch2 -p1 +%patch4 -p1 +%patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -1137,6 +1135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/22 13:01:45 pluto +- updated to 4.0.1. + Revision 1.35 2005/08/16 10:02:06 prism - commas in cflags are allowed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.35&r2=1.36&f=u From pluto at pld-linux.org Mon Aug 22 15:02:44 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: qt-x11-opensource-src-4.0.1.tar.gz Message-ID: <27767.1124715764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.0.1.tar.gz 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz Size: 20141717 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 15:08:04 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: kchmviewer.spec - spaces -> tabs In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 13:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs ---- Files affected: SPECS: kchmviewer.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.2 SPECS/kchmviewer.spec:1.3 --- SPECS/kchmviewer.spec:1.2 Mon Aug 22 12:47:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 15:07:58 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_with kde # enable KDE support +%bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # Summary: KchmViewer is a chm (MS HTML help file format) viewer @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 13:07:58 spider +- spaces -> tabs + Revision 1.2 2005/08/22 10:47:49 spider - missing br ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.2&r2=1.3&f=u From saq at pld-linux.org Mon Aug 22 15:11:40 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES: mutt-paths.patch - fixed In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:11:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed ---- Files affected: SOURCES: mutt-paths.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mutt-paths.patch diff -u SOURCES/mutt-paths.patch:1.1 SOURCES/mutt-paths.patch:1.2 --- SOURCES/mutt-paths.patch:1.1 Sun Aug 21 21:38:05 2005 +++ SOURCES/mutt-paths.patch Mon Aug 22 15:11:35 2005 @@ -19,7 +19,7 @@ -ac_aux_path_sendmail=/usr/sbin:/usr/lib -AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail) -+SENDMAIL=/usr/sbin/sendmail ++ac_cv_path_SENDMAIL=/usr/sbin/sendmail AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) OPS='$(srcdir)/OPS' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mutt-paths.patch?r1=1.1&r2=1.2&f=u From saq at pld-linux.org Mon Aug 22 15:12:07 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: mutt.spec - rel 10 for fixed paths.patch In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:12:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for fixed paths.patch ---- Files affected: SPECS: mutt.spec (1.182 -> 1.183) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.182 SPECS/mutt.spec:1.183 --- SPECS/mutt.spec:1.182 Mon Aug 22 00:14:31 2005 +++ SPECS/mutt.spec Mon Aug 22 15:12:02 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 9 +Release: 10 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.183 2005/08/22 13:12:02 saq +- rel 10 for fixed paths.patch + Revision 1.182 2005/08/21 22:14:31 adamg - a year has passed, time for an integer release :) - release 9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.182&r2=1.183&f=u From paszczus at pld-linux.org Mon Aug 22 15:49:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: mldonkey-2.6.3.tar.bz2 Message-ID: <12316.1124718543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://savannah.nongnu.org/download/mldonkey/mldonkey-2.6.3.tar.bz2 5a71317970b0c5c2a50d3d4e98c14f41 mldonkey-2.6.3.tar.bz2 Size: 2660337 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 15:48:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: mldonkey.spec - updated to 2.6.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 13:48:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.3 ---- Files affected: SPECS: mldonkey.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.121 SPECS/mldonkey.spec:1.122 --- SPECS/mldonkey.spec:1.121 Thu Aug 11 17:33:56 2005 +++ SPECS/mldonkey.spec Mon Aug 22 15:48:54 2005 @@ -26,7 +26,7 @@ Name: mldonkey %define ocaml_ver 3.08.3 #%define patch_pack c -%define real_ver 2.6.1 +%define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} Version: %{real_ver} Release: 1 @@ -36,7 +36,7 @@ #Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.gz #Source0: http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/%{name}-%{real_ver}.tar.bz2 Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.bz2 -# Source0-md5: 193c397a0cb22391275054cebfaa5d8a +# Source0-md5: 5a71317970b0c5c2a50d3d4e98c14f41 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.sh @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 13:48:54 paszczus +- updated to 2.6.3 + Revision 1.121 2005/08/11 15:33:56 paszczus - removed 2 entries from TODO - added R: nc (small package, so no sense to move mldonkey_command to -utils) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.121&r2=1.122&f=u From matkor at pld-linux.org Mon Aug 22 16:03:14 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: kdetv.spec - Autoupdated to 0.8.8-0.1. Builds. Not tested. In-Reply-To: References: Message-ID: Author: matkor Date: Mon Aug 22 14:03:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Autoupdated to 0.8.8-0.1. Builds. Not tested. ---- Files affected: SPECS: kdetv.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/kdetv.spec diff -u SPECS/kdetv.spec:1.21 SPECS/kdetv.spec:1.22 --- SPECS/kdetv.spec:1.21 Fri Apr 29 14:16:40 2005 +++ SPECS/kdetv.spec Mon Aug 22 16:03:09 2005 @@ -2,12 +2,12 @@ Summary: KDE Video4Linux Stream Capture Viewer Summary(pl): Przegl?darka strumienia Video4Linux dla KDE Name: kdetv -Version: 0.8.7 -Release: 1 +Version: 0.8.8 +Release: 0.1 License: GPL Group: X11/Applications/Multimedia Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: e69c429497dc715b00f75fdada523fe7 +# Source0-md5: 587885b528b3b737d3bce07526b7f8e8 Patch0: %{name}.desktop.patch URL: http://www.kdetv.org/ BuildRequires: OpenGL-devel @@ -88,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 14:03:09 matkor +- Autoupdated to 0.8.8-0.1. Builds. Not tested. + Revision 1.21 2005/04/29 12:16:40 charles - updated to 0.8.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdetv.spec?r1=1.21&r2=1.22&f=u From matkor at pld-linux.org Mon Aug 22 16:04:27 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: kdetv-0.8.8.tar.bz2 Message-ID: <21004.1124719467@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dziegel.free.fr/releases/kdetv-0.8.8.tar.bz2 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 Size: 1184833 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: lighttpd-1.4.1.tar.gz Message-ID: <7434.1124720970@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.lighttpd.net/download/lighttpd-1.4.1.tar.gz 3abffbe574fd835721760a37c00d3714 lighttpd-1.4.1.tar.gz Size: 759063 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lighttpd.spec - 1.4.1 - reviewed dependencies - mod_webdav ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:29:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.1 - reviewed dependencies - mod_webdav subpackage due extra deps ---- Files affected: SPECS: lighttpd.spec (1.120 -> 1.121) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.120 SPECS/lighttpd.spec:1.121 --- SPECS/lighttpd.spec:1.120 Sat Aug 20 18:07:43 2005 +++ SPECS/lighttpd.spec Mon Aug 22 16:29:20 2005 @@ -2,7 +2,8 @@ # TODO: # - test ldap and mysql (failed at this time) # - mysql issue: http://www.freebsd.org/cgi/query-pr.cgi?pr=76866 -# - gdbm for mod_trigger_b4_dl http://www.lighttpd.net/documentation/trigger_b4_dl.html +# - fam over gamin is possible, just configure doesn't check other than gamin +# - lua50 isn't properly detected # # NOTES: # - fcgi-devel is only used for the test-scripts @@ -10,16 +11,19 @@ # see http://article.gmane.org/gmane.comp.web.lighttpd:722 # # Conditional build for lighttpd: -%bcond_without xattr # with support of extended attributes (doesn't compile in 1.4.0) -%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) -%bcond_without largefile # without largefile support (see notes above) -%bcond_without ssl # disable ssl support -%bcond_without mysql # without mysql -%bcond_with ldap # with ldap -%bcond_with lua # enable LUA support in mod_cml -%bcond_with memcache # enable memcached support in mod_cml / mod_trigger_b4_dl -%bcond_with valgrind # compile code with valgrind support. -%bcond_with dirhide # with 'hide from dirlisting' hack +%bcond_without xattr # support of extended attributes +%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) +%bcond_without largefile # largefile support (see notes above) +%bcond_without ssl # ssl support +%bcond_with mysql # mysql support in mod_mysql_vhost +%bcond_with ldap # ldap support in mod_auth +%bcond_with lua # LUA support in mod_cml +%bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl +%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gdbm # gdbm in mod_trigger_b4_dl +%bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) +%bcond_with valgrind # compile code with valgrind support. +%bcond_with dirhide # with 'hide from dirlisting' hack # Prerelease snapshot: DATE-TIME #define _snap 20050116-1743 @@ -30,17 +34,17 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 1 +%define _rel 0.1 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.0 +Version: 1.4.1 Release: %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)} Group: Networking/Daemons License: BSD Source0: %{_source} -# Source0-md5: 926a3603615c9edf5859977f1b8b6033 +# Source0-md5: 3abffbe574fd835721760a37c00d3714 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -54,12 +58,16 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bzip2-devel +%{?with_gamin:BuildRequires: gamin-devel} +%{?with_webdav_props:BuildRequires: sqlite3-devel} +%{?with_webdav_props:BuildRequires: libxml2-devel} BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} %{?with_lua:BuildRequires: lua50-devel} %{?with_memcache:BuildRequires: libmemcache-devel} +%{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel BuildRequires: rpmbuild(macros) >= 1.202 %{?debug:BuildRequires: valgrind} @@ -146,6 +154,28 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%package mod_webdav +Summary: WebDAV module for lighttpd +Group: Networking/Daemons +URL: http://www.lighttpd.net/documentation/webdav.html +Requires: %{name} = %{version}-%{release} + +%description mod_webdav +The WebDAV module is a very minimalistic implementation of RFC 2518. +Minimalistic means that not all operations are implementated yet. + +So far we have +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT + +and the usual GET, POST, HEAD from HTTP/1.1. + +So far mounting a webdav resource into Windows XP works and the basic +litmus tests are passed. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -166,21 +196,23 @@ %patch2 -p1 %build -sed -i -e 's#stat_cache_attr_get#stat_cache_entry_attr_get#g' src/stat_cache.c %{__libtoolize} %{__aclocal} %{__autoconf} %configure \ + %{!?with_ipv6:--disable-ipv6} \ + %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ %{?with_xattr:--with-attr} \ %{?with_mysql:--with-mysql} \ %{?with_ldap:--with-ldap} \ - %{!?with_ipv6:--disable-ipv6} \ - %{!?with_largefile:--disable-lfs} \ %{?with_ssl:--with-openssl} \ %{?with_lua:--with-lua} \ - %{?with_memcache:--with-memcache} + %{?with_memcache:--with-memcache} \ + %{?with_webdav_props:--with-webdav-props} \ + %{?with_gamin:--with-gamin} \ + %{?with_gdbm:--with-gdbm} %{__make} @@ -268,7 +300,6 @@ %attr(755,root,root) %{_libdir}/mod_status.so %attr(755,root,root) %{_libdir}/mod_userdir.so %attr(755,root,root) %{_libdir}/mod_usertrack.so -%attr(755,root,root) %{_libdir}/mod_webdav.so %attr(750,root,root) %dir /var/log/archiv/%{name} %dir %attr(750,lighttpd,root) /var/log/%{name} %attr(755,lighttpd,lighttpd) %{_lighttpddir} @@ -288,14 +319,20 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_cml.so +%if %{with mysql} %files mod_mysql_vhost %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_mysql_vhost.so +%endif %files mod_trigger_b4_dl %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_trigger_b4_dl.so +%files mod_webdav +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/mod_webdav.so + %files -n spawn-fcgi %defattr(644,root,root,755) %doc doc/spawn-php.sh @@ -307,6 +344,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.121 2005/08/22 14:29:20 glen +- 1.4.1 +- reviewed dependencies +- mod_webdav subpackage due extra deps + Revision 1.120 2005/08/20 16:07:43 arekm - reenable xattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.120&r2=1.121&f=u From paszczus at pld-linux.org Mon Aug 22 16:35:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: nmm.spec - sorted BR In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:35:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BR ---- Files affected: SPECS: nmm.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/nmm.spec diff -u SPECS/nmm.spec:1.11 SPECS/nmm.spec:1.12 --- SPECS/nmm.spec:1.11 Thu Aug 18 00:45:31 2005 +++ SPECS/nmm.spec Mon Aug 22 16:35:41 2005 @@ -15,11 +15,11 @@ BuildRequires: automake BuildRequires: avifile-devel BuildRequires: htmldoc -BuildRequires: libtool BuildRequires: libdivxdecore-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel BuildRequires: libshout-devel +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: lirc-devel BuildRequires: live @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 14:35:41 paszczus +- sorted BR + Revision 1.11 2005/08/17 22:45:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nmm.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Mon Aug 22 16:36:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lua50.spec - parallel make unfriendly make In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:36:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - parallel make unfriendly make ---- Files affected: SPECS: lua50.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.19 SPECS/lua50.spec:1.20 --- SPECS/lua50.spec:1.19 Thu Aug 11 11:46:18 2005 +++ SPECS/lua50.spec Mon Aug 22 16:36:22 2005 @@ -116,7 +116,7 @@ %{__make} clean %endif -%{__make} all so sobin \ +%{__make} -j1 all so sobin \ CC="%{__cc}" \ MYCFLAGS="%{rpmcflags} -fPIC" \ EXTRA_DEFS="-DPIC -D_GNU_SOURCE" @@ -185,6 +185,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:36:22 glen +- parallel make unfriendly make + Revision 1.19 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:43:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <19209.1124721809@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:43:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: rlocate.spec - updated to 0.3.2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:43:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.2 ---- Files affected: SPECS: rlocate.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.26 SPECS/rlocate.spec:1.27 --- SPECS/rlocate.spec:1.26 Tue May 31 09:22:46 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:43:26 2005 @@ -19,7 +19,7 @@ Summary: Finds files on a system via a central database Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate -Version: 0.3.1 +Version: 0.3.2 %define _rel 0.1 Release: %{_rel} License: GPL @@ -239,6 +239,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 14:43:26 paszczus +- updated to 0.3.2 + Revision 1.26 2005/05/31 07:22:46 glen - sgid rlocate the rlocate binary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.26&r2=1.27&f=u From blekot at pld-linux.org Mon Aug 22 16:50:11 2005 From: blekot at pld-linux.org (blekot) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: darkice.spec - BR: s/lame-libs-devel/lame-libs-static/ In-Reply-To: References: Message-ID: Author: blekot Date: Mon Aug 22 14:50:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: s/lame-libs-devel/lame-libs-static/ ---- Files affected: SPECS: darkice.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.19 SPECS/darkice.spec:1.20 --- SPECS/darkice.spec:1.19 Thu Oct 28 12:15:41 2004 +++ SPECS/darkice.spec Mon Aug 22 16:50:06 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-devel +BuildRequires: lame-libs-static BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:50:06 blekot +- BR: s/lame-libs-devel/lame-libs-static/ + Revision 1.19 2004/10/28 10:15:41 paladine - "MP3" unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:50:33 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <24301.1124722233@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:50:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: rlocate.spec - added init script (temporary from redhat) In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:50:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added init script (temporary from redhat) ---- Files affected: SPECS: rlocate.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.27 SPECS/rlocate.spec:1.28 --- SPECS/rlocate.spec:1.27 Mon Aug 22 16:43:26 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:50:29 2005 @@ -35,10 +35,11 @@ %endif BuildRequires: libtool BuildRequires: perl-base -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.228 Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(postun): /usr/sbin/groupdel +Requires(post,preun): /sbin/chkconfig Requires: crondaemon Provides: group(rlocate) Conflicts: slocate @@ -159,6 +160,8 @@ %install rm -rf $RPM_BUILD_ROOT +install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -197,6 +200,16 @@ %groupremove rlocate fi +%post init +/sbin/chkconfig --add %{name} +%service %{name} restart + +%preun init +if [ "$1" = "0" ]; then + %service -q %{name} stop + /sbin/chkconfig --del %{name} +fi + %if %{with kernel} %files -n kernel-misc-%{name} %defattr(644,root,root,755) @@ -211,6 +224,9 @@ %endif %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} + %if %{with userspace} %files %defattr(644,root,root,755) @@ -239,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/22 14:50:29 paszczus +- added init script (temporary from redhat) + Revision 1.27 2005/08/22 14:43:26 paszczus - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.27&r2=1.28&f=u From pawcioos at pld-linux.org Mon Aug 22 16:51:55 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: tomboy-0.3.3.tar.gz Message-ID: <25171.1124722315@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.beatniksoftware.com/tomboy/releases/tomboy-0.3.3.tar.gz 7ad987216b484f747f53aa7f9055a46b tomboy-0.3.3.tar.gz Size: 608252 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Mon Aug 22 16:51:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: tomboy.spec - updated to 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 14:51:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.3 ---- Files affected: SPECS: tomboy.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.8 SPECS/tomboy.spec:1.9 --- SPECS/tomboy.spec:1.8 Sun May 15 16:33:03 2005 +++ SPECS/tomboy.spec Mon Aug 22 16:51:48 2005 @@ -2,12 +2,12 @@ Summary: Tomboy - a desktop note-taking application Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy -Version: 0.3.2 +Version: 0.3.3 Release: 1 License: GPL Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz -# Source0-md5: cb4c48860601e636e075644c40b973de +# Source0-md5: 7ad987216b484f747f53aa7f9055a46b Source1: %{name}.desktop #Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ @@ -86,12 +86,14 @@ %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins +%{_libdir}/dbus-1.0/services/*.service %{_libdir}/%{name}/Plugins/*.dll %{_libdir}/bonobo/servers/* %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png +%{_pkgconfigdir}/tomboy-plugins.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -99,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 14:51:48 pawcioos +- updated to 0.3.3 + Revision 1.8 2005/05/15 14:33:03 pawcioos - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.8&r2=1.9&f=u From wolf at pld-linux.org Mon Aug 22 17:07:53 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: f-spot.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 15:07:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: f-spot.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.16 SPECS/f-spot.spec:1.17 --- SPECS/f-spot.spec:1.16 Sat Aug 20 00:16:32 2005 +++ SPECS/f-spot.spec Mon Aug 22 17:07:47 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot @@ -78,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 15:07:47 wolf +- mono auto deps + Revision 1.16 2005/08/19 22:16:32 aflinta - rebuild with better gtk-sharp ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.16&r2=1.17&f=u From paszczus at pld-linux.org Mon Aug 22 17:16:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: CVSROOT: users - chwilowo, gmail.com In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - chwilowo, gmail.com ---- Files affected: CVSROOT: users (1.384 -> 1.385) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.384 CVSROOT/users:1.385 --- CVSROOT/users:1.384 Wed Jul 20 18:40:45 2005 +++ CVSROOT/users Mon Aug 22 17:16:05 2005 @@ -167,7 +167,7 @@ osamyn:osamyn@easynet.be:Olivier Samyn paladine:paladine@pld-dc.org:Kamil Kosi?ski:paladine@chrome.pl pascalek:rafi@pers.pl:Rafa? Cygnarowski:pascalek79@jabber.org -paszczus:paszczus@darpa.pl:S?awomir Paszkiewicz:paszczus@pld-linux.org +paszczus:paszczus@gmail.com:S?awomir Paszkiewicz:paszczus@pld-linux.org patrys:patrys@pld-dc.org:Patryk Zawadzki:patrys@pld-linux.org pawcioos:pawcio-s@go2.pl:Pawe? Synowiec:pawcioos@pld-linux.org pawelb:pawelb@students.mimuw.edu.pl:Pawe? Boguszewski:pawelb@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.384&r2=1.385&f=u From glen at pld-linux.org Mon Aug 22 17:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES: lighttpd-lua-pkgconfig.patch (NEW) - use pkgconfig first ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:17:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use pkgconfig first to find lua, this way configure is able to pick up lua libs ---- Files affected: SOURCES: lighttpd-lua-pkgconfig.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-lua-pkgconfig.patch diff -u /dev/null SOURCES/lighttpd-lua-pkgconfig.patch:1.1 --- /dev/null Mon Aug 22 17:17:52 2005 +++ SOURCES/lighttpd-lua-pkgconfig.patch Mon Aug 22 17:17:46 2005 @@ -0,0 +1,61 @@ +--- ./configure.in 2005-08-22 13:56:17.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/configure.in 2005-08-22 18:03:23.000000000 +0300 +@@ -328,21 +328,35 @@ + + AC_MSG_RESULT($WITH_LUA) + if test "$WITH_LUA" != "no"; then ++ PKG_CHECK_MODULES(LUA, lua50, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ ++ if test $succeeded = no; then ++ PKG_CHECK_MODULES(LUA, lua, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ fi ++ ++ if test $succeeded = no; then + AC_PATH_PROG(LUACONFIG, lua-config) + if test x"$LUACONFIG" != x; then + LUA_CFLAGS=`$LUACONFIG --include` +- LUA_LIB=`$LUACONFIG --libs --extralibs` ++ LUA_LIBS=`$LUACONFIG --libs --extralibs` + else + AC_CHECK_LIB(lua, lua_open, [ + AC_CHECK_HEADERS([lua.h],[ +- LUA_LIB=-llua ++ LUA_LIBS=-llua + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + ]) + fi + AC_SUBST(LUA_CFLAGS) +- AC_SUBST(LUA_LIB) ++ AC_SUBST(LUA_LIBS) ++ fi + fi + + +@@ -511,7 +525,7 @@ + fi + + plugins="mod_cml" +-if test ! "x$LUA_LIB" = x; then ++if test ! "x$LUA_LIBS" = x; then + do_build="$do_build $plugins" + else + no_build="$no_build $plugins" +--- ./src/Makefile.am 2005-08-20 12:16:29.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/src/Makefile.am 2005-08-22 18:05:10.000000000 +0300 +@@ -78,7 +78,7 @@ + mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c + mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) + mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +-mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB) ++mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS) + + lib_LTLIBRARIES += mod_trigger_b4_dl.la + mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c ================================================================ From glen at pld-linux.org Mon Aug 22 17:18:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lighttpd.spec - add pkgconfig support for locating lua libs In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:18:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pkgconfig support for locating lua libs ---- Files affected: SPECS: lighttpd.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.121 SPECS/lighttpd.spec:1.122 --- SPECS/lighttpd.spec:1.121 Mon Aug 22 16:29:20 2005 +++ SPECS/lighttpd.spec Mon Aug 22 17:18:39 2005 @@ -9,6 +9,9 @@ # - fcgi-devel is only used for the test-scripts # - disable largefile, if you have 2.4 kernel to get sendfile() support, and don't need > 2GB file requests, # see http://article.gmane.org/gmane.comp.web.lighttpd:722 +# - please make subpackages of modules that depend other modules than: +# - pcre (core binary needs it too) +# - openssl (core binary needs it too) # # Conditional build for lighttpd: %bcond_without xattr # support of extended attributes @@ -19,7 +22,7 @@ %bcond_with ldap # ldap support in mod_auth %bcond_with lua # LUA support in mod_cml %bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl -%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" %bcond_with gdbm # gdbm in mod_trigger_b4_dl %bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) %bcond_with valgrind # compile code with valgrind support. @@ -34,7 +37,7 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 0.1 +%define _rel 0.4 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP @@ -53,6 +56,7 @@ Patch0: http://minghetti.ch/blob/dirlist-hide.patch Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch +Patch3: %{name}-lua-pkgconfig.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -65,7 +69,7 @@ %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} -%{?with_lua:BuildRequires: lua50-devel} +%{?with_lua:BuildRequires: lua50-devel >= 5.0.2-4.1} %{?with_memcache:BuildRequires: libmemcache-devel} %{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel @@ -194,11 +198,13 @@ %{?with_dirhide:%patch0 -p0} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} %{__aclocal} %{__autoconf} +%{__automake} %configure \ %{!?with_ipv6:--disable-ipv6} \ @@ -344,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 15:18:39 glen +- add pkgconfig support for locating lua libs + Revision 1.121 2005/08/22 14:29:20 glen - 1.4.1 - reviewed dependencies ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.121&r2=1.122&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:17 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: gnomebaker.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 15:19:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: gnomebaker.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/gnomebaker.spec diff -u SPECS/gnomebaker.spec:1.12 SPECS/gnomebaker.spec:1.13 --- SPECS/gnomebaker.spec:1.12 Tue Aug 16 17:10:39 2005 +++ SPECS/gnomebaker.spec Mon Aug 22 17:19:12 2005 @@ -2,12 +2,12 @@ Summary: GNOME program for creating CDs Summary(pl): Program dla GNOME do nagrywania p?yt CD Name: gnomebaker -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Multimedia Source0: http://dl.sourceforge.net/gnomebaker/%{name}-%{version}.tar.gz -# Source0-md5: 11bd141fc1f3a52729c4baeff3578899 +# Source0-md5: caac582ec6896a49cd76779e54ef6d3e Patch0: %{name}-desktop.patch URL: http://gnomebaker.sourceforge.net/ BuildRequires: autoconf @@ -106,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 15:19:12 pawcioos +- updated to 0.4.2 + Revision 1.12 2005/08/16 15:10:39 freetz - 0.4.1, updated banner, R: gst-gnomevfs, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnomebaker.spec?r1=1.12&r2=1.13&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:18 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: gnomebaker-0.4.2.tar.gz Message-ID: <11490.1124723958@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnomebaker/gnomebaker-0.4.2.tar.gz caac582ec6896a49cd76779e54ef6d3e gnomebaker-0.4.2.tar.gz Size: 761044 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 17:19:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lua50.spec - create lua50.pc. inspired from gentoo In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:19:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - create lua50.pc. inspired from gentoo ---- Files affected: SPECS: lua50.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.20 SPECS/lua50.spec:1.21 --- SPECS/lua50.spec:1.20 Mon Aug 22 16:36:22 2005 +++ SPECS/lua50.spec Mon Aug 22 17:19:20 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4 +Release: 4.1 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -148,6 +148,23 @@ install bin.static/luac $RPM_BUILD_ROOT%{_bindir}/luac50.static %endif +# create pkgconfig file +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +cat > $RPM_BUILD_ROOT%{_pkgconfigdir}/%{name}.pc <<'EOF' +prefix=%{_prefix} +exec_prefix=%{_exec_prefix} +includedir=%{_includedir}/%{name} +libdir=%{_libdir} +interpreter=%{_bindir}/%{name} +compiler=%{_bindir}/%{name} + +Name: Lua +Description: An extension programming language +Version: %{version} +Cflags: -I%{_includedir}/%{name} +Libs: -L%{_libdir} -llua50 -llualib50 -ldl -lm +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -168,6 +185,7 @@ %doc refman.ps.gz doc test %attr(755,root,root) %{_libdir}/lib*.so %{_includedir}/lua50 +%{_pkgconfigdir}/%{name}.pc %files static %defattr(644,root,root,755) @@ -185,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 15:19:20 glen +- create lua50.pc. inspired from gentoo + Revision 1.20 2005/08/22 14:36:22 glen - parallel make unfriendly make ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.20&r2=1.21&f=u From baggins at pld-linux.org Mon Aug 22 17:20:58 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: pam: configure.in, modules/pammodutil/modutil_cleanup.c, modules/p... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:20:58 2005 GMT Module: pam Tag: HEAD ---- Log message: - include config.h and check for required functions ---- Files affected: pam: configure.in (1.65 -> 1.66) pam/modules/pammodutil: modutil_cleanup.c (1.1 -> 1.2) , modutil_getgrgid.c (1.2 -> 1.3) , modutil_getgrnam.c (1.2 -> 1.3) , modutil_getlogin.c (1.4 -> 1.5) , modutil_getpwnam.c (1.3 -> 1.4) , modutil_getpwuid.c (1.3 -> 1.4) , modutil_getspnam.c (1.2 -> 1.3) , modutil_ingroup.c (1.1 -> 1.2) , modutil_ioloop.c (1.1 -> 1.2) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.65 pam/configure.in:1.66 --- pam/configure.in:1.65 Thu Jul 14 17:40:31 2005 +++ pam/configure.in Mon Aug 22 17:20:53 2005 @@ -173,7 +173,7 @@ AC_FUNC_MMAP AC_FUNC_VPRINTF AC_CHECK_FUNCS(gethostname gettimeofday mkdir select strcspn strdup strerror strspn strstr strtol) -AC_CHECK_FUNCS(getpwnam_r getgrnam_r) +AC_CHECK_FUNCS(getgrgid_r getpwuid_r getspnam_r getpwnam_r getgrnam_r getgrouplist) dnl Checks for libraries. ================================================================ Index: pam/modules/pammodutil/modutil_cleanup.c diff -u pam/modules/pammodutil/modutil_cleanup.c:1.1 pam/modules/pammodutil/modutil_cleanup.c:1.2 --- pam/modules/pammodutil/modutil_cleanup.c:1.1 Thu Mar 7 14:30:17 2002 +++ pam/modules/pammodutil/modutil_cleanup.c Mon Aug 22 17:20:53 2005 @@ -4,6 +4,8 @@ * This function provides a common pam_set_data() friendly version of free(). */ +#include "config.h" + #include "pammodutil.h" void _pammodutil_cleanup(pam_handle_t *pamh, void *data, int error_status) ================================================================ Index: pam/modules/pammodutil/modutil_getgrgid.c diff -u pam/modules/pammodutil/modutil_getgrgid.c:1.2 pam/modules/pammodutil/modutil_getgrgid.c:1.3 --- pam/modules/pammodutil/modutil_getgrgid.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrgid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getgrnam.c diff -u pam/modules/pammodutil/modutil_getgrnam.c:1.2 pam/modules/pammodutil/modutil_getgrnam.c:1.3 --- pam/modules/pammodutil/modutil_getgrnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getlogin.c diff -u pam/modules/pammodutil/modutil_getlogin.c:1.4 pam/modules/pammodutil/modutil_getlogin.c:1.5 --- pam/modules/pammodutil/modutil_getlogin.c:1.4 Mon Jul 11 16:58:44 2005 +++ pam/modules/pammodutil/modutil_getlogin.c Mon Aug 22 17:20:53 2005 @@ -6,6 +6,8 @@ * there. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwnam.c diff -u pam/modules/pammodutil/modutil_getpwnam.c:1.3 pam/modules/pammodutil/modutil_getpwnam.c:1.4 --- pam/modules/pammodutil/modutil_getpwnam.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwuid.c diff -u pam/modules/pammodutil/modutil_getpwuid.c:1.3 pam/modules/pammodutil/modutil_getpwuid.c:1.4 --- pam/modules/pammodutil/modutil_getpwuid.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwuid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getspnam.c diff -u pam/modules/pammodutil/modutil_getspnam.c:1.2 pam/modules/pammodutil/modutil_getspnam.c:1.3 --- pam/modules/pammodutil/modutil_getspnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getspnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ingroup.c diff -u pam/modules/pammodutil/modutil_ingroup.c:1.1 pam/modules/pammodutil/modutil_ingroup.c:1.2 --- pam/modules/pammodutil/modutil_ingroup.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ingroup.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * specified group. */ +#include "config.h" + #include "pammodutil.h" #include "include/security/_pam_modutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ioloop.c diff -u pam/modules/pammodutil/modutil_ioloop.c:1.1 pam/modules/pammodutil/modutil_ioloop.c:1.2 --- pam/modules/pammodutil/modutil_ioloop.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ioloop.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * write occurs. It handles EINTR and partial read/write returns. */ +#include "config.h" + #include #include ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.65&r2=1.66&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_cleanup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrgid.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getlogin.c?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwnam.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwuid.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getspnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ingroup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ioloop.c?r1=1.1&r2=1.2&f=u From baggins at pld-linux.org Mon Aug 22 17:21:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: pam: configure.in - 0.80.1 In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:21:17 2005 GMT Module: pam Tag: HEAD ---- Log message: - 0.80.1 ---- Files affected: pam: configure.in (1.66 -> 1.67) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.66 pam/configure.in:1.67 --- pam/configure.in:1.66 Mon Aug 22 17:20:53 2005 +++ pam/configure.in Mon Aug 22 17:21:12 2005 @@ -5,7 +5,7 @@ PAM_MAJOR_VERSION=0 PAM_MINOR_VERSION=80 -PAM_MICRO_VERSION=0 +PAM_MICRO_VERSION=1 PAM_VERSION=$PAM_MAJOR_VERSION.$PAM_MINOR_VERSION.$PAM_MICRO_VERSION PAM_VERSION_INFO=$PAM_MINOR_VERSION:$PAM_MAJOR_VERSION:$PAM_MINOR_VERSION ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.66&r2=1.67&f=u From glen at pld-linux.org Mon Aug 22 17:22:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lua50.spec - rel 5 with included pkgconfig. STBR aswell In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:22:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 5 with included pkgconfig. STBR aswell ---- Files affected: SPECS: lua50.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.21 SPECS/lua50.spec:1.22 --- SPECS/lua50.spec:1.21 Mon Aug 22 17:19:20 2005 +++ SPECS/lua50.spec Mon Aug 22 17:22:21 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4.1 +Release: 5 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 15:22:21 glen +- rel 5 with included pkgconfig. STBR aswell + Revision 1.21 2005/08/22 15:19:20 glen - create lua50.pc. inspired from gentoo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Mon Aug 22 17:27:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: lua50.spec - fix compiler path in pkgconfig file In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:27:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix compiler path in pkgconfig file ---- Files affected: SPECS: lua50.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.22 SPECS/lua50.spec:1.23 --- SPECS/lua50.spec:1.22 Mon Aug 22 17:22:21 2005 +++ SPECS/lua50.spec Mon Aug 22 17:27:36 2005 @@ -156,7 +156,7 @@ includedir=%{_includedir}/%{name} libdir=%{_libdir} interpreter=%{_bindir}/%{name} -compiler=%{_bindir}/%{name} +compiler=%{_bindir}/luac50 Name: Lua Description: An extension programming language @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/22 15:27:36 glen +- fix compiler path in pkgconfig file + Revision 1.22 2005/08/22 15:22:21 glen - rel 5 with included pkgconfig. STBR aswell ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.22&r2=1.23&f=u From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <5715.1124725884@distfiles.pld-linux.org> wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: pam.spec - 0.80.1 - fix modules miscompile due to lack of i... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:51:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.80.1 - fix modules miscompile due to lack of includes ---- Files affected: SPECS: pam.spec (1.223 -> 1.224) ---- Diffs: ================================================================ Index: SPECS/pam.spec diff -u SPECS/pam.spec:1.223 SPECS/pam.spec:1.224 --- SPECS/pam.spec:1.223 Thu Aug 11 11:46:18 2005 +++ SPECS/pam.spec Mon Aug 22 17:51:18 2005 @@ -21,13 +21,13 @@ Summary(tr): Mod?ler, art?msal do?rulama birimleri Summary(uk): ??????????, ?? ?????????? ?????????????? ??? ??????? Name: pam -Version: 0.80.0 +Version: 0.80.1 Release: 1 Epoch: 0 License: GPL or BSD Group: Base Source0: ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{version}.tar.gz -# Source0-md5: 330683490b44e2fe584efb0b1bf52fbd +# Source0-md5: df374f625e7178f43a263a32e376dd46 Source1: system-auth.pamd URL: http://www.kernel.org/pub/linux/libs/pam/ BuildRequires: bison @@ -446,6 +446,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.224 2005/08/22 15:51:18 baggins +- 0.80.1 +- fix modules miscompile due to lack of includes + Revision 1.223 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.223&r2=1.224&f=u From baggins at pld-linux.org Mon Aug 22 17:52:38 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <6541.1124725958@distfiles.pld-linux.org> wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 17:58:11 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: mldonkey.spec - ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:58:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ocaml 3.08.4 ---- Files affected: SPECS: mldonkey.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.122 SPECS/mldonkey.spec:1.123 --- SPECS/mldonkey.spec:1.122 Mon Aug 22 15:48:54 2005 +++ SPECS/mldonkey.spec Mon Aug 22 17:58:04 2005 @@ -24,7 +24,7 @@ Summary: eDonkey 2000 p2p network client Summary(pl): Klient sieci p2p eDonkey 2000 Name: mldonkey -%define ocaml_ver 3.08.3 +%define ocaml_ver 3.08.4 #%define patch_pack c %define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/22 15:58:04 paszczus +- ocaml 3.08.4 + Revision 1.122 2005/08/22 13:48:54 paszczus - updated to 2.6.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.122&r2=1.123&f=u From spider at pld-linux.org Mon Aug 22 18:05:14 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: idesk.spec - extended description In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 16:05:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - extended description ---- Files affected: SPECS: idesk.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.16 SPECS/idesk.spec:1.17 --- SPECS/idesk.spec:1.16 Mon Aug 8 17:49:04 2005 +++ SPECS/idesk.spec Mon Aug 22 18:05:09 2005 @@ -21,7 +21,11 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not -provided by all window managers. +provided by all window managers. The icon graphics are either from a +png or svg (vector) file and support some eyecandy effects like +transparency. Each icon can be confgured to run one or more shell +commands and the actions which run those commands are completely +configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie @@ -60,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 16:05:09 spider +- extended description + Revision 1.16 2005/08/08 15:49:04 kolodko - up to 0.7.3, fixed bug with CaptionTip - rm Makefile patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.16&r2=1.17&f=u From baggins at pld-linux.org Mon Aug 22 18:13:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <20370.1124727183@distfiles.pld-linux.org> wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 18:14:30 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES (LINUX_2_6): bootsplash-3.1.6-2.6.12.diff (NEW) - official... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:14:30 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - official bootsplash patch + minor rework. ---- Files affected: SOURCES: bootsplash-3.1.6-2.6.12.diff (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/bootsplash-3.1.6-2.6.12.diff diff -u /dev/null SOURCES/bootsplash-3.1.6-2.6.12.diff:1.1.2.1 --- /dev/null Mon Aug 22 18:14:30 2005 +++ SOURCES/bootsplash-3.1.6-2.6.12.diff Mon Aug 22 18:14:25 2005 @@ -0,0 +1,2788 @@ +diff -urN linux-2.6.12/drivers/char/keyboard.c linux-2.6.12-bootsplash/drivers/char/keyboard.c +--- linux-2.6.12/drivers/char/keyboard.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/keyboard.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1063,6 +1063,15 @@ + if (keycode < BTN_MISC) + printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode); + ++#ifdef CONFIG_BOOTSPLASH ++ /* This code has to be redone for some non-x86 platforms */ ++ if (down == 1 && (keycode == 0x3c || keycode == 0x01)) { /* F2 and ESC on PC keyboard */ ++ extern int splash_verbose(void); ++ if (splash_verbose()) ++ return; ++ } ++#endif ++ + #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ + if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) { + sysrq_down = down; +diff -urN linux-2.6.12/drivers/char/n_tty.c linux-2.6.12-bootsplash/drivers/char/n_tty.c +--- linux-2.6.12/drivers/char/n_tty.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/n_tty.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1299,6 +1299,15 @@ + tty->minimum_to_wake = (minimum - (b - buf)); + + if (!input_available_p(tty, 0)) { ++#ifdef CONFIG_BOOTSPLASH ++ if (file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,1) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,1)) { ++ extern int splash_verbose(void); ++ (void)splash_verbose(); ++ } ++#endif + if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { + retval = -EIO; + break; +diff -urN linux-2.6.12/drivers/char/vt.c linux-2.6.12-bootsplash/drivers/char/vt.c +--- linux-2.6.12/drivers/char/vt.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/vt.c 2005-06-18 09:22:11.000000000 +0200 +@@ -3221,6 +3221,31 @@ + } + } + ++#ifdef CONFIG_BOOTSPLASH ++void con_remap_def_color(struct vc_data *vc, int new_color) ++{ ++ unsigned short *sbuf = vc->vc_screenbuf; ++ unsigned c, len = vc->vc_screenbuf_size >> 1; ++ int old_color; ++ ++ if (sbuf) { ++ old_color = vc->vc_def_color << 8; ++ new_color <<= 8; ++ while(len--) { ++ c = *sbuf; ++ if (((c ^ old_color) & 0xf000) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0xf000; ++ if (((c ^ old_color) & 0x0f00) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0x0f00; ++ sbuf++; ++ } ++ new_color >>= 8; ++ } ++ vc->vc_def_color = vc->vc_color = new_color; ++ update_attr(vc); ++} ++#endif ++ + /* + * Visible symbols for modules + */ +diff -urN linux-2.6.12/drivers/video/bootsplash/bootsplash.c linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c +--- linux-2.6.12/drivers/video/bootsplash/bootsplash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c 2005-06-18 09:22:11.000000000 +0200 +@@ -0,0 +1,984 @@ ++/* ++ * linux/drivers/video/bootsplash/bootsplash.c - ++ * splash screen handling functions. ++ * ++ * (w) 2001-2004 by Volker Poplawski, , ++ * Stefan Reinauer, , ++ * Steffen Winterfeldt, , ++ * Michael Schroeder ++ * ++ * Ideas & SuSE screen work by Ken Wimer, ++ * ++ * For more information on this code check http://www.bootsplash.org/ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "../console/fbcon.h" ++#include "bootsplash.h" ++#include "decode-jpg.h" ++ ++/* extern struct fb_ops vesafb_ops; */ ++extern signed char con2fb_map[MAX_NR_CONSOLES]; ++ ++#define SPLASH_VERSION "3.1.6-2004/03/31" ++ ++/* These errors have to match fbcon-jpegdec.h */ ++static unsigned char *jpg_errors[] = { ++ "no SOI found", ++ "not 8 bit", ++ "height mismatch", ++ "width mismatch", ++ "bad width or height", ++ "too many COMPPs", ++ "illegal HV", ++ "quant table selector", ++ "picture is not YCBCR 221111", ++ "unknow CID in scan", ++ "dct not sequential", ++ "wrong marker", ++ "no EOI", ++ "bad tables", ++ "depth mismatch" ++}; ++ ++static struct jpeg_decdata *decdata = 0; /* private decoder data */ ++ ++static int splash_registered = 0; ++static int splash_usesilent = 0; /* shall we display the silentjpeg? */ ++int splash_default = 0xf01; ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth); ++ ++static int __init splash_setup(char *options) ++{ ++ if(!strncmp("silent", options, 6)) { ++ printk(KERN_INFO "bootsplash: silent mode.\n"); ++ splash_usesilent = 1; ++ /* skip "silent," */ ++ if (strlen(options) == 6) ++ return 0; ++ options += 7; ++ } ++ if(!strncmp("verbose", options, 7)) { ++ printk(KERN_INFO "bootsplash: verbose mode.\n"); ++ splash_usesilent = 0; ++ return 0; ++ } ++ splash_default = simple_strtoul(options, NULL, 0); ++ return 0; ++} ++ ++__setup("splash=", splash_setup); ++ ++ ++static int splash_hasinter(unsigned char *buf, int num) ++{ ++ unsigned char *bufend = buf + num * 12; ++ while(buf < bufend) { ++ if (buf[1] > 127) /* inter? */ ++ return 1; ++ buf += buf[3] > 127 ? 24 : 12; /* blend? */ ++ } ++ return 0; ++} ++ ++static int boxextract(unsigned char *buf, unsigned short *dp, unsigned char *cols, int *blendp) ++{ ++ dp[0] = buf[0] | buf[1] << 8; ++ dp[1] = buf[2] | buf[3] << 8; ++ dp[2] = buf[4] | buf[5] << 8; ++ dp[3] = buf[6] | buf[7] << 8; ++ *(unsigned int *)(cols + 0) = ++ *(unsigned int *)(cols + 4) = ++ *(unsigned int *)(cols + 8) = ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 8); ++ if (dp[1] > 32767) { ++ dp[1] = ~dp[1]; ++ *(unsigned int *)(cols + 4) = *(unsigned int *)(buf + 12); ++ *(unsigned int *)(cols + 8) = *(unsigned int *)(buf + 16); ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 20); ++ *blendp = 1; ++ return 24; ++ } ++ return 12; ++} ++ ++static void boxit(unsigned char *pic, int bytes, unsigned char *buf, int num, int percent, int overpaint) ++{ ++ int x, y, i, p, doblend, r, g, b, a, add; ++ unsigned short data1[4]; ++ unsigned char cols1[16]; ++ unsigned short data2[4]; ++ unsigned char cols2[16]; ++ unsigned char *bufend; ++ unsigned short *picp; ++ unsigned int stipple[32], sti, stin, stinn, stixs, stixe, stiys, stiye; ++ int xs, xe, ys, ye, xo, yo; ++ ++ if (num == 0) ++ return; ++ bufend = buf + num * 12; ++ stipple[0] = 0xffffffff; ++ stin = 1; ++ stinn = 0; ++ stixs = stixe = 0; ++ stiys = stiye = 0; ++ while(buf < bufend) { ++ doblend = 0; ++ buf += boxextract(buf, data1, cols1, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32767) { ++ /* box stipple */ ++ if (stinn == 32) ++ continue; ++ if (stinn == 0) { ++ stixs = data1[2]; ++ stixe = data1[3]; ++ stiys = stiye = 0; ++ } else if (stinn == 4) { ++ stiys = data1[2]; ++ stiye = data1[3]; ++ } ++ stipple[stinn++] = (cols1[ 0] << 24) | (cols1[ 1] << 16) | (cols1[ 2] << 8) | cols1[ 3] ; ++ stipple[stinn++] = (cols1[ 4] << 24) | (cols1[ 5] << 16) | (cols1[ 6] << 8) | cols1[ 7] ; ++ stipple[stinn++] = (cols1[ 8] << 24) | (cols1[ 9] << 16) | (cols1[10] << 8) | cols1[11] ; ++ stipple[stinn++] = (cols1[12] << 24) | (cols1[13] << 16) | (cols1[14] << 8) | cols1[15] ; ++ stin = stinn; ++ continue; ++ } ++ stinn = 0; ++ if (data1[0] > 32767) ++ buf += boxextract(buf, data2, cols2, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32766) { ++ /* box copy */ ++ i = 12 * (short)data1[3]; ++ doblend = 0; ++ i += boxextract(buf + i, data1, cols1, &doblend); ++ if (data1[0] > 32767) ++ boxextract(buf + i, data2, cols2, &doblend); ++ } ++ if (data1[0] == 32767) ++ continue; ++ if (data1[2] > 32767) { ++ if (overpaint) ++ continue; ++ data1[2] = ~data1[2]; ++ } ++ if (data1[3] > 32767) { ++ if (percent == 65536) ++ continue; ++ data1[3] = ~data1[3]; ++ } ++ if (data1[0] > 32767) { ++ data1[0] = ~data1[0]; ++ for (i = 0; i < 4; i++) ++ data1[i] = (data1[i] * (65536 - percent) + data2[i] * percent) >> 16; ++ for (i = 0; i < 16; i++) ++ cols1[i] = (cols1[i] * (65536 - percent) + cols2[i] * percent) >> 16; ++ } ++ *(unsigned int *)cols2 = *(unsigned int *)cols1; ++ a = cols2[3]; ++ if (a == 0 && !doblend) ++ continue; ++ ++ if (stixs >= 32768) { ++ xo = xs = (stixs ^ 65535) + data1[0]; ++ xe = stixe ? stixe + data1[0] : data1[2]; ++ } else if (stixe >= 32768) { ++ xs = stixs ? data1[2] - stixs : data1[0]; ++ xe = data1[2] - (stixe ^ 65535); ++ xo = xe + 1; ++ } else { ++ xo = xs = stixs; ++ xe = stixe ? stixe : data1[2]; ++ } ++ if (stiys >= 32768) { ++ yo = ys = (stiys ^ 65535) + data1[1]; ++ ye = stiye ? stiye + data1[1] : data1[3]; ++ } else if (stiye >= 32768) { ++ ys = stiys ? data1[3] - stiys : data1[1]; ++ ye = data1[3] - (stiye ^ 65535); ++ yo = ye + 1; ++ } else { ++ yo = ys = stiys; ++ ye = stiye ? stiye : data1[3]; ++ } ++ xo = 32 - (xo & 31); ++ yo = stin - (yo % stin); ++ if (xs < data1[0]) ++ xs = data1[0]; ++ if (xe > data1[2]) ++ xe = data1[2]; ++ if (ys < data1[1]) ++ ys = data1[1]; ++ if (ye > data1[3]) ++ ye = data1[3]; ++ ++ for (y = ys; y <= ye; y++) { ++ sti = stipple[(y + yo) % stin]; ++ x = (xs + xo) & 31; ++ if (x) ++ sti = (sti << x) | (sti >> (32 - x)); ++ if (doblend) { ++ if ((p = data1[3] - data1[1]) != 0) ++ p = ((y - data1[1]) << 16) / p; ++ for (i = 0; i < 8; i++) ++ cols2[i + 8] = (cols1[i] * (65536 - p) + cols1[i + 8] * p) >> 16; ++ } ++ add = (xs & 1); ++ add ^= (add ^ y) & 1 ? 1 : 3; /* 2x2 ordered dithering */ ++ picp = (unsigned short *)(pic + xs * 2 + y * bytes); ++ for (x = xs; x <= xe; x++) { ++ if (!(sti & 0x80000000)) { ++ sti <<= 1; ++ picp++; ++ add ^= 3; ++ continue; ++ } ++ sti = (sti << 1) | 1; ++ if (doblend) { ++ if ((p = data1[2] - data1[0]) != 0) ++ p = ((x - data1[0]) << 16) / p; ++ for (i = 0; i < 4; i++) ++ cols2[i] = (cols2[i + 8] * (65536 - p) + cols2[i + 12] * p) >> 16; ++ a = cols2[3]; ++ } ++ r = cols2[0]; ++ g = cols2[1]; ++ b = cols2[2]; ++ if (a != 255) { ++ i = *picp; ++ r = ((i >> 8 & 0xf8) * (255 - a) + r * a) / 255; ++ g = ((i >> 3 & 0xfc) * (255 - a) + g * a) / 255; ++ b = ((i << 3 & 0xf8) * (255 - a) + b * a) / 255; ++ } ++ #define CLAMP(x) ((x) >= 256 ? 255 : (x)) ++ i = ((CLAMP(r + add*2+1) & 0xf8) << 8) | ++ ((CLAMP(g + add ) & 0xfc) << 3) | ++ ((CLAMP(b + add*2+1) ) >> 3); ++ *picp++ = i; ++ add ^= 3; ++ } ++ } ++ } ++} ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth) ++{ ++ int size, err; ++ unsigned char *mem; ++ ++ size = ((width + 15) & ~15) * ((height + 15) & ~15) * (depth >> 3); ++ mem = vmalloc(size); ++ if (!mem) { ++ printk(KERN_INFO "bootsplash: no memory for decoded picture.\n"); ++ return -1; ++ } ++ if (!decdata) ++ decdata = vmalloc(sizeof(*decdata)); ++ if ((err = jpeg_decode(jpeg, mem, ((width + 15) & ~15), ((height + 15) & ~15), depth, decdata))) ++ printk(KERN_INFO "bootsplash: error while decompressing picture: %s (%d)\n",jpg_errors[err - 1], err); ++ vfree(mem); ++ return err ? -1 : 0; ++} ++ ++static void splash_free(struct vc_data *vc, struct fb_info *info) ++{ ++ if (!vc->vc_splash_data) ++ return; ++ if (info->silent_screen_base) ++ info->screen_base = info->silent_screen_base; ++ info->silent_screen_base = 0; ++ if (vc->vc_splash_data->splash_silentjpeg) ++ vfree(vc->vc_splash_data->splash_sboxes); ++ vfree(vc->vc_splash_data); ++ vc->vc_splash_data = 0; ++ info->splash_data = 0; ++} ++ ++static int splash_mkpenguin(struct splash_data *data, int pxo, int pyo, int pwi, int phe, int pr, int pg, int pb) ++{ ++ unsigned char *buf; ++ int i; ++ ++ if (pwi ==0 || phe == 0) ++ return 0; ++ buf = (unsigned char *)data + sizeof(*data); ++ pwi += pxo - 1; ++ phe += pyo - 1; ++ *buf++ = pxo; ++ *buf++ = pxo >> 8; ++ *buf++ = pyo; ++ *buf++ = pyo >> 8; ++ *buf++ = pwi; ++ *buf++ = pwi >> 8; ++ *buf++ = phe; ++ *buf++ = phe >> 8; ++ *buf++ = pr; ++ *buf++ = pg; ++ *buf++ = pb; ++ *buf++ = 0; ++ for (i = 0; i < 12; i++, buf++) ++ *buf = buf[-12]; ++ buf[-24] ^= 0xff; ++ buf[-23] ^= 0xff; ++ buf[-1] = 0xff; ++ return 2; ++} ++ ++static const int splash_offsets[3][16] = { ++ /* len, unit, size, state, fgcol, col, xo, yo, wi, he ++ boxcnt, ssize, sboxcnt, percent, overok, palcnt */ ++ /* V1 */ ++ { 20, -1, 16, -1, -1, -1, 8, 10, 12, 14, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V2 */ ++ { 35, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V3 */ ++ { 38, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ 24, 28, 32, 34, 36, 37 }, ++}; ++ ++#define SPLASH_OFF_LEN offsets[0] ++#define SPLASH_OFF_UNIT offsets[1] ++#define SPLASH_OFF_SIZE offsets[2] ++#define SPLASH_OFF_STATE offsets[3] ++#define SPLASH_OFF_FGCOL offsets[4] ++#define SPLASH_OFF_COL offsets[5] ++#define SPLASH_OFF_XO offsets[6] ++#define SPLASH_OFF_YO offsets[7] ++#define SPLASH_OFF_WI offsets[8] ++#define SPLASH_OFF_HE offsets[9] ++#define SPLASH_OFF_BOXCNT offsets[10] ++#define SPLASH_OFF_SSIZE offsets[11] ++#define SPLASH_OFF_SBOXCNT offsets[12] ++#define SPLASH_OFF_PERCENT offsets[13] ++#define SPLASH_OFF_OVEROK offsets[14] ++#define SPLASH_OFF_PALCNT offsets[15] ++ ++static inline int splash_getb(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off]; ++} ++ ++static inline int splash_gets(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off] | pos[off + 1] << 8; ++} ++ ++static inline int splash_geti(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : ++ pos[off] | pos[off + 1] << 8 | pos[off + 2] << 16 | pos[off + 3] << 24; ++} ++ ++static int splash_getraw(unsigned char *start, unsigned char *end, int *update) ++{ ++ unsigned char *ndata; ++ int version; ++ int splash_size; ++ int unit; ++ int width, height; ++ int silentsize; ++ int boxcnt; ++ int sboxcnt; ++ int palcnt; ++ int i, len; ++ const int *offsets; ++ struct vc_data *vc; ++ struct fb_info *info; ++ struct splash_data *sd; ++ ++ if (update) ++ *update = -1; ++ ++ if (!update || start[7] < '2' || start[7] > '3' || splash_geti(start, 12) != (int)0xffffffff) ++ printk(KERN_INFO "bootsplash %s: looking for picture...", SPLASH_VERSION); ++ ++ for (ndata = start; ndata < end; ndata++) { ++ if (ndata[0] != 'B' || ndata[1] != 'O' || ndata[2] != 'O' || ndata[3] != 'T') ++ continue; ++ if (ndata[4] != 'S' || ndata[5] != 'P' || ndata[6] != 'L' || ndata[7] < '1' || ndata[7] > '3') ++ continue; ++ version = ndata[7] - '0'; ++ offsets = splash_offsets[version - 1]; ++ len = SPLASH_OFF_LEN; ++ unit = splash_getb(ndata, SPLASH_OFF_UNIT); ++ if (unit >= MAX_NR_CONSOLES) ++ continue; ++ if (unit) { ++ vc_allocate(unit); ++ } ++ vc = vc_cons[unit].d; ++ info = registered_fb[(int)con2fb_map[unit]]; ++ width = info->var.xres; ++ height = info->var.yres; ++ splash_size = splash_geti(ndata, SPLASH_OFF_SIZE); ++ if (splash_size == (int)0xffffffff && version > 1) { ++ if ((sd = vc->vc_splash_data) != 0) { ++ int up = 0; ++ i = splash_getb(ndata, SPLASH_OFF_STATE); ++ if (i != 255) { ++ sd->splash_state = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_FGCOL); ++ if (i != 255) { ++ sd->splash_fg_color = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_COL); ++ if (i != 255) { ++ sd->splash_color = i; ++ up = -1; ++ } ++ boxcnt = sboxcnt = 0; ++ if (ndata + len <= end) { ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ } ++ if (boxcnt) { ++ i = splash_gets(ndata, len); ++ if (boxcnt + i <= sd->splash_boxcount && ndata + len + 2 + boxcnt * 12 <= end) { ++ ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_boxes + i * 12, 8)) { ++ ++ memcpy(sd->splash_boxes + i * 12, ndata + len + 2, boxcnt * 12); ++ up |= 1; ++ } ++ } ++ len += boxcnt * 12 + 2; ++ } ++ if (sboxcnt) { ++ i = splash_gets(ndata, len); ++ if (sboxcnt + i <= sd->splash_sboxcount && ndata + len + 2 + sboxcnt * 12 <= end) { ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_sboxes + i * 12, 8)) { ++ memcpy(sd->splash_sboxes + i * 12, ndata + len + 2, sboxcnt * 12); ++ up |= 2; ++ } ++ } ++ } ++ if (update) ++ *update = up; ++ } ++ return unit; ++ } ++ if (splash_size == 0) { ++ printk(KERN_INFO"...found, freeing memory.\n"); ++ if (vc->vc_splash_data) ++ splash_free(vc, info); ++ return unit; ++ } ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ palcnt = 3 * splash_getb(ndata, SPLASH_OFF_PALCNT); ++ if (ndata + len + splash_size > end) { ++ printk(KERN_INFO "...found, but truncated!\n"); ++ return -1; ++ } ++ if (!jpeg_check_size(ndata + len + boxcnt * 12 + palcnt, width, height)) { ++ ndata += len + splash_size - 1; ++ continue; ++ } ++ if (splash_check_jpeg(ndata + len + boxcnt * 12 + palcnt, width, height, info->var.bits_per_pixel)) ++ return -1; ++ silentsize = splash_geti(ndata, SPLASH_OFF_SSIZE); ++ if (silentsize) ++ printk(KERN_INFO" silentjpeg size %d bytes,", silentsize); ++ if (silentsize >= splash_size) { ++ printk(KERN_INFO " bigger than splashsize!\n"); ++ return -1; ++ } ++ splash_size -= silentsize; ++ if (!splash_usesilent) ++ silentsize = 0; ++ else if (height * 2 * info->fix.line_length > info->fix.smem_len) { ++ printk(KERN_INFO " does not fit into framebuffer.\n"); ++ silentsize = 0; ++ } ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ if (silentsize) { ++ unsigned char *simage = ndata + len + splash_size + 12 * sboxcnt; ++ if (!jpeg_check_size(simage, width, height) || ++ splash_check_jpeg(simage, width, height, info->var.bits_per_pixel)) { ++ printk(KERN_INFO " error in silent jpeg.\n"); <> From pluto at pld-linux.org Mon Aug 22 18:20:06 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: SOURCES (LINUX_2_6): kernel-i386.config, kernel-i386-smp.config -C... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:20:06 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set +CONFIG_BOOTSPLASH=y ---- Files affected: SOURCES: kernel-i386.config (1.82.10.107 -> 1.82.10.108) , kernel-i386-smp.config (1.59.10.102 -> 1.59.10.103) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.107 SOURCES/kernel-i386.config:1.82.10.108 --- SOURCES/kernel-i386.config:1.82.10.107 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386.config Mon Aug 22 18:20:01 2005 @@ -2151,16 +2151,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.102 SOURCES/kernel-i386-smp.config:1.59.10.103 --- SOURCES/kernel-i386-smp.config:1.59.10.102 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386-smp.config Mon Aug 22 18:20:01 2005 @@ -2069,16 +2069,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.107&r2=1.82.10.108&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.102&r2=1.59.10.103&f=u From pluto at pld-linux.org Mon Aug 22 18:22:04 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS (LINUX_2_6): kernel.spec - fbsplash dropped, bootsplash-3.1.... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:22:04 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ---- Files affected: SPECS: kernel.spec (1.441.2.1159 -> 1.441.2.1160) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1159 SPECS/kernel.spec:1.441.2.1160 --- SPECS/kernel.spec:1.441.2.1159 Thu Aug 18 13:59:16 2005 +++ SPECS/kernel.spec Mon Aug 22 18:21:58 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.2 +%define _rel 0.3 %define _netfilter_snap 20050801 @@ -213,8 +213,7 @@ Patch58: inotify-2.6.12.patch # derived from http://www.syskonnect.com/syskonnect/support/driver/zip/linux/install-8_18.tar.bz2 Patch59: linux-2.6-sk98lin-8.18.2.2.patch -# http://dev.gentoo.org/~spock/projects/gensplash/ -Patch60: fbsplash-0.9.2-r3-2.6.12-rc3.patch +Patch60: bootsplash-3.1.6-2.6.12.diff # reserve dynamic minors for fbsplash and device mapper Patch61: linux-static-dev.patch Patch62: linux-2.6-lirc-0.7.patch @@ -1467,6 +1466,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1160 2005/08/22 16:21:58 pluto +- fbsplash dropped, bootsplash-3.1.6 added, release 0.3. + Revision 1.441.2.1159 2005/08/18 11:59:16 pluto - nptl signal delivery deadlock fix. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1159&r2=1.441.2.1160&f=u From twittner at pld-linux.org Mon Aug 22 18:32:23 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: luma.spec $ luma QPainter::begin: Cannot paint null pixmap ... In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 16:32:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: $ luma QPainter::begin: Cannot paint null pixmap QPainter::setPen: Will be reset by begin() zsh: segmentation fault luma $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ - unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py ---- Files affected: SPECS: luma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.6 SPECS/luma.spec:1.7 --- SPECS/luma.spec:1.6 Thu Aug 18 12:14:37 2005 +++ SPECS/luma.spec Mon Aug 22 18:32:07 2005 @@ -39,12 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.pyc' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png %py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} -find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.py -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +64,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 16:32:07 twittner +$ luma +QPainter::begin: Cannot paint null pixmap +QPainter::setPen: Will be reset by begin() +zsh: segmentation fault luma +$ cat /usr/bin/luma +#!/usr/bin/python /usr/lib/luma/luma.pyc +$ +- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py + Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.6&r2=1.7&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS (DEVEL): evolution-webcal.spec - up to version 2.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 16:59:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.4.0 ---- Files affected: SPECS: evolution-webcal.spec (1.20.2.1 -> 1.20.2.2) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20.2.1 SPECS/evolution-webcal.spec:1.20.2.2 --- SPECS/evolution-webcal.spec:1.20.2.1 Mon Jul 25 21:40:07 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 18:59:12 2005 @@ -2,25 +2,25 @@ Summary: Web calendar subscription utility for Evolution Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal -Version: 2.3.90 +Version: 2.4.0 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ff5d99835ba505f92ce2671fc0223792 +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/%{name}-%{version}.tar.bz2 +# Source0-md5: 3a09711675d82075f007e565a0277185 BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.53 BuildRequires: automake -BuildRequires: evolution-data-server-devel >= 1.3.5 -BuildRequires: gtk+2-devel >= 2:2.6.4 +BuildRequires: evolution-data-server-devel >= 1.3.7-3 +BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: intltool BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libsoup-devel >= 2.2.3 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: evolution >= 2.3.5.1 -Requires: gtk+2 >= 2:2.6.4 +Requires: evolution >= 2.3.7-3 +Requires: gtk+2 >= 2:2.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_libdir}/evolution-webcal -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/evolution-webcal.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.2 2005/08/22 16:59:12 aflinta +- up to version 2.4.0 + Revision 1.20.2.1 2005/07/25 19:40:07 freetz - 2.3.90, bumped evo BRs/Rs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20.2.1&r2=1.20.2.2&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: evolution-webcal-2.4.0.tar.bz2 Message-ID: <15275.1124729971@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/evolution-webcal-2.4.0.tar.bz2 3a09711675d82075f007e565a0277185 evolution-webcal-2.4.0.tar.bz2 Size: 147170 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:06:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: gdm.spec - version 2.8.0.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:06:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.8.0.3 ---- Files affected: SPECS: gdm.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: SPECS/gdm.spec diff -u SPECS/gdm.spec:1.165 SPECS/gdm.spec:1.166 --- SPECS/gdm.spec:1.165 Tue Aug 9 15:57:53 2005 +++ SPECS/gdm.spec Mon Aug 22 19:05:56 2005 @@ -15,13 +15,13 @@ Summary(ru): ?????????? ???????? GNOME Summary(uk): ?????????? ???????? GNOME Name: gdm -Version: 2.8.0.2 +Version: 2.8.0.3 Release: 0.1 Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 738287f41471194b1b770a145590dc44 +# Source0-md5: e5fc040850ae90c456716d3dd6493f27 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}-pld-logo.png @@ -263,7 +263,7 @@ %{_pixmapsdir}/* %{_desktopdir}/gdmsetup.desktop %{_desktopdir}/gdmflexiserver.desktop -%{_datadir}/gnome/capplets/* +%{_desktopdir}/gdmphotosetup.desktop %{_datadir}/gdm #%%{_datadir}/xsessions - moved to gnome-session %{_datadir}/xsessions/default.desktop @@ -288,6 +288,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166 2005/08/22 17:05:56 aflinta +- version 2.8.0.3 + Revision 1.165 2005/08/09 13:57:53 aflinta - up to version 2.8.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.165&r2=1.166&f=u From aflinta at pld-linux.org Mon Aug 22 19:06:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: gdm-2.8.0.3.tar.bz2 gdm-storky.tar.gz Message-ID: <19193.1124730366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/gdm-2.8.0.3.tar.bz2 e5fc040850ae90c456716d3dd6493f27 gdm-2.8.0.3.tar.bz2 Size: 3920359 bytes ALREADY GOT: no-url://gdm-storky.tar.gz e293fbe4a60004056f6894463b874ae8 gdm-storky.tar.gz -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:12:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS (DEVEL): gnome-games.spec - up to version 2.11.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:12:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.11.5 ---- Files affected: SPECS: gnome-games.spec (1.159.2.4 -> 1.159.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-games.spec diff -u SPECS/gnome-games.spec:1.159.2.4 SPECS/gnome-games.spec:1.159.2.5 --- SPECS/gnome-games.spec:1.159.2.4 Thu Aug 18 00:57:49 2005 +++ SPECS/gnome-games.spec Mon Aug 22 19:11:54 2005 @@ -7,13 +7,13 @@ Summary(uk): ???? ??? GNOME Summary(wa): Djeus po GNOME Name: gnome-games -Version: 2.11.4 -Release: 2 +Version: 2.11.5 +Release: 1 Epoch: 1 License: LGPL Group: X11/Applications/Games Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a1918551b282a04d74d4950955a433f0 +# Source0-md5: 7e55c2cce68886b48b81a513175956cb Patch0: %{name}-schemas.patch Patch1: %{name}-include.patch Patch2: %{name}-desktop.patch @@ -822,6 +822,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.159.2.5 2005/08/22 17:11:54 aflinta +- up to version 2.11.5 + Revision 1.159.2.4 2005/08/17 22:57:49 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-games.spec?r1=1.159.2.4&r2=1.159.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:12:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: gnome-games-2.11.5.tar.bz2 Message-ID: <22838.1124730726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/gnome-games-2.11.5.tar.bz2 7e55c2cce68886b48b81a513175956cb gnome-games-2.11.5.tar.bz2 Size: 4967289 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: libwnck-2.11.92.tar.bz2 Message-ID: <25075.1124730926@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/libwnck-2.11.92.tar.bz2 a21bde983e63bd3f12b44484b39c13e6 libwnck-2.11.92.tar.bz2 Size: 428692 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS (DEVEL): libwnck.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:15:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: libwnck.spec (1.46.2.3 -> 1.46.2.4) ---- Diffs: ================================================================ Index: SPECS/libwnck.spec diff -u SPECS/libwnck.spec:1.46.2.3 SPECS/libwnck.spec:1.46.2.4 --- SPECS/libwnck.spec:1.46.2.3 Sun Aug 21 10:02:06 2005 +++ SPECS/libwnck.spec Mon Aug 22 19:15:19 2005 @@ -2,12 +2,12 @@ Summary: General Window Manager interfacing for GNOME utilities Summary(pl): Interfejs General Window Manager dla narz?dzi GNOME Name: libwnck -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 930daefe4d6bc2fce9426b0a594e1b0e +# Source0-md5: a21bde983e63bd3f12b44484b39c13e6 BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk+2-devel >= 2:2.8.0 @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.4 2005/08/22 17:15:19 aflinta +- version 2.11.92 + Revision 1.46.2.3 2005/08/21 08:02:06 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libwnck.spec?r1=1.46.2.3&r2=1.46.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 19:18:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS (DEVEL): GConf2.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:18:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: GConf2.spec (1.91.2.4 -> 1.91.2.5) ---- Diffs: ================================================================ Index: SPECS/GConf2.spec diff -u SPECS/GConf2.spec:1.91.2.4 SPECS/GConf2.spec:1.91.2.5 --- SPECS/GConf2.spec:1.91.2.4 Wed Aug 17 23:12:34 2005 +++ SPECS/GConf2.spec Mon Aug 22 19:18:53 2005 @@ -11,12 +11,12 @@ Summary(pt_BR): Sistema de Configura??o do GNOME 2 Summary(ru): ??????? ???????????? GNOME 2 Name: GConf2 -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-%{version}.tar.bz2 -# Source0-md5: a36b17b2d5c58db36b17e826de0e0f25 +# Source0-md5: e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 Patch0: %{name}-NO_MAJOR_VERSION.patch Patch1: %{name}-path.patch URL: http://www.gnome.org/ @@ -165,6 +165,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91.2.5 2005/08/22 17:18:53 aflinta +- version 2.11.92 + Revision 1.91.2.4 2005/08/17 21:12:34 aflinta - rebuild with new cairo, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.91.2.4&r2=1.91.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:19:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: GConf-2.11.92.tar.bz2 Message-ID: <27037.1124731141@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-2.11.92.tar.bz2 e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 GConf-2.11.92.tar.bz2 Size: 1891439 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:21:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: MayaVi.spec - fixed License field - added %doc, missing BRs... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:21:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed License field - added %doc, missing BRs and R ---- Files affected: SPECS: MayaVi.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/MayaVi.spec diff -u SPECS/MayaVi.spec:1.11 SPECS/MayaVi.spec:1.12 --- SPECS/MayaVi.spec:1.11 Tue Jun 29 12:55:03 2004 +++ SPECS/MayaVi.spec Mon Aug 22 19:21:05 2005 @@ -4,11 +4,14 @@ Name: MayaVi Version: 1.3 Release: 1 -License: GPL +License: BSD Group: Applications/Graphics Source0: http://dl.sourceforge.net/mayavi/%{name}-%{version}.tar.gz # Source0-md5: 38ae9dbe09a6bdb35289d8d6d98c65ba URL: http://mayavi.sourceforge.net/ +BuildRequires: python +BuildRequires: python-devel +Requires: python-tkinter BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,6 +42,7 @@ %files %defattr(644,root,root,755) +%doc doc/guide/*.html doc/CREDITS.txt doc/NEWS.txt doc/README.txt doc/TODO.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/mayavi %{py_sitescriptdir}/vtkPipeline @@ -49,6 +53,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 17:21:05 darekr +- fixed License field +- added %doc, missing BRs and R + Revision 1.11 2004/06/29 10:55:03 qboosh - use proper py macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/MayaVi.spec?r1=1.11&r2=1.12&f=u From undefine at pld-linux.org Mon Aug 22 19:35:19 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: getdp.spec - up to 1.1.0 In-Reply-To: References: Message-ID: Author: undefine Date: Mon Aug 22 17:35:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.1.0 ---- Files affected: SPECS: getdp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.4 SPECS/getdp.spec:1.5 --- SPECS/getdp.spec:1.4 Wed Jun 1 13:05:41 2005 +++ SPECS/getdp.spec Mon Aug 22 19:35:13 2005 @@ -2,12 +2,12 @@ Summary: A General environment for the treatment of Discrete Problems Summary(pl): ?rodowisko do rozwi?zywania problem?w dyskretnych Name: getdp -Version: 1.0.1 +Version: 1.1.0 Release: 1 License: GPL Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz -# Source0-md5: 5ed9b143d2205a7bbe5a13c91065593c +# Source0-md5: cceb5f66c3d2889048fd5f35d178171e URL: http://www.geuz.org/getdp/ BuildRequires: gcc-g77 BuildRequires: gsl-devel @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 17:35:13 undefine +- up to 1.1.0 + Revision 1.4 2005/06/01 11:05:41 zbyniu - BR: texinfo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.4&r2=1.5&f=u From undefine at pld-linux.org Mon Aug 22 19:35:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: getdp-1.1.0-source.tgz Message-ID: <6658.1124732123@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geuz.org/getdp/src/getdp-1.1.0-source.tgz cceb5f66c3d2889048fd5f35d178171e getdp-1.1.0-source.tgz Size: 1426981 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:37:47 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: alien.spec - updated to 8.56 In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 8.56 ---- Files affected: SPECS: alien.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/alien.spec diff -u SPECS/alien.spec:1.61 SPECS/alien.spec:1.62 --- SPECS/alien.spec:1.61 Mon Jun 27 02:35:00 2005 +++ SPECS/alien.spec Mon Aug 22 19:37:41 2005 @@ -3,12 +3,12 @@ Summary: Pakages converter (tgz, rpm, deb, slp) Summary(pl): Konwerter pakiet?w (tgz, rpm, deb, slp) Name: alien -Version: 8.53 +Version: 8.56 Release: 1 License: GPL Group: Applications/System Source0: http://kitenet.net/programs/alien/%{name}_%{version}.tar.gz -# Source0-md5: 48ace120b3f3810e0d2d005b6f8b0512 +# Source0-md5: a6b1f6278ab819635e65b0836186c777 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 44f9b3381776077447bbdb8c64d3f215 Patch0: %{name}-DESTDIR.patch @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/22 17:37:41 darekr +- updated to 8.56 + Revision 1.61 2005/06/27 00:35:00 undefine - up to 8.53 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/alien.spec?r1=1.61&r2=1.62&f=u From darekr at pld-linux.org Mon Aug 22 19:37:48 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:00 2005 Subject: DISTFILES: alien_8.56.tar.gz alien-non-english-man-pages.tar.bz2 Message-ID: <8173.1124732268@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kitenet.net/programs/alien/alien_8.56.tar.gz a6b1f6278ab819635e65b0836186c777 alien_8.56.tar.gz Size: 73618 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/alien-non-english-man-pages.tar.bz2 44f9b3381776077447bbdb8c64d3f215 alien-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:42:25 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: getdp.spec - kill setting perms in %install In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill setting perms in %install ---- Files affected: SPECS: getdp.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.5 SPECS/getdp.spec:1.6 --- SPECS/getdp.spec:1.5 Mon Aug 22 19:35:13 2005 +++ SPECS/getdp.spec Mon Aug 22 19:42:20 2005 @@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_infodir}} -install -m 755 bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp +install bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp install doc/getdp.1 $RPM_BUILD_ROOT%{_mandir}/man1 install doc/texinfo/getdp.info* $RPM_BUILD_ROOT%{_infodir} @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 17:42:20 darekr +- kill setting perms in %install + Revision 1.5 2005/08/22 17:35:13 undefine - up to 1.1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.5&r2=1.6&f=u From wolf at pld-linux.org Mon Aug 22 19:50:39 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:00 2005 Subject: SPECS: dotnet-gecko-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 17:50:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14 SPECS/dotnet-gecko-sharp.spec:1.15 --- SPECS/dotnet-gecko-sharp.spec:1.14 Tue May 3 23:15:27 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 19:50:34 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -92,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 17:50:34 wolf +- mono auto deps + Revision 1.14 2005/05/03 21:15:27 qboosh - build on alpha, revised deps, fix webshot if only mint is available; release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Mon Aug 22 19:56:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: lat.spec - up to 0.7 In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 17:56:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7 ---- Files affected: SPECS: lat.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/lat.spec diff -u SPECS/lat.spec:1.8 SPECS/lat.spec:1.9 --- SPECS/lat.spec:1.8 Mon Aug 1 17:40:11 2005 +++ SPECS/lat.spec Mon Aug 22 19:56:16 2005 @@ -2,12 +2,12 @@ Summary: LAT - LDAP Administration Tool Summary(pl): LAT - narz?dzie administracyjne dla LDAP Name: lat -Version: 0.6.1 +Version: 0.7 Release: 0.1 License: GPL v2 Group: Applications/Networking Source0: http://people.mmgsecurity.com/~lorenb/lat/releases/%{name}-%{version}.tar.gz -# Source0-md5: 59eb63b1cd8273822eca1198b3fcbff6 +# Source0-md5: cb9c01a20bf58bb8e6396f54a148f4e8 Source1: %{name}.png Patch0: %{name}-scrollkeeper_dir.patch Patch1: %{name}-desktop.patch @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 17:56:16 twittner +- up to 0.7 + Revision 1.8 2005/08/01 15:40:11 twittner - up to 0.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lat.spec?r1=1.8&r2=1.9&f=u From twittner at pld-linux.org Mon Aug 22 19:56:36 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: lat-0.7.tar.gz Message-ID: <19981.1124733396@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.mmgsecurity.com/~lorenb/lat/releases/lat-0.7.tar.gz cb9c01a20bf58bb8e6396f54a148f4e8 lat-0.7.tar.gz Size: 591415 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 20:01:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: getdp.spec - proper License, added README to %doc In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 18:01:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License, added README to %doc ---- Files affected: SPECS: getdp.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.6 SPECS/getdp.spec:1.7 --- SPECS/getdp.spec:1.6 Mon Aug 22 19:42:20 2005 +++ SPECS/getdp.spec Mon Aug 22 20:01:16 2005 @@ -4,7 +4,7 @@ Name: getdp Version: 1.1.0 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz # Source0-md5: cceb5f66c3d2889048fd5f35d178171e @@ -63,7 +63,7 @@ %files %defattr(644,root,root,755) -%doc doc/VERSIONS doc/FAQ doc/CREDITS demos +%doc doc/VERSIONS doc/FAQ doc/CREDITS demos README %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_infodir}/%{name}* @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 18:01:16 darekr +- proper License, added README to %doc + Revision 1.6 2005/08/22 17:42:20 darekr - kill setting perms in %install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Mon Aug 22 20:19:05 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: nx.spec - typo In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 18:19:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: nx.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/nx.spec diff -u SPECS/nx.spec:1.3 SPECS/nx.spec:1.4 --- SPECS/nx.spec:1.3 Sat Nov 20 14:21:30 2004 +++ SPECS/nx.spec Mon Aug 22 20:18:59 2005 @@ -44,7 +44,7 @@ dialup links or anything better. %description -l pl -NoMachine NX to schemat kompresji dla X nowej generacji. Dziala na +NoMachine NX to schemat kompresji dla X nowej generacji. Dzia?a na zdalnych sesjach X11 nawet przy pr?dkosci 56k albo wi?kszej. %prep @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/22 18:18:59 twittner +- typo + Revision 1.3 2004/11/20 13:21:30 qboosh - adjusted build for clean to work, fixed dups in files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.3&r2=1.4&f=u From wolf at pld-linux.org Mon Aug 22 20:28:57 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): dotnet-gecko-sharp.spec - mono auto deps - monodoc ... In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:28:57 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps - monodoc documentation ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14.2.4 -> 1.14.2.5) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14.2.4 SPECS/dotnet-gecko-sharp.spec:1.14.2.5 --- SPECS/dotnet-gecko-sharp.spec:1.14.2.4 Sun Jun 19 18:35:07 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 20:28:51 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -13,14 +14,13 @@ URL: http://www.mono-project.com/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.3 BuildRequires: mono-csharp >= 1.1.0 BuildRequires: gtk+2-devel >= 2.0.0 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildConflicts: gecko-sharp < 0.2 Requires: mozilla-embedded -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: dotnet-gecko Provides: gecko-sharp = %{version} Obsoletes: dotnet-gecko @@ -92,6 +92,7 @@ %files devel %defattr(644,root,root,755) %{_pkgconfigdir}/* +%{_libdir}/monodoc/sources/* /usr/lib/mono/gecko-sharp-2.0 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -100,6 +101,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14.2.5 2005/08/22 18:28:51 wolf +- mono auto deps +- monodoc documentation + Revision 1.14.2.4 2005/06/19 16:35:07 prism - fixed install (mv failed because a destination was the same as a source) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14.2.4&r2=1.14.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:41 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: horde-passwd.spec - updated to 3.0-beta which works with ho... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:32:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0-beta which works with horde 3.x series ---- Files affected: SPECS: horde-passwd.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.11 SPECS/horde-passwd.spec:1.12 --- SPECS/horde-passwd.spec:1.11 Sun May 29 14:39:38 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:32:36 2005 @@ -4,19 +4,19 @@ Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd -Version: 2.2.2 +Version: 3.0 Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: http://ftp.horde.org/pub/passwd/passwd-%{version}.tar.gz -# Source0-md5: d1c63a16c67e302c9e4885c1386d638e +Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 PreReq: apache Requires(post): grep -Requires: horde < 3.0 +Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch @@ -38,16 +38,16 @@ modu?. %prep -%setup -q -n passwd-%{version} +%setup -q -n passwd-h3-%{version}-beta %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{graphics,lib,locale,templates,scripts} +install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} install -d $RPM_BUILD_ROOT%{confdir}/passwd cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/graphics +cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates @@ -106,7 +106,7 @@ %doc README docs/* %dir %{hordedir}/passwd %attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/graphics +%attr(750,root,http) %{hordedir}/passwd/themes/graphics %attr(750,root,http) %{hordedir}/passwd/lib %attr(750,root,http) %{hordedir}/passwd/locale %attr(750,root,http) %{hordedir}/passwd/templates @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 18:32:36 paszczus +- updated to 3.0-beta which works with horde 3.x series + Revision 1.11 2005/05/29 12:39:38 paszczus - runs only with horde >= 2.0 but < 3.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.11&r2=1.12&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:55 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: passwd-h3-3.0-beta.tar.gz Message-ID: <10609.1124735575@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/passwd/passwd-h3-3.0-beta.tar.gz 9ea299d2822c9d3ca5efca03ce6a23a4 passwd-h3-3.0-beta.tar.gz Size: 894549 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 20:33:18 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): dotnet-gtksourceview-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:33:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gtksourceview-sharp.spec (1.17.2.7 -> 1.17.2.8) ---- Diffs: ================================================================ Index: SPECS/dotnet-gtksourceview-sharp.spec diff -u SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.8 --- SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 Sun Jul 17 14:11:04 2005 +++ SPECS/dotnet-gtksourceview-sharp.spec Mon Aug 22 20:33:13 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: .NET language bindings for GtkSourceView Summary(pl): Wi?zania GtkSourceView dla .NET Name: dotnet-gtksourceview-sharp @@ -13,15 +14,13 @@ ExcludeArch: alpha BuildRequires: autoconf BuildRequires: automake >= 1:1.7 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 -BuildRequires: dotnet-gtk-sharp-gnome-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-gnome-devel >= 1.9.3 BuildRequires: gtksourceview-devel >= 1.0.1 BuildRequires: libtool BuildRequires: monodoc >= 0.16 BuildRequires: mono-csharp >= 1.1.6 BuildRequires: pkgconfig Requires: gtksourceview >= 1.0.1 -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: gtksourceview-sharp Obsoletes: gtksourceview-sharp Provides: dotnet-gtksourceview @@ -105,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17.2.8 2005/08/22 18:33:13 wolf +- mono auto deps + Revision 1.17.2.7 2005/07/17 12:11:04 deejay1 - BR: dotnet-gtk-sharp-gnome-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gtksourceview-sharp.spec?r1=1.17.2.7&r2=1.17.2.8&f=u From paszczus at pld-linux.org Mon Aug 22 20:37:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: horde-passwd.spec - added _noautoreq In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq ---- Files affected: SPECS: horde-passwd.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.12 SPECS/horde-passwd.spec:1.13 --- SPECS/horde-passwd.spec:1.12 Mon Aug 22 20:32:36 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:37:53 2005 @@ -22,6 +22,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' + %define apachedir /etc/httpd %define hordedir /usr/share/horde %define confdir /etc/horde.org @@ -124,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 18:37:53 paszczus +- added _noautoreq + Revision 1.12 2005/08/22 18:32:36 paszczus - updated to 3.0-beta which works with horde 3.x series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.12&r2=1.13&f=u From wolf at pld-linux.org Mon Aug 22 20:42:30 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: monodevelop.spec - auto mono deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:42:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - auto mono deps ---- Files affected: SPECS: monodevelop.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/monodevelop.spec diff -u SPECS/monodevelop.spec:1.23 SPECS/monodevelop.spec:1.24 --- SPECS/monodevelop.spec:1.23 Wed Jun 29 02:23:21 2005 +++ SPECS/monodevelop.spec Mon Aug 22 20:42:25 2005 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -%define monoversion 1.1.5 +%include /usr/lib/rpm/macros.mono Summary: Mono IDE Summary(pl): IDE dla Mono Name: monodevelop @@ -19,7 +19,7 @@ BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: dotnet-gecko-sharp-devel >= 0.10 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.5 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.5 BuildRequires: dotnet-gtksourceview-sharp-devel >= 0.10 BuildRequires: gettext-devel BuildRequires: intltool @@ -29,12 +29,7 @@ BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildRequires: shared-mime-info -Requires: mono -Requires: monodoc Requires: mozilla-embedded -Requires: dotnet-gtksourceview-sharp -Requires: dotnet-gecko-sharp -Requires: dotnet-gtk-sharp Requires(post,postun): shared-mime-info Obsoletes: MonoDevelop ExcludeArch: alpha @@ -136,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/22 18:42:25 wolf +- auto mono deps + Revision 1.23 2005/06/29 00:23:21 charles - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monodevelop.spec?r1=1.23&r2=1.24&f=u From arekm at pld-linux.org Mon Aug 22 21:02:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: digikam.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:02:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikam.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.41 SPECS/digikam.spec:1.42 --- SPECS/digikam.spec:1.41 Mon Jul 18 13:15:53 2005 +++ SPECS/digikam.spec Mon Aug 22 21:01:58 2005 @@ -2,12 +2,12 @@ Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.3 +Version: 0.7.4 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 19a2b479ea16ce4a227e04215f885780 +# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -105,6 +105,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la +%{_includedir}/*.h %{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -113,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/22 19:01:58 arekm +- up to 0.7.4 + Revision 1.41 2005/07/18 11:15:53 charles - updated to 0.7.3 - updated build section, added --all-name to find_lang ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Mon Aug 22 21:02:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: digikam-0.7.4.tar.bz2 Message-ID: <683.1124737335@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikam-0.7.4.tar.bz2 3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 Size: 2322119 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:03:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: horde-passwd.spec - convert to horde 3.x style In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:03:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - convert to horde 3.x style ---- Files affected: SPECS: horde-passwd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.13 SPECS/horde-passwd.spec:1.14 --- SPECS/horde-passwd.spec:1.13 Mon Aug 22 20:37:53 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:03:39 2005 @@ -1,11 +1,12 @@ # $Revision$, $Date$ # +%define _hordeapp passwd %include /usr/lib/rpm/macros.php Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.1 +Release: 0.4 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -13,20 +14,23 @@ # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ +BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 -PreReq: apache -Requires(post): grep +Requires: apache >= 1.3.33-2 +Requires: apache(mod_access) Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +# horde accesses it directly in help->about +%define _noautocompressdoc CREDITS +%define _noautoreq 'pear(Horde/.*)' -%define apachedir /etc/httpd %define hordedir /usr/share/horde -%define confdir /etc/horde.org +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} %description Passwd is the Horde password changing application. While it has been @@ -42,58 +46,52 @@ %prep %setup -q -n passwd-h3-%{version}-beta +# considered harmful (horde/docs/SECURITY) +rm -f test.php + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} -install -d $RPM_BUILD_ROOT%{confdir}/passwd +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ + $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} + +cp -pR *.php $RPM_BUILD_ROOT%{_appdir} +for i in config/*.dist; do + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) +done + +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak + +cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib +cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale +cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates +cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd -cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics -cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib -cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale -cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates -cp -p config/.htaccess $RPM_BUILD_ROOT%{confdir}/passwd -cp -p templates/.htaccess $RPM_BUILD_ROOT%{hordedir}/passwd/templates - -ln -fs %{confdir}/passwd $RPM_BUILD_ROOT%{hordedir}/passwd/config - -install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir} - -# bit unclean.. -cd $RPM_BUILD_ROOT%{confdir}/passwd -for i in *.dist; do cp $i `basename $i .dist`; done +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %triggerpostun -- horde-passwd <= 2.2-0.1 for i in backends.php conf.php; do @@ -105,20 +103,22 @@ %files %defattr(644,root,root,755) -%doc README docs/* -%dir %{hordedir}/passwd -%attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/themes/graphics -%attr(750,root,http) %{hordedir}/passwd/lib -%attr(750,root,http) %{hordedir}/passwd/locale -%attr(750,root,http) %{hordedir}/passwd/templates - -%attr(750,root,http) %dir %{confdir}/passwd -%{hordedir}/passwd/config -%attr(640,root,http) %{confdir}/passwd/*.dist -%attr(640,root,http) %{confdir}/passwd/.htaccess -%attr(640,root,http) %config(noreplace) %{confdir}/passwd/*.php -%attr(640,root,http) %{apachedir}/%{name}.conf +%doc README docs/* scripts +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml + +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/config +%{_appdir}/docs +%{_appdir}/lib +%{_appdir}/locale +%{_appdir}/templates +%{_appdir}/themes %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/22 19:03:39 glen +- convert to horde 3.x style + Revision 1.13 2005/08/22 18:37:53 paszczus - added _noautoreq ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.13&r2=1.14&f=u From paszczus at pld-linux.org Mon Aug 22 21:10:24 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <6908.1124737824@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz de81a870fda572fe1d4d81db8c31f41f imp-FRAMEWORK_3-2005-08-22.tar.gz Size: 3307364 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 21:10:06 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): imp.spec - updated to 2005-08-22 snap ; removed TODO In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 19:10:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-22 snap ; removed TODO ---- Files affected: SPECS: imp.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.2 SPECS/imp.spec:1.81.2.3 --- SPECS/imp.spec:1.81.2.2 Thu Jul 21 00:07:56 2005 +++ SPECS/imp.spec Mon Aug 22 21:10:00 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# TODO -# - imap login broken, see http://bugs.horde.org/ticket/?id=1937 -%define _snap 2005-05-21 +%define _snap 2005-08-22 %include /usr/lib/rpm/macros.php Summary: Web Based IMAP Mail Program @@ -14,13 +12,8 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW -%if 0%{?_snap} Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: 15e787abce02eaafeb4fab78aa653e02 -%else -Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz -# Source0-md5: 42e7232663f65c2edf5e5bb8c85e84f9 -%endif +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -164,6 +157,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/22 19:10:00 paszczus +- updated to 2005-08-22 snap ; removed TODO + Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From arekm at pld-linux.org Mon Aug 22 21:13:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: digikamimageplugins.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:13:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikamimageplugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.5 SPECS/digikamimageplugins.spec:1.6 --- SPECS/digikamimageplugins.spec:1.5 Mon May 23 17:25:47 2005 +++ SPECS/digikamimageplugins.spec Mon Aug 22 21:13:06 2005 @@ -2,12 +2,12 @@ Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.2 -Release: 0.1 +Version: 0.7.4 +Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: ff3d2da71168b7e2f166b450fe8053e2 +# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -51,7 +51,8 @@ %setup -q %build -%configure +%configure \ + --with-qt-libraries=%{_libdir} %{__make} %install @@ -82,6 +83,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 19:13:06 arekm +- up to 0.7.4 + Revision 1.5 2005/05/23 15:25:47 darekr - 1.129 macros for _kdedocdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.5&r2=1.6&f=u From arekm at pld-linux.org Mon Aug 22 21:13:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: digikamimageplugins-0.7.4.tar.bz2 Message-ID: <8804.1124737994@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikamimageplugins-0.7.4.tar.bz2 5ea3c0dd6e6f1eb99211e75d0bf17d3d digikamimageplugins-0.7.4.tar.bz2 Size: 2341192 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 21:13:38 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: f-spot.spec - remove manual requires In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 19:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - remove manual requires ---- Files affected: SPECS: f-spot.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.17 SPECS/f-spot.spec:1.18 --- SPECS/f-spot.spec:1.17 Mon Aug 22 17:07:47 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:13:33 2005 @@ -24,8 +24,6 @@ BuildRequires: mono-csharp >= 1.0 BuildRequires: sqlite-devel >= 2.8.6 BuildRequires: pkgconfig -Requires: dotnet-gtk-sharp2 >= 2.3.90 -Requires: mono >= 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -79,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/22 19:13:33 wolf +- remove manual requires + Revision 1.17 2005/08/22 15:07:47 wolf - mono auto deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.17&r2=1.18&f=u From aflinta at pld-linux.org Mon Aug 22 21:21:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-desktop-2.11.92.tar.bz2 pld-logo.svg Message-ID: <14995.1124738485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/gnome-desktop-2.11.92.tar.bz2 1addb9e2b94d9df9b6463643419c53ba gnome-desktop-2.11.92.tar.bz2 Size: 1035085 bytes ALREADY GOT: no-url://pld-logo.svg 9fda4ca70a6e8e82e8e5bebe0e28db74 pld-logo.svg -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:21:20 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-desktop.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:21:20 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-desktop.spec (1.83.2.4 -> 1.83.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-desktop.spec diff -u SPECS/gnome-desktop.spec:1.83.2.4 SPECS/gnome-desktop.spec:1.83.2.5 --- SPECS/gnome-desktop.spec:1.83.2.4 Wed Aug 17 22:37:59 2005 +++ SPECS/gnome-desktop.spec Mon Aug 22 21:21:13 2005 @@ -2,12 +2,12 @@ Summary: The core programs for the GNOME2 GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME2 Name: gnome-desktop -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 704d14f959ab6a9186f45d27bb83e4b7 +# Source0-md5: 1addb9e2b94d9df9b6463643419c53ba Source1: pld-logo.svg # Source1-md5: 9fda4ca70a6e8e82e8e5bebe0e28db74 Patch0: %{name}-crystalsvg.patch @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83.2.5 2005/08/22 19:21:13 aflinta +- version 2.11.92 + Revision 1.83.2.4 2005/08/17 20:37:59 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-desktop.spec?r1=1.83.2.4&r2=1.83.2.5&f=u From glen at pld-linux.org Mon Aug 22 21:24:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): imp.spec - fix broken trigger In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:24:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix broken trigger ---- Files affected: SPECS: imp.spec (1.81.2.3 -> 1.81.2.4) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.3 SPECS/imp.spec:1.81.2.4 --- SPECS/imp.spec:1.81.2.3 Mon Aug 22 21:10:00 2005 +++ SPECS/imp.spec Mon Aug 22 21:24:39 2005 @@ -12,8 +12,9 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW +#Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: de81a870fda572fe1d4d81db8c31f41f +# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -69,7 +70,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} @@ -122,9 +123,9 @@ done %triggerpostun -- imp <= 4.0.2-1 -if [ -f %{_apache2dir}/imp.conf.rpmsave ]; then +if [ -f /etc/httpd/imp.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi if [ -f /var/lock/subsys/httpd ]; then @@ -157,8 +158,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.4 2005/08/22 19:24:39 glen +- fix broken trigger + Revision 1.81.2.3 2005/08/22 19:10:00 paszczus -- updated to 2005-08-22 snap ; removed TODO +- updated to 2005-08-22 snap; removed TODO Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.3&r2=1.81.2.4&f=u From glen at pld-linux.org Mon Aug 22 21:25:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: ERRORS: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <17040.1124738708@distfiles.pld-linux.org> FATAL: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz md5 mismatch, needed c222e646c31afe0f3d7934880aa1aa0c, got de81a870fda572fe1d4d81db8c31f41f Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:25:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): imp.spec - fixed md5 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:25:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed md5 ---- Files affected: SPECS: imp.spec (1.81.2.4 -> 1.81.2.5) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.4 SPECS/imp.spec:1.81.2.5 --- SPECS/imp.spec:1.81.2.4 Mon Aug 22 21:24:39 2005 +++ SPECS/imp.spec Mon Aug 22 21:25:45 2005 @@ -14,7 +14,7 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -158,6 +158,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.5 2005/08/22 19:25:45 glen +- fixed md5 + Revision 1.81.2.4 2005/08/22 19:24:39 glen - fix broken trigger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.4&r2=1.81.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 21:28:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-netstatus-2.11.92.tar.bz2 Message-ID: <20208.1124738935@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/gnome-netstatus-2.11.92.tar.bz2 3dcd5a260b74f0ec8cdbd09578011f0c gnome-netstatus-2.11.92.tar.bz2 Size: 467494 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:28:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:28:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.3 -> 1.20.2.4) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.3 SPECS/gnome-netstatus.spec:1.20.2.4 --- SPECS/gnome-netstatus.spec:1.20.2.3 Thu Aug 18 12:58:11 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:28:51 2005 @@ -2,12 +2,12 @@ Summary: Applet that displays the network status in a GNOME panel Summary(pl): Aplet wy?wietlaj?cy stan po??cze? sieciowych na panelu GNOME Name: gnome-netstatus -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: eea34fad7531398d68dc880fb343c296 +# Source0-md5: 3dcd5a260b74f0ec8cdbd09578011f0c URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -43,7 +43,8 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.4 2005/08/22 19:28:51 aflinta +- version 2.11.92 + Revision 1.20.2.3 2005/08/18 10:58:11 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.3&r2=1.20.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:32:46 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: vino-2.11.92.tar.bz2 Message-ID: <22923.1124739166@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/vino-2.11.92.tar.bz2 58047c590714e983e2a3daafb3661c81 vino-2.11.92.tar.bz2 Size: 566304 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:32:32 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): vino.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:32:32 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: vino.spec (1.18.2.3 -> 1.18.2.4) ---- Diffs: ================================================================ Index: SPECS/vino.spec diff -u SPECS/vino.spec:1.18.2.3 SPECS/vino.spec:1.18.2.4 --- SPECS/vino.spec:1.18.2.3 Thu Aug 18 14:07:20 2005 +++ SPECS/vino.spec Mon Aug 22 21:32:19 2005 @@ -2,12 +2,12 @@ Summary: A remote desktop system for GNOME Summary(pl): System zdalnego pulpitu dla GNOME Name: vino -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 78440fe650378c2d6b63ff7174558df3 +# Source0-md5: 58047c590714e983e2a3daafb3661c81 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18.2.4 2005/08/22 19:32:19 aflinta +- version 2.11.92 + Revision 1.18.2.3 2005/08/18 12:07:20 aflinta - rebuild with caito, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vino.spec?r1=1.18.2.3&r2=1.18.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:36:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SOURCES (DEVEL): gnome-menus-pl.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:36:26 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - obsoleted ---- Files affected: SOURCES: gnome-menus-pl.patch (1.1.2.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Mon Aug 22 21:37:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-menus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:37:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-menus.spec (1.24.2.8 -> 1.24.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-menus.spec diff -u SPECS/gnome-menus.spec:1.24.2.8 SPECS/gnome-menus.spec:1.24.2.9 --- SPECS/gnome-menus.spec:1.24.2.8 Tue Aug 9 15:37:41 2005 +++ SPECS/gnome-menus.spec Mon Aug 22 21:37:45 2005 @@ -2,14 +2,13 @@ Summary: Implementation of the draft Desktop Menu Specification Summary(pl): Implementacja specyfikacji menu system?w biurkowych Name: gnome-menus -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 7e90fda926e28dc31043281562a83da4 +# Source0-md5: 75ba6497923b00a2f186f27a135b6800 Patch0: %{name}-PLD.patch -Patch1: %{name}-pl.patch URL: http://www.gnome.org/ BuildRequires: autoconf BuildRequires: automake @@ -106,7 +105,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -175,6 +173,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24.2.9 2005/08/22 19:37:45 aflinta +- version 2.11.92 + Revision 1.24.2.8 2005/08/09 13:37:41 aflinta - ups, missing desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-menus.spec?r1=1.24.2.8&r2=1.24.2.9&f=u From aflinta at pld-linux.org Mon Aug 22 21:37:49 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-menus-2.11.92.tar.bz2 Message-ID: <26277.1124739469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/gnome-menus-2.11.92.tar.bz2 75ba6497923b00a2f186f27a135b6800 gnome-menus-2.11.92.tar.bz2 Size: 389415 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Mon Aug 22 21:38:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - rel. 3 for epiphany 1.7.5 In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:38:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - rel. 3 for epiphany 1.7.5 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.5 -> 1.37.2.6) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.5 SPECS/epiphany-extensions.spec:1.37.2.6 --- SPECS/epiphany-extensions.spec:1.37.2.5 Tue Aug 9 16:19:33 2005 +++ SPECS/epiphany-extensions.spec Mon Aug 22 21:38:11 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.4 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -16,7 +16,7 @@ URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.4 +BuildRequires: epiphany-devel >= 1.7.5 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.6 2005/08/22 19:38:11 paladine +- rel. 3 for epiphany 1.7.5 + Revision 1.37.2.5 2005/08/09 14:19:33 paladine - rel. 2 for rebuild with epiphany 1.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.5&r2=1.37.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: f-spot.spec - version 0.1.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:41:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 0.1.1 ---- Files affected: SPECS: f-spot.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.18 SPECS/f-spot.spec:1.19 --- SPECS/f-spot.spec:1.18 Mon Aug 22 21:13:33 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:41:11 2005 @@ -3,12 +3,12 @@ Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot -Version: 0.1.0 -Release: 0.2 +Version: 0.1.1 +Release: 0.1 License: GPL Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/%{name}-%{version}.tar.bz2 -# Source0-md5: f9cab78264a978e025d2af6425ea0ec5 +# Source0-md5: 7f0230dd8fa1e0bc071951c03c6ac375 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/projects/f-spot/ BuildRequires: GConf2-devel @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/22 19:41:11 aflinta +- version 0.1.1 + Revision 1.18 2005/08/22 19:13:33 wolf - remove manual requires ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: f-spot-0.1.1.tar.bz2 Message-ID: <28577.1124739677@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/f-spot-0.1.1.tar.bz2 7f0230dd8fa1e0bc071951c03c6ac375 f-spot-0.1.1.tar.bz2 Size: 792413 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:41:46 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: horde-passwd.spec - set default list of usernames where pas... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:41:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - set default list of usernames where password set is refused based on target machine system users ---- Files affected: SPECS: horde-passwd.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.14 SPECS/horde-passwd.spec:1.15 --- SPECS/horde-passwd.spec:1.14 Mon Aug 22 21:03:39 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:41:41 2005 @@ -6,7 +6,7 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.4 +Release: 0.10 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -16,6 +16,7 @@ URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -81,6 +82,15 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi +# take uids with < 500 and update refused logins in default conf.xml +USERLIST=$(awk -F: '{ if ($3 < 500) print $1 }' < /etc/passwd | xargs | tr ' ' ',') +if [ "$USERLIST" ]; then + sed -i -e " + # primitive xml parser ;) + /configlist name=\"refused\"/s/>.*$USERLIST= 1.3.33-2 %apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf @@ -126,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 19:41:41 glen +- set default list of usernames where password set is refused based on target machine system users + Revision 1.14 2005/08/22 19:03:39 glen - convert to horde 3.x style ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.14&r2=1.15&f=u From paladine at pld-linux.org Mon Aug 22 21:49:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - gnome-doc-utils for omf file... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:49:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - gnome-doc-utils for omf files - itemize schemas ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.4 -> 1.20.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.4 SPECS/gnome-netstatus.spec:1.20.2.5 --- SPECS/gnome-netstatus.spec:1.20.2.4 Mon Aug 22 21:28:51 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:49:29 2005 @@ -14,6 +14,7 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-panel-devel >= 2.10.0 BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.0 @@ -37,15 +38,14 @@ %setup -q %build +gnome-doc-prepare --copy --force %{__gnome_doc_common} %{__libtoolize} %{__aclocal} %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ - --disable-scrollkeeper - + --disable-schemas-install %{__make} %install @@ -82,7 +82,7 @@ %{_libdir}/bonobo/servers/* %{_omf_dest_dir}/%{name} %{_pixmapsdir}/* -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/netstatus.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -90,6 +90,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.5 2005/08/22 19:49:29 paladine +- gnome-doc-utils for omf files +- itemize schemas + Revision 1.20.2.4 2005/08/22 19:28:51 aflinta - version 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.4&r2=1.20.2.5&f=u From arekm at pld-linux.org Mon Aug 22 22:03:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: tpop3d.spec - rel 16; new cvs patch In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 16; new cvs patch ---- Files affected: SPECS: tpop3d.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/tpop3d.spec diff -u SPECS/tpop3d.spec:1.62 SPECS/tpop3d.spec:1.63 --- SPECS/tpop3d.spec:1.62 Fri Jul 22 01:59:42 2005 +++ SPECS/tpop3d.spec Mon Aug 22 22:03:46 2005 @@ -9,6 +9,7 @@ %bcond_without pgsql # without PostgreSQL support %bcond_without ssl # without ssl support %bcond_without whoson # without WHOSON protocol support +%bcond_without gdbm # without gdbm auth db %bcond_without snide # without snide server responses %bcond_with skipgetpwcheck # with getpwuid returned struct check ommited (see patch for details) # @@ -16,7 +17,7 @@ Summary(pl): Serwer POP3 Name: tpop3d Version: 1.5.3 -Release: 15 +Release: 16 License: GPL Group: Networking/Daemons Source0: http://www.ex-parrot.com/~chris/tpop3d/%{name}-%{version}.tar.gz @@ -25,7 +26,7 @@ Source2: %{name}.init Source3: %{name}.conf Patch0: %{name}-ac_am_fixes.patch -Patch1: %{name}-cvs20041005.patch +Patch1: %{name}-cvs20050822.patch Patch2: %{name}-resolv.patch Patch3: %{name}-pam-vdomain.patch Patch4: %{name}-disable-dotfile-locking.patch @@ -39,6 +40,7 @@ %{?with_pgsql:BuildRequires: postgresql-devel} %{?with_whoson:BuildRequires: whoson-devel} %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +%{?with_gdbm:BuildRequires: gdbm-devel} PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig Requires: pam >= 0.79.0 @@ -136,6 +138,7 @@ %{?with_whoson: --enable-whoson} \ %{?with_perl: --enable-auth-perl} \ %{?with_pgsql: --enable-auth-pgsql} \ +%{?with_gdbm: --enable-gdbm} \ %{?with_authother: --enable-auth-other} \ --enable-mbox-maildir \ %{?with_ssl: --enable-tls} \ @@ -193,6 +196,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/22 20:03:46 arekm +- rel 16; new cvs patch + Revision 1.62 2005/07/21 23:59:42 romke - added bcond skipgetpwcheck - it allows using uids (in {my,pg}sql virtual users) that don't belong to any system user (when getpwuid returns NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tpop3d.spec?r1=1.62&r2=1.63&f=u From arekm at pld-linux.org Mon Aug 22 22:03:42 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:01 2005 Subject: SOURCES: tpop3d-cvs20050822.patch (NEW), tpop3d-cvs20041005.patch ... In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up cvs patch to 20050822 ---- Files affected: SOURCES: tpop3d-cvs20050822.patch (NONE -> 1.1) (NEW), tpop3d-cvs20041005.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: SOURCES/tpop3d-cvs20050822.patch diff -u /dev/null SOURCES/tpop3d-cvs20050822.patch:1.1 --- /dev/null Mon Aug 22 22:03:42 2005 +++ SOURCES/tpop3d-cvs20050822.patch Mon Aug 22 22:03:37 2005 @@ -0,0 +1,2080 @@ +Index: tpop3d/CHANGES +Index: tpop3d/INSTALL +diff -u tpop3d/INSTALL:1.22 tpop3d/INSTALL:1.24 +--- tpop3d/INSTALL:1.22 Thu Jan 9 23:25:59 2003 ++++ tpop3d/INSTALL Sun May 22 11:54:12 2005 +@@ -1,5 +1,5 @@ + Installation instructions for tpop3d +-$Id$ ++$Id$ + + Thanks to the efforts of Mark Longair, tpop3d can now be configured and built + using the standard GNU autoconf approach. For most users, it should be +@@ -19,7 +19,7 @@ + also review the contents of README.darwin. + + NB that tpop3d now obeys the --sysconfdir of configure, so you will need to +-set --sysconfidr=/etc if you already have a /etc/tpop3d.conf and do not wish to ++set --sysconfdir=/etc if you already have a /etc/tpop3d.conf and do not wish to + move it. + + * Authentication +@@ -56,6 +56,7 @@ + {plaintext}... plain text password used for APOP + {mysql}... password hashed using MySQL's PASSWORD() + {md5}... straight MD5 hash ++ {sha1}... straight SHA1 hash + + Note that to use APOP, the plaintext password type must be specified for + a user, but this does not stop them logging in via any other method with +Index: tpop3d/Makefile.am +diff -u tpop3d/Makefile.am:1.41 tpop3d/Makefile.am:1.42 +--- tpop3d/Makefile.am:1.41 Mon Nov 24 19:58:28 2003 ++++ tpop3d/Makefile.am Fri Aug 5 14:48:22 2005 +@@ -4,12 +4,12 @@ + # + # Copyright (c) 2001 Chris Lightfoot, Mark Longair. All rights reserved. + # +-# $Id$ ++# $Id$ + # + + sbin_PROGRAMS = tpop3d + +-tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c \ ++tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c auth_gdbm.c \ + auth_perl.c auth_pam.c auth_passwd.c auth_flatfile.c \ + authcache.c authswitch.c buffer.c cfgdirectives.c config.c \ + connection.c ioabs_tcp.c ioabs_tls.c listener.c locks.c \ +@@ -21,7 +21,7 @@ + auth_passwd.h auth_flatfile.h auth_pgsql.h authswitch.h \ + buffer.h config.h connection.h listener.h locks.h mailbox.h \ + md5.h password.h pidfile.h signals.h stringmap.h tls.h \ +- tokenise.h vector.h util.h ++ tokenise.h vector.h util.h auth_gdbm.h + + CFLAGS += -Wall -g -O2 -DCONFIG_DIR='"@sysconfdir@"' # -Wstrict-prototypes + +Index: tpop3d/README +diff -u tpop3d/README:1.22 tpop3d/README:1.23 +--- tpop3d/README:1.22 Mon Nov 24 19:59:13 2003 ++++ tpop3d/README Tue Feb 3 19:52:02 2004 +@@ -1,7 +1,7 @@ + tpop3d, copyright (c) 2000-2003 Chris Lightfoot + http://www.ex-parrot.com/~chris/tpop3d/ + +-$Id$ ++$Id$ + + 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 +@@ -23,6 +23,7 @@ + auth-mysql a vmail-sql style MySQL database; see + http://www.ex-parrot.com/~chris/vmail-sql/ + or another database with user-specified SQL queries ++ auth-pgsql a PostgreSQL database + auth-ldap an LDAP directory + auth-flatfile /etc/passwd-style flat files + auth-other an external program +Index: tpop3d/README.auth_mysql +diff -u tpop3d/README.auth_mysql:1.7 tpop3d/README.auth_mysql:1.8 +--- tpop3d/README.auth_mysql:1.7 Wed Nov 7 00:50:41 2001 ++++ tpop3d/README.auth_mysql Wed Sep 29 20:57:59 2004 +@@ -1,5 +1,5 @@ + README for MySQL authentication in tpop3d +-$Id$ ++$Id$ + + The auth-mysql authentication driver was developed for use with the vmail-sql + database schema for virtual domains, though it is easy to adjust for a +@@ -80,6 +80,7 @@ + {crypt_md5}... crypt_md5 hash + {plaintext}... plaintext password + {mysql}... password hashed using MySQL's PASSWORD() ++ {sha1} simple SHA1 password + {md5} or no prefix old-style simple MD5 password + + {crypt} is the format of the system crypt(3) function-- two salt characters +@@ -89,10 +90,11 @@ + in crypt(3), but for portability it is included as a separate case. + {plaintext} is a password saved in plain text; this format is useful if you + want to support authentication by the APOP shared-secret mechanism. {mysql} +- is the format produced by the PASSWORD() function in MySQL. {md5} is a +- simple MD5 hash of the password, without salt, saved as a 32-character hex +- string. This is the historical format for vmail-sql, and so is the default +- if no prefix is used. This may go away at some point. ++ is the format produced by the PASSWORD() function in MySQL. {sha1} is a ++ simple 20-character hex SHA1 hash of the password. {md5} is a simple MD5 ++ hash of the password, without salt, saved as a 32-character hex string or a ++ 24-character base64 one. This is the historical format for vmail-sql, and so ++ is the default if no prefix is used. This may go away at some point. + + Now, we compare the user's password against the stored hash or password, + and decide whether to authenticate the user or not. If this does not +Index: tpop3d/TODO +diff -u tpop3d/TODO:1.46 tpop3d/TODO:1.48 +--- tpop3d/TODO:1.46 Mon Nov 24 19:58:28 2003 ++++ tpop3d/TODO Sun Jun 20 00:06:30 2004 +@@ -1,5 +1,5 @@ + Things To Do +-$Id$ ++$Id$ + + * A proper code audit + +@@ -96,3 +96,18 @@ + + * Latency vs. throughput tradeoff under high load? + ++* Deferred writes in connection_sendmessage -- that should bring the cost of ++ sending messages down to the cost of substituting \r\n for \n, etc. ++ ++* Configurable (or adaptive?) SO_SNDBUF ++ We probably don't have enough information to measure the necessary ++ parameters (though in principle we could measure the delay between sending ++ +OK... and receiving a new command), so just make this a config file option. ++ ++* NTLM authentication ++ ++* STLS+APOP issue (email of 20040306) ++ ++* Repeated messages (email of 20040325) ++ ++* Maildir semantics (email of 20040331) +Index: tpop3d/auth_flatfile.c +diff -u tpop3d/auth_flatfile.c:1.2 tpop3d/auth_flatfile.c:1.3 +--- tpop3d/auth_flatfile.c:1.2 Mon Feb 17 23:18:32 2003 ++++ tpop3d/auth_flatfile.c Sun Jun 20 00:06:30 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_FLATFILE +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include + +@@ -86,7 +86,7 @@ + * second field to the password hash. Any subsequent fields are ignored. */ + static char *read_user_passwd(const char *local_part, const char *domain) { + FILE *fp = NULL; +- char *filename = NULL; ++ char *filename = NULL, *result = NULL; + struct sverr err; + static char *buf, *pwhash; + static size_t buflen; +@@ -149,6 +149,8 @@ + if ((end = strchr(pwhash, ':'))) + *end = 0; + ++ result = pwhash; ++ + break; + } + +@@ -159,7 +161,7 @@ + if (filename) + xfree(filename); + +- return pwhash; ++ return result; + } + + /* auth_flatfile_new_user_pass: +Index: tpop3d/auth_gdbm.c +diff -u /dev/null tpop3d/auth_gdbm.c:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.c Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,196 @@ ++/* ++ * auth_gdbm.c: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include ++ ++#ifdef HAVE_CRYPT_H /* XXX */ ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "auth_gdbm.h" ++#include "authswitch.h" ++#include "password.h" ++#include "config.h" ++#include "util.h" ++ ++static gid_t virtual_gid; ++static uid_t virtual_uid; ++static char *user_passwd_file; ++GDBM_FILE dbf; ++int persistent; ++ ++/* auth_gdbm_init: ++ * Initialise the driver. Reads the config directives. */ ++int auth_gdbm_init() { ++ char *s; ++ ++ /* Obtain uid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-user"))) { ++ if (!parse_uid(s, &virtual_uid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-user directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-user directive in config")); ++ return 0; ++ } ++ ++ /* Obtain gid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-group"))) { ++ if (!parse_gid(s, &virtual_gid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-group directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-group directive in config")); ++ return 0; ++ } ++ ++ /* Obtain path to passwd file */ ++ if ((s = config_get_string("auth-gdbm-passwd-file"))) { ++ user_passwd_file = s; ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-passwd-file directive in config")); ++ return 0; ++ } ++ ++ /* persistent GDBM filehandle? */ ++ if (config_get_bool("auth-gdbm-persistent")) { ++ persistent = 1; ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ } else { ++ persistent = 0; ++ } ++ ++ return 1; ++} ++ ++/* auth_gdbm_new_user_pass: ++ * Attempt to authenticate user and pass using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password(who, value.dptr, pass, "{crypt}")) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++/* auth_gdbm_new_apop: ++ * Attempt to authenticate user via APOP using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password_apop(who, value.dptr, timestamp, digest)) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++void auth_gdbm_postfork() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++void auth_gdbm_close() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++#endif /* AUTH_GDBM */ +Index: tpop3d/auth_gdbm.h +diff -u /dev/null tpop3d/auth_gdbm.h:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.h Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,35 @@ ++/* ++ * auth_gdbm.h: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifndef __AUTH_GDBM_H_ /* include guard */ ++#define __AUTH_GDBM_H_ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include "authswitch.h" ++ ++/* auth_gdbm.c */ ++int auth_gdbm_init(void); ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost, const char *serverhost); ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost, const char *serverhost); ++void auth_gdbm_postfork(void); ++void auth_gdbm_close(void); ++ ++ ++#endif /* AUTH_GDBM */ ++ ++#endif /* __AUTH_GDBM_H_ */ +Index: tpop3d/auth_mysql.c +diff -u tpop3d/auth_mysql.c:1.54 tpop3d/auth_mysql.c:1.56 +--- tpop3d/auth_mysql.c:1.54 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_mysql.c Thu Aug 19 23:57:05 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_MYSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -44,7 +44,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -52,7 +52,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -60,20 +60,20 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + + /* + * Connection to the MySQL server. + */ +-MYSQL *mysql = NULL; +-tokens mysql_servers; +-char mysql_driver_active = 0; ++static MYSQL *mysql = NULL; ++static tokens mysql_servers; ++static char mysql_driver_active = 0; + + /* get_mysql_server: + * If we are not currently connected to a MySQL server, or if the current MySQL +@@ -267,7 +267,7 @@ + + /* User was not lying (about her password) */ + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +@@ -367,7 +367,7 @@ + } + + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +Index: tpop3d/auth_pgsql.c +diff -u tpop3d/auth_pgsql.c:1.1 tpop3d/auth_pgsql.c:1.2 +--- tpop3d/auth_pgsql.c:1.1 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_pgsql.c Thu Aug 19 23:57:05 2004 +@@ -13,7 +13,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_PGSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -105,7 +105,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -113,7 +113,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -121,11 +121,11 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + +@@ -148,7 +148,7 @@ + * Initialise the database connection driver. Clears the config directives + * associated with the database so that a user cannot recover them with a + * debugger. */ +-PGconn *pg_conn; ++static PGconn *pg_conn; + + int auth_pgsql_init(void) { + char *username = NULL, *password = NULL, *hostname = NULL, *database = NULL, *localhost = "localhost", *s; +Index: tpop3d/authswitch.c +diff -u tpop3d/authswitch.c:1.42 tpop3d/authswitch.c:1.45 +--- tpop3d/authswitch.c:1.42 Mon Nov 24 19:58:28 2003 ++++ tpop3d/authswitch.c Fri Aug 5 14:48:22 2005 +@@ -6,7 +6,7 @@ + * + */ + +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #ifdef HAVE_CONFIG_H + #include "configuration.h" +@@ -52,6 +52,10 @@ + #include "auth_passwd.h" + #endif /* AUTH_PASSWD */ + ++#ifdef AUTH_GDBM ++#include "auth_gdbm.h" ++#endif /* AUTH_GDBM */ ++ + #ifdef USE_WHOSON + #include + #endif +@@ -122,6 +126,13 @@ + "flatfile", + _X("Uses /etc/passwd-style flat files")}, + #endif /* AUTH_FLATFILE */ ++ ++#ifdef AUTH_GDBM ++ /* Authenticate against GNU dbm files. */ ++ {auth_gdbm_init, auth_gdbm_new_apop, auth_gdbm_new_user_pass, NULL, auth_gdbm_postfork, auth_gdbm_close, ++ "gdbm", ++ _X("Uses GNU dbm files")}, ++#endif /* AUTH_GDBM */ + }; <> From paladine at pld-linux.org Mon Aug 22 22:17:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-panel.spec - updated to 2.11.92 - removed not... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 20:17:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - removed notification_area_applet patch ---- Files affected: SPECS: gnome-panel.spec (1.166.4.12 -> 1.166.4.13) ---- Diffs: ================================================================ Index: SPECS/gnome-panel.spec diff -u SPECS/gnome-panel.spec:1.166.4.12 SPECS/gnome-panel.spec:1.166.4.13 --- SPECS/gnome-panel.spec:1.166.4.12 Wed Aug 17 23:51:38 2005 +++ SPECS/gnome-panel.spec Mon Aug 22 22:17:30 2005 @@ -2,16 +2,15 @@ Summary: The core programs for the GNOME GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME Name: gnome-panel -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 6b44787f4970f10c42e031176aa65da7 +# Source0-md5: 595c10d159deb0ff3126e8b9793d7013 Patch0: %{name}-finalize-memleak.patch -Patch1: %{name}-notification_area_applet.patch -Patch2: %{name}-no_mixer_applet.patch -Patch3: %{name}-no_launchers_on_panel.patch +Patch1: %{name}-no_mixer_applet.patch +Patch2: %{name}-no_launchers_on_panel.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -111,7 +110,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build gnome-doc-prepare --copy --force @@ -244,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166.4.13 2005/08/22 20:17:30 paladine +- updated to 2.11.92 +- removed notification_area_applet patch + Revision 1.166.4.12 2005/08/17 21:51:38 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.166.4.12&r2=1.166.4.13&f=u From paladine at pld-linux.org Mon Aug 22 22:17:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-panel-2.11.92.tar.bz2 Message-ID: <21172.1124741863@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-2.11.92.tar.bz2 595c10d159deb0ff3126e8b9793d7013 gnome-panel-2.11.92.tar.bz2 Size: 2411526 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:22:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): file-roller.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:22:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: file-roller.spec (1.69.2.5 -> 1.69.2.6) ---- Diffs: ================================================================ Index: SPECS/file-roller.spec diff -u SPECS/file-roller.spec:1.69.2.5 SPECS/file-roller.spec:1.69.2.6 --- SPECS/file-roller.spec:1.69.2.5 Thu Aug 18 11:35:22 2005 +++ SPECS/file-roller.spec Mon Aug 22 22:21:59 2005 @@ -3,12 +3,12 @@ Summary(pl): Zarz?dca archiw?w dla GNOME Summary(pt_BR): Gerenciador de arquivos compactados para o GNOME Name: file-roller -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 17a7d83aad34f02bd0528c620b22f633 +# Source0-md5: 7fa299e6c4d4498cc3d00ba76bd17f8b Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.69.2.6 2005/08/22 20:21:59 aflinta +- 2.11.92 + Revision 1.69.2.5 2005/08/18 09:35:22 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file-roller.spec?r1=1.69.2.5&r2=1.69.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:22:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: file-roller-2.11.92.tar.bz2 Message-ID: <26498.1124742132@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/file-roller-2.11.92.tar.bz2 7fa299e6c4d4498cc3d00ba76bd17f8b file-roller-2.11.92.tar.bz2 Size: 1219994 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 22:22:25 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: rlocate.spec - fixed md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:22:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: rlocate.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.28 SPECS/rlocate.spec:1.29 --- SPECS/rlocate.spec:1.28 Mon Aug 22 16:50:29 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:22:20 2005 @@ -25,7 +25,7 @@ License: GPL Group: Base Source0: http://dl.sourceforge.net/rlocate/%{name}-%{version}.tar.gz -# Source0-md5: d65e350fe83480cc1db40912a0dfa87b +# Source0-md5: e3c8371a6659bf1e0d9d1fe02c0efe6d Patch0: %{name}-build.patch URL: http://rlocate.sourceforge.net/ BuildRequires: autoconf @@ -255,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/22 20:22:20 paszczus +- fixed md5 + Revision 1.28 2005/08/22 14:50:29 paszczus - added init script (temporary from redhat) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.28&r2=1.29&f=u From paszczus at pld-linux.org Mon Aug 22 22:22:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <26917.1124742146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz Size: 191217 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:27:23 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gtkhtml.spec - version 3.7.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:27:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 3.7.7 ---- Files affected: SPECS: gtkhtml.spec (1.130.2.5 -> 1.130.2.6) ---- Diffs: ================================================================ Index: SPECS/gtkhtml.spec diff -u SPECS/gtkhtml.spec:1.130.2.5 SPECS/gtkhtml.spec:1.130.2.6 --- SPECS/gtkhtml.spec:1.130.2.5 Sun Aug 21 10:50:25 2005 +++ SPECS/gtkhtml.spec Mon Aug 22 22:27:18 2005 @@ -6,12 +6,12 @@ Summary(uk): GtkHTML - ?? ?????????? ??????????/??????????? HTML Summary(zh_CN): gtkhtml ?? Name: gtkhtml -Version: 3.7.6 -Release: 2 +Version: 3.7.7 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/%{name}-%{version}.tar.bz2 -# Source0-md5: fd9b3d048a5c94a1af0de78fe0bf7d77 +# Source0-md5: acfa34618f43b425b6208c09dffd2386 Patch0: %{name}-pixmap.patch Patch1: %{name}-link.patch Patch2: %{name}-crash.patch @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.130.2.6 2005/08/22 20:27:18 aflinta +- version 3.7.7 + Revision 1.130.2.5 2005/08/21 08:50:25 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtkhtml.spec?r1=1.130.2.5&r2=1.130.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:27:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gtkhtml-3.7.7.tar.bz2 Message-ID: <30410.1124742445@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/gtkhtml-3.7.7.tar.bz2 acfa34618f43b425b6208c09dffd2386 gtkhtml-3.7.7.tar.bz2 Size: 1518722 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: libsoup-2.2.6.tar.bz2 Message-ID: <32053.1124742571@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.tar.bz2 2b16657c52e690933ddb250d351fba3c libsoup-2.2.6.tar.bz2 Size: 430471 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: libsoup.spec - version 2.2.6 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:29:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.2.6 ---- Files affected: SPECS: libsoup.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.43 SPECS/libsoup.spec:1.44 --- SPECS/libsoup.spec:1.43 Thu Aug 4 16:41:42 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:29:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.5 +Version: 2.2.6 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 50ba7189fe1f645b48f4ddc509d4dec4 +# Source0-md5: 2b16657c52e690933ddb250d351fba3c URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/22 20:29:27 aflinta +- version 2.2.6 + Revision 1.43 2005/08/04 14:41:42 aflinta - up to version 2.2.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.43&r2=1.44&f=u From paszczus at pld-linux.org Mon Aug 22 22:30:00 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: rlocate.spec - fixed %post and %postun section - build fail... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:30:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ---- Files affected: SPECS: rlocate.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.29 SPECS/rlocate.spec:1.30 --- SPECS/rlocate.spec:1.29 Mon Aug 22 22:22:20 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:29:54 2005 @@ -194,17 +194,13 @@ if [ ! -f /var/lib/rlocate/rlocate.db ]; then echo 'Run "%{_bindir}/updatedb" if you want to make rlocate database immediately.' fi +/sbin/chkconfig --add %{name} +%service %{name} restart %postun if [ "$1" = "0" ]; then %groupremove rlocate -fi - -%post init -/sbin/chkconfig --add %{name} -%service %{name} restart - -%preun init +else if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} @@ -255,6 +251,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/22 20:29:54 paszczus +- fixed %post and %postun section +- build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d + Revision 1.29 2005/08/22 20:22:20 paszczus - fixed md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.29&r2=1.30&f=u From baggins at pld-linux.org Mon Aug 22 22:32:44 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: pam-pld-0.80.1.tar.gz Message-ID: <1625.1124742764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz df374f625e7178f43a263a32e376dd46 pam-pld-0.80.1.tar.gz Size: 1311375 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-icon-theme-2.11.92.tar.bz2 Message-ID: <2102.1124742794@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/gnome-icon-theme-2.11.92.tar.bz2 a47b8debffc6c8228954fd100e7dc02f gnome-icon-theme-2.11.92.tar.bz2 Size: 3038101 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:13 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-icon-theme.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:33:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-icon-theme.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-icon-theme.spec diff -u SPECS/gnome-icon-theme.spec:1.36.2.4 SPECS/gnome-icon-theme.spec:1.36.2.5 --- SPECS/gnome-icon-theme.spec:1.36.2.4 Tue Aug 9 13:38:03 2005 +++ SPECS/gnome-icon-theme.spec Mon Aug 22 22:33:08 2005 @@ -2,12 +2,12 @@ Summary: Default icon themes for GNOME2 enviroment Summary(pl): Domy?lne motywy ikon dla ?rodowiska GNOME2 Name: gnome-icon-theme -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 4c54d897f6eba91b9b9e12633ff50637 +# Source0-md5: a47b8debffc6c8228954fd100e7dc02f URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/22 20:33:08 aflinta +- 2.11.92 + Revision 1.36.2.4 2005/08/09 11:38:03 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icon-theme.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gcalctool.spec - 5.6.28 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:35:26 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 5.6.28 ---- Files affected: SPECS: gcalctool.spec (1.45.2.3 -> 1.45.2.4) ---- Diffs: ================================================================ Index: SPECS/gcalctool.spec diff -u SPECS/gcalctool.spec:1.45.2.3 SPECS/gcalctool.spec:1.45.2.4 --- SPECS/gcalctool.spec:1.45.2.3 Thu Aug 18 11:39:35 2005 +++ SPECS/gcalctool.spec Mon Aug 22 22:35:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME calculator Summary(pl): Kalkulator dla GNOME Name: gcalctool -Version: 5.6.26 +Version: 5.6.28 Release: 2 License: GPL v2 Group: Applications/Math Source0: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/%{name}-%{version}.tar.bz2 -# Source0-md5: a60f02819f9840e3b0097d3f69f6f4d2 +# Source0-md5: 2e6dfe43c8455fd4aac5976f4e7badfc Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -84,6 +84,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45.2.4 2005/08/22 20:35:21 aflinta +- 5.6.28 + Revision 1.45.2.3 2005/08/18 09:39:35 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcalctool.spec?r1=1.45.2.3&r2=1.45.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gcalctool-5.6.28.tar.bz2 Message-ID: <4734.1124742925@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/gcalctool-5.6.28.tar.bz2 2e6dfe43c8455fd4aac5976f4e7badfc gcalctool-5.6.28.tar.bz2 Size: 1107054 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:37:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): eog.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:37:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eog.spec (1.73.2.4 -> 1.73.2.5) ---- Diffs: ================================================================ Index: SPECS/eog.spec diff -u SPECS/eog.spec:1.73.2.4 SPECS/eog.spec:1.73.2.5 --- SPECS/eog.spec:1.73.2.4 Thu Aug 18 11:26:37 2005 +++ SPECS/eog.spec Mon Aug 22 22:37:49 2005 @@ -3,12 +3,12 @@ Summary(pl): Oko GNOME - przegl?darka obrazk?w Summary(pt_BR): Visualizador de imagem Eye of GNOME Name: eog -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9438a070620fcc0dc17956edc933597d +# Source0-md5: 9992e70d6b59120474ad775e11b60f94 Patch0: %{name}-libtool.patch Patch1: %{name}-desktop.patch URL: http://www.gnome.org/ @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.73.2.5 2005/08/22 20:37:49 aflinta +- 2.11.92 + Revision 1.73.2.4 2005/08/18 09:26:37 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eog.spec?r1=1.73.2.4&r2=1.73.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:37:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: eog-2.11.92.tar.bz2 Message-ID: <5941.1124743076@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/eog-2.11.92.tar.bz2 9992e70d6b59120474ad775e11b60f94 eog-2.11.92.tar.bz2 Size: 988587 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: libsoup-2.2.6.1.tar.bz2 Message-ID: <7551.1124743234@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.1.tar.bz2 e31e178a685aa64dc60f98a89d3d0141 libsoup-2.2.6.1.tar.bz2 Size: 430461 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: libsoup.spec - 2.2.6.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:40:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.2.6.1 ---- Files affected: SPECS: libsoup.spec (1.44 -> 1.45) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.44 SPECS/libsoup.spec:1.45 --- SPECS/libsoup.spec:1.44 Mon Aug 22 22:29:27 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:40:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.6 +Version: 2.2.6.1 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b16657c52e690933ddb250d351fba3c +# Source0-md5: e31e178a685aa64dc60f98a89d3d0141 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45 2005/08/22 20:40:27 aflinta +- 2.2.6.1 + Revision 1.44 2005/08/22 20:29:27 aflinta - version 2.2.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.44&r2=1.45&f=u From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: libgtop-2.11.92.tar.bz2 Message-ID: <11169.1124743566@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/libgtop-2.11.92.tar.bz2 e367a89414910bbc66fae20b312aaf58 libgtop-2.11.92.tar.bz2 Size: 745655 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): libgtop.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:46:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: libgtop.spec (1.107.2.5 -> 1.107.2.6) ---- Diffs: ================================================================ Index: SPECS/libgtop.spec diff -u SPECS/libgtop.spec:1.107.2.5 SPECS/libgtop.spec:1.107.2.6 --- SPECS/libgtop.spec:1.107.2.5 Mon Aug 8 15:44:19 2005 +++ SPECS/libgtop.spec Mon Aug 22 22:46:01 2005 @@ -7,13 +7,13 @@ Summary(ru): ?????????? LibGTop Summary(uk): ?????????? LibGTop Name: libgtop -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: e135594822c0952bb0eb7f496bfb8b40 +# Source0-md5: e367a89414910bbc66fae20b312aaf58 Patch0: %{name}-configure.patch URL: http://www.home-of-linux.org/gnome/libgtop/ BuildRequires: autoconf @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.107.2.6 2005/08/22 20:46:01 aflinta +- 2.11.92 + Revision 1.107.2.5 2005/08/08 13:44:19 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgtop.spec?r1=1.107.2.5&r2=1.107.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-system-monitor.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:50:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-system-monitor.spec (1.27.2.6 -> 1.27.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-system-monitor.spec diff -u SPECS/gnome-system-monitor.spec:1.27.2.6 SPECS/gnome-system-monitor.spec:1.27.2.7 --- SPECS/gnome-system-monitor.spec:1.27.2.6 Thu Aug 18 13:00:03 2005 +++ SPECS/gnome-system-monitor.spec Mon Aug 22 22:50:52 2005 @@ -2,12 +2,12 @@ Summary: Simple process monitor Summary(pl): Prosty monitor proces?w Name: gnome-system-monitor -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a28849a5934d95b7d8370ddd0d1c92f7 +# Source0-md5: 6bb8f6b50f4edfb57dc2d58a26b3fe2c Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -87,6 +87,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27.2.7 2005/08/22 20:50:52 aflinta +- 2.11.92 + Revision 1.27.2.6 2005/08/18 11:00:03 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-monitor.spec?r1=1.27.2.6&r2=1.27.2.7&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-system-monitor-2.11.92.tar.bz2 Message-ID: <14032.1124743858@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/gnome-system-monitor-2.11.92.tar.bz2 6bb8f6b50f4edfb57dc2d58a26b3fe2c gnome-system-monitor-2.11.92.tar.bz2 Size: 779754 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: metacity-2.11.3.tar.bz2 Message-ID: <16315.1124744107@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/metacity-2.11.3.tar.bz2 703f5a27deb9052eaba98ae6ada588c6 metacity-2.11.3.tar.bz2 Size: 1700272 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): metacity.spec - 2.11.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:55:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.3 ---- Files affected: SPECS: metacity.spec (1.96.2.4 -> 1.96.2.5) ---- Diffs: ================================================================ Index: SPECS/metacity.spec diff -u SPECS/metacity.spec:1.96.2.4 SPECS/metacity.spec:1.96.2.5 --- SPECS/metacity.spec:1.96.2.4 Wed Aug 17 22:40:53 2005 +++ SPECS/metacity.spec Mon Aug 22 22:54:57 2005 @@ -9,13 +9,13 @@ Summary: Metacity window manager Summary(pl): Zarz?dca okien Metacity Name: metacity -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 Epoch: 2 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 8cd042855bec2df5e4592d0aabbd5b6d +# Source0-md5: 703f5a27deb9052eaba98ae6ada588c6 Patch0: %{name}-libtool.patch Patch1: %{name}-swap-resize-button.patch BuildRequires: GConf2-devel >= 2.10.0 @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96.2.5 2005/08/22 20:54:57 aflinta +- 2.11.3 + Revision 1.96.2.4 2005/08/17 20:40:53 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/metacity.spec?r1=1.96.2.4&r2=1.96.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 22:56:56 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: rlocate.spec - fixed %files, cron and init In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:56:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %files, cron and init ---- Files affected: SPECS: rlocate.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.30 SPECS/rlocate.spec:1.31 --- SPECS/rlocate.spec:1.30 Mon Aug 22 22:29:54 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:56:51 2005 @@ -160,7 +160,10 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d +install -d $RPM_BUILD_ROOT/etc/cron.daily install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +install rlocate.cron $RPM_BUILD_ROOT/etc/cron.daily/rlocate %if %{with userspace} %{__make} install \ @@ -220,9 +223,6 @@ %endif %endif -%attr(754,root,root) /etc/rc.d/init.d/%{name} -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} - %if %{with userspace} %files %defattr(644,root,root,755) @@ -245,12 +245,17 @@ %dir %attr(750,root,rlocate) /var/lib/rlocate %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/22 20:56:51 paszczus +- fixed %files, cron and init + Revision 1.30 2005/08/22 20:29:54 paszczus - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.30&r2=1.31&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS (DEVEL): gnome-utils.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:57:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-utils.spec (1.124.2.4 -> 1.124.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-utils.spec diff -u SPECS/gnome-utils.spec:1.124.2.4 SPECS/gnome-utils.spec:1.124.2.5 --- SPECS/gnome-utils.spec:1.124.2.4 Mon Aug 8 17:38:34 2005 +++ SPECS/gnome-utils.spec Mon Aug 22 22:57:54 2005 @@ -6,13 +6,13 @@ Summary(uk): ??????? GNOME, ???? ?? ????? ?????? ?? ??????????? Summary(zh_CN): GNOME?????????? Name: gnome-utils -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 5a148b44cc9acb0c92f0d8eaae26eb46 +# Source0-md5: c1fe1083a946da6ee6a10798021400e7 Patch0: %{name}-desktop.patch Patch1: %{name}-omf.patch Icon: gnome-utils.xpm @@ -323,6 +323,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124.2.5 2005/08/22 20:57:54 aflinta +- 2.11.92 + Revision 1.124.2.4 2005/08/08 15:38:34 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.124.2.4&r2=1.124.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:05 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: gnome-utils-2.11.92.tar.bz2 Message-ID: <18422.1124744285@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/gnome-utils-2.11.92.tar.bz2 c1fe1083a946da6ee6a10798021400e7 gnome-utils-2.11.92.tar.bz2 Size: 1716708 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 22:58:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:01 2005 Subject: SPECS: horde-passwd.spec - fix partially configured hook In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 20:58:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix partially configured hook ---- Files affected: SPECS: horde-passwd.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.15 SPECS/horde-passwd.spec:1.16 --- SPECS/horde-passwd.spec:1.15 Mon Aug 22 21:41:41 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 22:58:46 2005 @@ -6,13 +6,14 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.10 +Release: 0.12 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,6 +47,7 @@ %prep %setup -q -n passwd-h3-%{version}-beta +%patch0 -p1 # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -136,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/22 20:58:46 glen +- fix partially configured hook + Revision 1.15 2005/08/22 19:41:41 glen - set default list of usernames where password set is refused based on target machine system users ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.15&r2=1.16&f=u From darekr at pld-linux.org Mon Aug 22 23:03:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:01 2005 Subject: DISTFILES: dumb-0.9.3.tar.gz Message-ID: <21957.1124744587@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dumb/dumb-0.9.3.tar.gz f48da5b990aa8aa822d3b6a951baf5c2 dumb-0.9.3.tar.gz Size: 167379 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 23:03:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: dumb.spec - updated to 0.9.3 - added -devel, -static packag... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 21:03:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3 - added -devel, -static packages - cosmetics ---- Files affected: SPECS: dumb.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/dumb.spec diff -u SPECS/dumb.spec:1.7 SPECS/dumb.spec:1.8 --- SPECS/dumb.spec:1.7 Sun Jun 20 23:36:37 2004 +++ SPECS/dumb.spec Mon Aug 22 23:02:57 2005 @@ -2,12 +2,12 @@ Summary: DUMB - Dedicated Universal Music Bastardisation Summary(pl): DUMB - Dedicated Universal Music Bastardisation Name: dumb -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 0.1 License: GPL-like Group: Development/Libraries Source0: http://dl.sourceforge.net/dumb/%{name}-%{version}.tar.gz -# Source0-md5: 0ce45f64934e6d5d7b82a55108596680 +# Source0-md5: f48da5b990aa8aa822d3b6a951baf5c2 URL: http://dumb.sourceforge.net/ BuildRequires: allegro-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -20,8 +20,32 @@ %description -l pl Biblioteka DUMB - Dedicated Universal Music Bastardisation. +%package devel +Summary: Header files for dumb +Summary(pl): Pliki nag??wkowe dla dumb +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +dumb header files. + +%description devel -l pl +Pliki nag??wkowe dla dumb. + +%package static +Summary: Static libraries for dumb +Summary(pl): Statyczne biblioteki dla dumb +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +dumb static libraries. + +%description static -l pl +Biblioteki statyczne dla dumb. + %prep -%setup -q -n %{name} +%setup -q %build cat < make/config.txt @@ -31,14 +55,18 @@ PREFIX := /usr EOF -%{__make} all CC="%{__cc}" OFLAGS="%{rpmcflags}" +%{__make} all \ + CC="%{__cc}" \ + OFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 %clean rm -rf $RPM_BUILD_ROOT @@ -46,8 +74,15 @@ %files %defattr(644,root,root,755) %doc *.txt docs/* +%attr(755,root,root) %{_bindir}/dumb* + +%files devel +%defattr(644,root,root,755) %{_includedir}/* -%{_libdir}/* + +%files static +%defattr(644,root,root,755) +%{_libdir}/lib*.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +90,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:02:57 darekr +- updated to 0.9.3 +- added -devel, -static packages +- cosmetics + Revision 1.7 2004/06/20 21:36:37 arekm - fix specflags (quotation here is buggy) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dumb.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Mon Aug 22 23:23:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): control-center.spec - updated to 2.11.92 - updated ... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated pangoxft_fix patch ---- Files affected: SPECS: control-center.spec (1.170.2.10 -> 1.170.2.11) ---- Diffs: ================================================================ Index: SPECS/control-center.spec diff -u SPECS/control-center.spec:1.170.2.10 SPECS/control-center.spec:1.170.2.11 --- SPECS/control-center.spec:1.170.2.10 Sun Aug 14 23:32:32 2005 +++ SPECS/control-center.spec Mon Aug 22 23:23:23 2005 @@ -6,13 +6,13 @@ Summary(uk): ????? ????????? GNOME Summary(ru): ????? ?????????? GNOME Name: control-center -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a429f605878160e2660725bad2ee1e17 +# Source0-md5: 9572d1033c1103c2ed57e802c24b5a5c Patch0: %{name}-randr.patch Patch1: %{name}-wm_properties-dir.patch Patch2: %{name}-additional-metacity-keybinding.patch @@ -48,6 +48,7 @@ BuildRequires: libtool BuildRequires: metacity-devel >= 2:2.10.0 BuildRequires: nautilus-devel >= 2.11.0 +BuildRequires: pango-devel >= 1:1.9.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper BuildRequires: xft-devel >= 2.1.1 @@ -241,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.170.2.11 2005/08/22 21:23:23 paladine +- updated to 2.11.92 +- updated pangoxft_fix patch + Revision 1.170.2.10 2005/08/14 21:32:32 freetz - pangoxft fix added, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/control-center.spec?r1=1.170.2.10&r2=1.170.2.11&f=u From paladine at pld-linux.org Mon Aug 22 23:23:18 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES (DEVEL): control-center-pangoxft_fix.patch - updated for 2... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: control-center-pangoxft_fix.patch (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: SOURCES/control-center-pangoxft_fix.patch diff -u SOURCES/control-center-pangoxft_fix.patch:1.1 SOURCES/control-center-pangoxft_fix.patch:1.1.2.1 --- SOURCES/control-center-pangoxft_fix.patch:1.1 Sun Aug 14 23:33:05 2005 +++ SOURCES/control-center-pangoxft_fix.patch Mon Aug 22 23:23:11 2005 @@ -1,15 +1,7 @@ -diff -aurN control-center-2.11.91.orig/capplets/keyboard/Makefile.am control-center-2.11.91/capplets/keyboard/Makefile.am ---- control-center-2.11.91.orig/capplets/keyboard/Makefile.am 2004-11-28 09:14:04.000000000 +0100 -+++ control-center-2.11.91/capplets/keyboard/Makefile.am 2005-08-14 23:24:03.000000000 +0200 -@@ -10,6 +10,7 @@ - gnome_keyboard_properties_LDADD = \ - ../accessibility/keyboard/libaccessibility-keyboard.a \ - $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ -+ $(PANGOXFT_LIBS) \ - ../../libgswitchit/libgswitchit.a \ - ../../libkbdraw/libkbdraw.a - -@@ -29,6 +30,6 @@ +diff -urN control-center-2.11.92.orig/capplets/keyboard/Makefile.am control-center-2.11.92/capplets/keyboard/Makefile.am +--- control-center-2.11.92.orig/capplets/keyboard/Makefile.am 2005-08-22 22:44:26.558451264 +0200 ++++ control-center-2.11.92/capplets/keyboard/Makefile.am 2005-08-22 22:46:46.310205768 +0200 +@@ -29,6 +29,6 @@ Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) @@ -17,18 +9,17 @@ +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) $(PANGOXFT_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) -diff -aurN control-center-2.11.91.orig/configure.in control-center-2.11.91/configure.in ---- control-center-2.11.91.orig/configure.in 2005-08-10 11:45:08.000000000 +0200 -+++ control-center-2.11.91/configure.in 2005-08-14 23:18:51.000000000 +0200 -@@ -97,6 +97,11 @@ - libbonobo-2.0 dnl - libbonoboui-2.0 dnl - gnome-desktop-2.0 >= 2.2.0" -+ +diff -urN control-center-2.11.92.orig/configure.in control-center-2.11.92/configure.in +--- control-center-2.11.92.orig/configure.in 2005-08-22 22:44:27.329334072 +0200 ++++ control-center-2.11.92/configure.in 2005-08-22 22:47:35.247766128 +0200 +@@ -126,7 +126,9 @@ + + PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES) + +-PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.8) +PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.9.1) +AC_SUBST(PANGOXFT_CFLAGS) +AC_SUBST(PANGOXFT_LIBS) -+ - PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) - PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1) - PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, + + dnl + dnl Check for XRandR, needed for display capplet ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/control-center-pangoxft_fix.patch?r1=1.1&r2=1.1.2.1&f=u From paladine at pld-linux.org Mon Aug 22 23:23:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: control-center-2.11.92.tar.bz2 Message-ID: <1258.1124745813@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/control-center-2.11.92.tar.bz2 9572d1033c1103c2ed57e802c24b5a5c control-center-2.11.92.tar.bz2 Size: 1906135 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Mon Aug 22 23:34:02 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: luma.spec - fixed my previous commit message in changelog In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 21:34:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed my previous commit message in changelog ---- Files affected: SPECS: luma.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.7 SPECS/luma.spec:1.8 --- SPECS/luma.spec:1.7 Mon Aug 22 18:32:07 2005 +++ SPECS/luma.spec Mon Aug 22 23:33:56 2005 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:33:56 twittner +- fixed my previous commit message in changelog + Revision 1.7 2005/08/22 16:32:07 twittner $ luma QPainter::begin: Cannot paint null pixmap @@ -72,7 +75,8 @@ $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ -- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py +- to avoid this call luma.py not luma.pyc +- don't rm *.py - luma doesn't work without *.py files Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.7&r2=1.8&f=u From paszczus at pld-linux.org Mon Aug 22 23:50:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: test: paszczus (NEW) - test In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:50:09 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: paszczus (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: test/paszczus diff -u /dev/null test/paszczus:1.1 --- /dev/null Mon Aug 22 23:50:09 2005 +++ test/paszczus Mon Aug 22 23:50:04 2005 @@ -0,0 +1 @@ +test ================================================================ From paszczus at pld-linux.org Mon Aug 22 23:51:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: test (DEVEL): paszczus test2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:51:48 2005 GMT Module: test Tag: DEVEL ---- Log message: test2 ---- Files affected: test: paszczus (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1 test/paszczus:1.1.2.1 --- test/paszczus:1.1 Mon Aug 22 23:50:04 2005 +++ test/paszczus Mon Aug 22 23:51:43 2005 @@ -1 +1,2 @@ test +test2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1&r2=1.1.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:07 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): digikam.spec - updated to 0.8.0 (snap 2005-08-22) -... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ---- Files affected: SPECS: digikam.spec (1.42 -> 1.42.2.1) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42 SPECS/digikam.spec:1.42.2.1 --- SPECS/digikam.spec:1.42 Mon Aug 22 21:01:58 2005 +++ SPECS/digikam.spec Mon Aug 22 23:56:01 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 56c8e01718ffc64a0c2a2d412b00986c URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -22,6 +23,7 @@ BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 +BuildRequires: sqlite3-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,7 +49,7 @@ Interfejs KDE do gphoto2 - pliki nag??wkowe. %prep -%setup -q +%setup -q -n digikam %build @@ -89,7 +91,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README +%doc digikam/AUTHORS digikam/ChangeLog digikam/README %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/*.so.*.*.* %attr(755,root,root) %{_libdir}/kde3/*.so @@ -97,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -%{_datadir}/apps/showfoto +#%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -106,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -%{_includedir}/digikam +#%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -114,6 +116,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.1 2005/08/22 21:56:01 paszczus +- updated to 0.8.0 (snap 2005-08-22) +- added BR: sqlite3-devel + Revision 1.42 2005/08/22 19:01:58 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42&r2=1.42.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: digikam-0.8.0-20050822.tar.bz2 Message-ID: <19554.1124747770@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikam-0.8.0-20050822.tar.bz2 56c8e01718ffc64a0c2a2d412b00986c digikam-0.8.0-20050822.tar.bz2 Size: 2415489 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: digikamimageplugins-0.8.0-20050822.tar.bz2 Message-ID: <23032.1124748211@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikamimageplugins-0.8.0-20050822.tar.bz2 9e9f6e8a930fe2a88665a05065163f9f digikamimageplugins-0.8.0-20050822.tar.bz2 Size: 3149640 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): digikamimageplugins.spec - updated to 0.8.0 (snap 2... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:03:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) ---- Files affected: SPECS: digikamimageplugins.spec (1.6 -> 1.6.2.1) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.6 SPECS/digikamimageplugins.spec:1.6.2.1 --- SPECS/digikamimageplugins.spec:1.6 Mon Aug 22 21:13:06 2005 +++ SPECS/digikamimageplugins.spec Tue Aug 23 00:03:25 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 9e9f6e8a930fe2a88665a05065163f9f URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -48,9 +49,13 @@ - adjustcurves %prep -%setup -q +%setup -q -n %{name} %build + +cp -f /usr/share/automake/config.sub admin +%{__make} -f admin/Makefile.common cvs + %configure \ --with-qt-libraries=%{_libdir} %{__make} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.2.1 2005/08/22 22:03:25 paszczus +- updated to 0.8.0 (snap 2005-08-22) + Revision 1.6 2005/08/22 19:13:06 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.6&r2=1.6.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 00:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): digikam.spec - commented files are back In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:04:46 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commented files are back ---- Files affected: SPECS: digikam.spec (1.42.2.1 -> 1.42.2.2) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42.2.1 SPECS/digikam.spec:1.42.2.2 --- SPECS/digikam.spec:1.42.2.1 Mon Aug 22 23:56:01 2005 +++ SPECS/digikam.spec Tue Aug 23 00:04:41 2005 @@ -99,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -#%{_datadir}/apps/showfoto +%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -108,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -#%{_includedir}/digikam +%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -116,6 +116,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.2 2005/08/22 22:04:41 paszczus +- commented files are back + Revision 1.42.2.1 2005/08/22 21:56:01 paszczus - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42.2.1&r2=1.42.2.2&f=u From paszczus at pld-linux.org Tue Aug 23 00:07:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: test (DEVEL): paszczus - dziala In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:07:51 2005 GMT Module: test Tag: DEVEL ---- Log message: - dziala ---- Files affected: test: paszczus (1.1.2.1 -> 1.1.2.2) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1.2.1 test/paszczus:1.1.2.2 --- test/paszczus:1.1.2.1 Mon Aug 22 23:51:43 2005 +++ test/paszczus Tue Aug 23 00:07:46 2005 @@ -1,2 +1,3 @@ -test -test2 +cvs tag -b DEVEL +cvs tag -F -b DEVEL +cvs ci -r DEVEL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1.2.1&r2=1.1.2.2&f=u From charles at pld-linux.org Tue Aug 23 03:36:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: qemu-nosdlgui.patch - updated to 0.7.1 In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 01:36:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.7.1 ---- Files affected: SOURCES: qemu-nosdlgui.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/qemu-nosdlgui.patch diff -u SOURCES/qemu-nosdlgui.patch:1.1 SOURCES/qemu-nosdlgui.patch:1.2 --- SOURCES/qemu-nosdlgui.patch:1.1 Thu Jul 7 02:37:20 2005 +++ SOURCES/qemu-nosdlgui.patch Tue Aug 23 03:36:40 2005 @@ -10,10 +10,9 @@ cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< -diff -Nur qemu-0.7.0.orig/sdl.c qemu-0.7.0.chng/sdl.c ---- qemu-0.7.0.orig/sdl.c 2005-04-27 20:52:05.000000000 +0000 -+++ qemu-0.7.0.chng/sdl.c 2005-07-06 22:28:55.000000000 +0000 -@@ -1,507 +1,614 @@ +--- qemu-0.7.1/sdl.c.orig 2005-07-24 20:52:08.000000000 +0200 ++++ qemu-0.7.1/sdl.c 2005-08-23 01:47:48.000000000 +0200 +@@ -1,506 +1,614 @@ /* - * QEMU SDL display driver - * @@ -25,11 +24,11 @@ - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: -+ * Xlib interface for QEMU System Emulator - * +- * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. -- * ++ * Xlib interface for QEMU System Emulator + * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -39,16 +38,18 @@ - * THE SOFTWARE. - */ -#include "vl.h" -- --#include + * Copyright (c) 2004 Vladimit Oleynik + * Used ideas from Bochs, SDL, PCEmu. +*/ -+ + +-#include +#include +#include +#include -+ + +-#ifndef _WIN32 +-#include +-#endif +/* hack, special for qemu */ +#define X_display_init sdl_display_init + @@ -88,10 +89,7 @@ + 0x24, 0x15, 0x49, 0x49, 0x09, + 0xc8, 0x36, 0x32, 0x49, 0x0e, +}; - --#ifndef _WIN32 --#include --#endif ++ +#include "vl.h" -static SDL_Surface *screen; @@ -104,27 +102,8 @@ -static int gui_fullscreen_initial_grab; -static int gui_grab_code = KMOD_LALT | KMOD_LCTRL; -static uint8_t modifiers_state[256]; -- --static void sdl_update(DisplayState *ds, int x, int y, int w, int h) --{ -- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); -- SDL_UpdateRect(screen, x, y, w, h); --} -- --static void sdl_resize(DisplayState *ds, int w, int h) --{ -- int flags; -- -- // printf("resizing to %d %d\n", w, h); -- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; -- flags |= SDL_RESIZABLE; -- if (gui_fullscreen) -- flags |= SDL_FULLSCREEN; -- screen = SDL_SetVideoMode(w, h, 0, flags); -- if (!screen) { -- fprintf(stderr, "Could not open SDL display\n"); -- exit(1); +-static void sdl_update(DisplayState *ds, int x, int y, int w, int h) +static Display *qx_display; +static int q_x_screen_num; +static Window win; @@ -135,25 +114,37 @@ +static int width, height; + +static void x_update(DisplayState *ds, int x, int y, int w, int h) -+{ + { +- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); +- SDL_UpdateRect(screen, x, y, w, h); + XPutImage(qx_display, win, gc, ximage, x, y, x, y, w, h); + XFlush(qx_display); -+} -+ + } + +-static void sdl_resize(DisplayState *ds, int w, int h) +static int prev_x, prev_y; +static int current_x, current_y; + +/* Move the cursor to a center window place */ +static void qXWarpPointer(void) -+{ + { +- int flags; + int x = width/2; + int y = height/2; -+ + +- // printf("resizing to %d %d\n", w, h); + prev_x = current_x = x; + prev_y = current_y = y; + XWarpPointer(qx_display, None, win, 0, 0, 0, 0, x, y); +} -+ + +- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; +- if (gui_fullscreen) +- flags |= SDL_FULLSCREEN; +- screen = SDL_SetVideoMode(w, h, 0, flags); +- if (!screen) { +- fprintf(stderr, "Could not open SDL display\n"); +- exit(1); +static void x_resize(DisplayState *ds, int w, int h) +{ + XSizeHints hints; @@ -164,7 +155,12 @@ + hints.max_width = hints.min_width = w; + hints.max_height = hints.min_height = h; + XSetWMNormalHints(qx_display, win, &hints); -+ } + } +- ds->data = screen->pixels; +- ds->linesize = screen->pitch; +- ds->depth = screen->format->BitsPerPixel; +- ds->width = w; +- ds->height = h; + if(ximage) { + XDestroyImage(ximage); +// free(ds->data); @@ -194,15 +190,19 @@ + ximage->data = ds->data; + qXWarpPointer(); + XFlush(qx_display); -+} -+ + } + +-/* generic keyboard conversion */ +static int gui_grab; -+ + +-#include "sdl_keysym.h" +-#include "keymaps.c" +static void x_SetCaption(void) +{ + char *title, *icon; + XTextProperty titleprop, iconprop; -+ + +-static kbd_layout_t *kbd_layout = NULL; + title = icon = "QEMU"; + if (!vm_running && !gui_grab) + title = "QEMU [Stopped]"; @@ -210,7 +210,15 @@ + title = "QEMU - Press Ctrl-Shift to exit grab"; + if (!vm_running && gui_grab) + title = "QEMU [Stopped] - Press Ctrl-Shift to exit grab"; -+ + +-static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) +-{ +- int keysym; +- /* workaround for X11+SDL bug with AltGR */ +- keysym = ev->keysym.sym; +- if (keysym == 0 && ev->keysym.scancode == 113) +- keysym = SDLK_MODE; +- return keysym2scancode(kbd_layout, keysym); + XStringListToTextProperty(&title, 1, &titleprop); + XSetWMName(qx_display, win, &titleprop); + XFree(titleprop.value); @@ -219,8 +227,9 @@ + XSetWMIconName(qx_display, win, &iconprop); + XFree(iconprop.value); + XSync(qx_display, /* no discard */ 0); -+} -+ + } + +-/* specific keyboard conversions from scan codes */ +static void trigger_mouse_grab(void) +{ + gui_grab ^= 1; @@ -228,126 +237,26 @@ + /* disable cursor */ + static Cursor cursor; + static int cursor_created; -+ + +-#if defined(_WIN32) +#define shape_width 16 +#define shape_height 16 +#define mask_width 16 +#define mask_height 16 -+ + +-static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) +-{ +- return ev->keysym.scancode; +-} + static unsigned int shape_bits[(16*16)/32]; + static unsigned int mask_bits[(16*16)/32]; -+ + +-#else + if (!cursor_created) { + Pixmap shape, mask; + XColor white, black; + Colormap default_cmap; -+ -+ default_cmap = DefaultColormap(qx_display, q_x_screen_num); -+ -+ shape = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)shape_bits, -+ shape_width, shape_height, -+ 1, 0, 1); -+ mask = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)mask_bits, -+ mask_width, mask_height, -+ 1, 0, 1); -+ XParseColor(qx_display, default_cmap, "black", &black); -+ XParseColor(qx_display, default_cmap, "white", &white); -+ cursor = XCreatePixmapCursor(qx_display, shape, mask, -+ &white, &black, 1, 1); -+ cursor_created = 1; -+ } -+ XDefineCursor(qx_display, win, cursor); -+ -+ /* grab pointer and keyboard */ -+ -+// if ( flags & FULLSCREEN ) { -+// /* Unbind the mouse from the fullscreen window */ -+// XUngrabPointer(qx_display, CurrentTime); -+// } -+ /* Try to grab the mouse */ -+ while ( 1 ) { -+ int result = XGrabPointer(qx_display, win, True, 0, -+ GrabModeAsync, GrabModeAsync, -+ win, None, CurrentTime); -+ if (result == GrabSuccess) -+ break; -+ } -+ /* Now grab the keyboard */ -+ XGrabKeyboard(qx_display, win, True, -+ GrabModeAsync, GrabModeAsync, CurrentTime); -+ -+ /* Raise the window if we grab the mouse */ -+// if ( !(flags & FULLSCREEN) ) -+ XRaiseWindow(qx_display, win); -+ qXWarpPointer(); -+ } else { -+ /* enable cursor */ -+ XUndefineCursor(qx_display, win); -+ /* ungrab pointer and keyboard */ -+ XUngrabPointer(qx_display, CurrentTime); -+ XUngrabKeyboard(qx_display, CurrentTime); -+ } -+ x_SetCaption(); -+} -+ -+static unsigned mouse_button_state; -+ -+static void send_keyboard_mouse_status(void) -+{ -+ int dx, dy; -+ -+ dx = current_x - prev_x; -+ dy = -(current_y - prev_y); -+ kbd_mouse_event(dx, -dy, 0, mouse_button_state); -+ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { -+ qXWarpPointer(); -+ } else { -+ prev_x = current_x; -+ prev_y = current_y; - } -- ds->data = screen->pixels; -- ds->linesize = screen->pitch; -- ds->depth = screen->format->BitsPerPixel; -- ds->width = w; -- ds->height = h; - } --/* generic keyboard conversion */ -- --#include "sdl_keysym.h" --#include "keymaps.c" -- --static kbd_layout_t *kbd_layout = NULL; -- --static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) -+static const unsigned char scan_table1[] = - { -- int keysym; -- /* workaround for X11+SDL bug with AltGR */ -- keysym = ev->keysym.sym; -- if (keysym == 0 && ev->keysym.scancode == 113) -- keysym = SDLK_MODE; -- return keysym2scancode(kbd_layout, keysym); --} -- --/* specific keyboard conversions from scan codes */ -- --#if defined(_WIN32) -- --static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) --{ -- return ev->keysym.scancode; --} -- -+ 0x39, 0x02, -+#ifdef KBUK /* double quotes, hash symbol */ -+ 0x03, 0x2b, - #else -- -static const uint8_t x_keycode_to_pc_keycode[61] = { - 0xc7, /* 97 Home */ - 0xc8, /* 98 Up */ @@ -411,13 +320,32 @@ - 0x52, /* 156 KP_Ins */ - 0x53, /* 157 KP_Del */ -}; -- ++ default_cmap = DefaultColormap(qx_display, q_x_screen_num); + -static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) -{ - int keycode; -- ++ shape = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)shape_bits, ++ shape_width, shape_height, ++ 1, 0, 1); ++ mask = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)mask_bits, ++ mask_width, mask_height, ++ 1, 0, 1); ++ XParseColor(qx_display, default_cmap, "black", &black); ++ XParseColor(qx_display, default_cmap, "white", &white); ++ cursor = XCreatePixmapCursor(qx_display, shape, mask, ++ &white, &black, 1, 1); ++ cursor_created = 1; ++ } ++ XDefineCursor(qx_display, win, cursor); + - keycode = ev->keysym.scancode; -- ++ /* grab pointer and keyboard */ + - if (keycode < 9) { - keycode = 0; - } else if (keycode < 97) { @@ -429,8 +357,71 @@ - keycode = 0; - } - return keycode; --} -- ++// if ( flags & FULLSCREEN ) { ++// /* Unbind the mouse from the fullscreen window */ ++// XUngrabPointer(qx_display, CurrentTime); ++// } ++ /* Try to grab the mouse */ ++ while ( 1 ) { ++ int result = XGrabPointer(qx_display, win, True, 0, ++ GrabModeAsync, GrabModeAsync, ++ win, None, CurrentTime); ++ if (result == GrabSuccess) ++ break; ++ } ++ /* Now grab the keyboard */ ++ XGrabKeyboard(qx_display, win, True, ++ GrabModeAsync, GrabModeAsync, CurrentTime); ++ ++ /* Raise the window if we grab the mouse */ ++// if ( !(flags & FULLSCREEN) ) ++ XRaiseWindow(qx_display, win); ++ qXWarpPointer(); ++ } else { ++ /* enable cursor */ ++ XUndefineCursor(qx_display, win); ++ /* ungrab pointer and keyboard */ ++ XUngrabPointer(qx_display, CurrentTime); ++ XUngrabKeyboard(qx_display, CurrentTime); ++ } ++ x_SetCaption(); + } + +-#endif ++static unsigned mouse_button_state; + +-static void reset_keys(void) ++static void send_keyboard_mouse_status(void) + { +- int i; +- for(i = 0; i < 256; i++) { +- if (modifiers_state[i]) { +- if (i & 0x80) +- kbd_put_keycode(0xe0); +- kbd_put_keycode(i | 0x80); +- modifiers_state[i] = 0; +- } ++ int dx, dy; ++ ++ dx = current_x - prev_x; ++ dy = -(current_y - prev_y); ++ kbd_mouse_event(dx, -dy, 0, mouse_button_state); ++ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { ++ qXWarpPointer(); ++ } else { ++ prev_x = current_x; ++ prev_y = current_y; + } + } + +-static void sdl_process_key(SDL_KeyboardEvent *ev) ++static const unsigned char scan_table1[] = + { +- int keycode, v; ++ 0x39, 0x02, ++#ifdef KBUK /* double quotes, hash symbol */ ++ 0x03, 0x2b, ++#else + 0x28, 0x04, +#endif + 0x05, 0x06, 0x08, 0x28, @@ -460,25 +451,8 @@ + 0x56, +#else + 0x2b, - #endif ++#endif --static void reset_keys(void) --{ -- int i; -- for(i = 0; i < 256; i++) { -- if (modifiers_state[i]) { -- if (i & 0x80) -- kbd_put_keycode(0xe0); -- kbd_put_keycode(i | 0x80); -- modifiers_state[i] = 0; -- } -- } --} -- --static void sdl_process_key(SDL_KeyboardEvent *ev) --{ -- int keycode, v; -- - if (ev->keysym.sym == SDLK_PAUSE) { - /* specific case */ - v = 0; @@ -489,13 +463,20 @@ - kbd_put_keycode(0x45 | v); - return; - } -- ++ 0x1b, + - if (kbd_layout) { - keycode = sdl_keyevent_to_keycode_generic(ev); - } else { - keycode = sdl_keyevent_to_keycode(ev); - } -- ++#ifdef KBUK /* tilde */ ++ 0x2b, ++#else ++ 0x29, ++#endif ++}; + - switch(keycode) { - case 0x00: - /* sent when leaving window: reset the modifiers state */ @@ -519,7 +500,7 @@ - kbd_put_keycode(keycode | 0x80); - return; - } -- + - /* now send the key code */ - if (keycode & 0x80) - kbd_put_keycode(0xe0); @@ -528,7 +509,16 @@ - else - kbd_put_keycode(keycode & 0x7f); -} -- ++static const struct { ++ KeySym key; ++ unsigned scan_code; ++} scan_table2[] = { ++ { XK_BackSpace, 0x0e }, ++ { XK_Tab, 0x0f }, ++ { XK_Return, 0x1c }, ++ { XK_Escape, 0x01 }, ++ { XK_Delete, 0x53e0 }, + -static void sdl_update_caption(void) -{ - char buf[1024]; @@ -541,7 +531,17 @@ - } - SDL_WM_SetCaption(buf, "QEMU"); -} -- ++ { XK_Home, 0x47e0 }, ++ { XK_Left, 0x4be0 }, ++ { XK_Up, 0x48e0 }, ++ { XK_Right, 0x4de0 }, ++ { XK_Down, 0x50e0 }, ++ { XK_Prior, 0x49e0 }, ++ { XK_Next, 0x51e0 }, ++ { XK_End, 0x4fe0 }, ++ { XK_Insert, 0x52e0 }, ++ { XK_Num_Lock, 0x45 }, + -static void sdl_grab_start(void) -{ - SDL_ShowCursor(0); @@ -551,7 +551,8 @@ - gui_grab = 1; - sdl_update_caption(); -} -- ++/* This block of codes is for Sun Type 4 keyboards... */ + -static void sdl_grab_end(void) -{ - SDL_WM_GrabInput(SDL_GRAB_OFF); @@ -559,7 +560,11 @@ - gui_grab = 0; - sdl_update_caption(); -} -- ++ { XK_F27, 0x47e0 }, /* Home/R7/F27 */ ++ { XK_F29, 0x49e0 }, /* Prior/R9/F29 */ ++ { XK_F35, 0x51e0 }, /* Next/R15/F35 */ ++ { XK_F33, 0x4fe0 }, /* End/R13/F33 */ + -static void sdl_send_mouse_event(int dz) -{ - int dx, dy, state, buttons; @@ -573,7 +578,9 @@ - buttons |= MOUSE_EVENT_MBUTTON; - kbd_mouse_event(dx, dy, dz, buttons); -} -- ++ { XK_F25, 0x36e0 }, /* Keypad divide/R5/F25 */ ++ { XK_F26, 0x37 }, /* Keypad multiply/R6/F26 */ + -static void toggle_full_screen(DisplayState *ds) -{ - gui_fullscreen = !gui_fullscreen; @@ -588,10 +595,64 @@ - vga_invalidate_display(); - vga_update_display(); -} -+ 0x1b, ++ { XK_F23, 0x46 }, /* Scroll lock/R3/F23 */ -static void sdl_refresh(DisplayState *ds) --{ ++ { XK_F31, 0x4c }, /* Keypad 5/R11/F31 */ ++ ++/* End of Sun type 4 codes */ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qemu-nosdlgui.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 08:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: nautilus-cd-burner-2.11.7.tar.bz2 Message-ID: <31858.1124776859@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/nautilus-cd-burner-2.11.7.tar.bz2 3874a54b177cea400bb6c8a089c71e31 nautilus-cd-burner-2.11.7.tar.bz2 Size: 607499 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:00:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): nautilus-cd-burner.spec - version 2.11.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:00:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.7 ---- Files affected: SPECS: nautilus-cd-burner.spec (1.48.2.4 -> 1.48.2.5) ---- Diffs: ================================================================ Index: SPECS/nautilus-cd-burner.spec diff -u SPECS/nautilus-cd-burner.spec:1.48.2.4 SPECS/nautilus-cd-burner.spec:1.48.2.5 --- SPECS/nautilus-cd-burner.spec:1.48.2.4 Thu Aug 18 13:36:10 2005 +++ SPECS/nautilus-cd-burner.spec Tue Aug 23 08:00:52 2005 @@ -2,12 +2,12 @@ Summary: Extension for Nautilus to write CD Summary(pl): Rozszerzenie Nautilusa do zapisu p?yt CD Name: nautilus-cd-burner -Version: 2.11.6 -Release: 2 +Version: 2.11.7 +Release: 1 License: LGPL v2+/GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: ad4c124980d740c709acf631007c01e9 +# Source0-md5: 3874a54b177cea400bb6c8a089c71e31 URL: http://www.gnome.org/ Buildrequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf >= 2.52 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.5 2005/08/23 06:00:52 aflinta +- version 2.11.7 + Revision 1.48.2.4 2005/08/18 11:36:10 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus-cd-burner.spec?r1=1.48.2.4&r2=1.48.2.5&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: dasher.spec - 3.2.16 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:12:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.2.16 ---- Files affected: SPECS: dasher.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/dasher.spec diff -u SPECS/dasher.spec:1.18 SPECS/dasher.spec:1.19 --- SPECS/dasher.spec:1.18 Fri Apr 8 11:45:54 2005 +++ SPECS/dasher.spec Tue Aug 23 08:12:21 2005 @@ -2,14 +2,13 @@ Summary: Predictive text entry application Summary(pl): Przewiduj?ca aplikacja do wprowadzania tekstu Name: dasher -Version: 3.2.15 -Release: 2 +Version: 3.2.16 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/%{name}-%{version}.tar.bz2 -# Source0-md5: a3fa85e32c94c69476e12ecba7d257e7 -Patch0: %{name}-locale-names.patch -Patch1: %{name}-desktop.patch +# Source0-md5: 8e0a06db2a4452ec43c696f85bb9e1dc +Patch0: %{name}-desktop.patch URL: http://www.inference.phy.cam.ac.uk/dasher/ BuildRequires: GConf2-devel BuildRequires: ORBit2-devel @@ -57,9 +56,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 - -rm -f po/no.po %build %{__libtoolize} @@ -78,6 +74,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} --with-gnome --all-name %clean @@ -105,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 06:12:21 aflinta +- 3.2.16 + Revision 1.18 2005/04/08 09:45:54 paladine - new style macros - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dasher.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:38 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: dasher-3.2.16.tar.bz2 Message-ID: <4571.1124777558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/dasher-3.2.16.tar.bz2 8e0a06db2a4452ec43c696f85bb9e1dc dasher-3.2.16.tar.bz2 Size: 4595501 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:18:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): eel.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:18:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eel.spec (1.72.2.5 -> 1.72.2.6) ---- Diffs: ================================================================ Index: SPECS/eel.spec diff -u SPECS/eel.spec:1.72.2.5 SPECS/eel.spec:1.72.2.6 --- SPECS/eel.spec:1.72.2.5 Sun Aug 21 10:36:13 2005 +++ SPECS/eel.spec Tue Aug 23 08:17:57 2005 @@ -3,12 +3,12 @@ Summary(pl): Biblioteka rozszerze? Eazel Summary(ko): Eazel ???? ?????????? Name: eel -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: d3d850c7148ebd6f0fe538faf03f996d +# Source0-md5: 58aec74f3ea93c43fcc69ae67bd1679d URL: http://nautilus.eazel.com/ BuildRequires: autoconf BuildRequires: automake @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72.2.6 2005/08/23 06:17:57 aflinta +- 2.11.92 + Revision 1.72.2.5 2005/08/21 08:36:13 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eel.spec?r1=1.72.2.5&r2=1.72.2.6&f=u From aflinta at pld-linux.org Tue Aug 23 08:18:39 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: eel-2.11.92.tar.bz2 Message-ID: <7758.1124777919@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/eel-2.11.92.tar.bz2 58aec74f3ea93c43fcc69ae67bd1679d eel-2.11.92.tar.bz2 Size: 634956 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 08:51:08 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: tomboy.spec - fixed path to *.service, desktop - cosmetics In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:51:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed path to *.service, desktop - cosmetics ---- Files affected: SPECS: tomboy.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.9 SPECS/tomboy.spec:1.10 --- SPECS/tomboy.spec:1.9 Mon Aug 22 16:51:48 2005 +++ SPECS/tomboy.spec Tue Aug 23 08:51:02 2005 @@ -8,8 +8,7 @@ Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b -Source1: %{name}.desktop -#Patch0: %{name}-desktop.patch +Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ BuildRequires: GConf2-devel BuildRequires: atk-devel >= 1.2.4 @@ -45,7 +44,7 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build %{__libtoolize} @@ -59,12 +58,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_desktopdir} +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp data/tomboy.desktop $RPM_BUILD_ROOT%{_desktopdir} +mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ + $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ %find_lang %{name} @@ -81,16 +82,16 @@ %attr(755,root,root) %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas %dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.exe %{_libdir}/%{name}/*.config +%{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins -%{_libdir}/dbus-1.0/services/*.service -%{_libdir}/%{name}/Plugins/*.dll -%{_libdir}/bonobo/servers/* +%{_datadir}/dbus-1/services/*.service %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop +%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc @@ -101,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 06:51:02 pawcioos +- fixed path to *.service, desktop +- cosmetics + Revision 1.9 2005/08/22 14:51:48 pawcioos - updated to 0.3.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.9&r2=1.10&f=u From pawcioos at pld-linux.org Tue Aug 23 08:52:16 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: tomboy-desktop.patch - path for desktop 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:52:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - path for desktop 0.3.3 ---- Files affected: SOURCES: tomboy-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.1 SOURCES/tomboy-desktop.patch:1.2 --- SOURCES/tomboy-desktop.patch:1.1 Mon Nov 1 17:40:48 2004 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 08:52:11 2005 @@ -1,11 +1,10 @@ -diff -urN aa/tomboy-0.2.2/configure.in tomboy-0.2.2/configure.in ---- aa/tomboy-0.2.2/configure.in 2004-10-15 00:13:31.000000000 +0200 -+++ tomboy-0.2.2/configure.in 2004-11-01 18:26:22.895964176 +0100 -@@ -87,6 +87,7 @@ - AC_OUTPUT([ - Makefile - tomboy.spec -+tomboy.desktop - Tomboy/Makefile - TrayIcon/Makefile - TrayIcon/libtrayicon/Makefile +--- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +@@ -1,6 +1,5 @@ +- + [Desktop Entry] +-Version=@VERSION@ ++Version=0.3.3 + Encoding=UTF-8 + _Name=Tomboy Notes + _Comment=Quick and handy note-taker ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 09:33:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: dasher-locale-names.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:33:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsoleted ---- Files affected: SOURCES: dasher-locale-names.patch (1.6 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Tue Aug 23 09:34:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): nautilus.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:34:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: nautilus.spec (1.156.2.7 -> 1.156.2.8) ---- Diffs: ================================================================ Index: SPECS/nautilus.spec diff -u SPECS/nautilus.spec:1.156.2.7 SPECS/nautilus.spec:1.156.2.8 --- SPECS/nautilus.spec:1.156.2.7 Wed Aug 17 23:02:14 2005 +++ SPECS/nautilus.spec Tue Aug 23 09:33:58 2005 @@ -3,12 +3,12 @@ Summary(pl): Nautilus - pow?oka GNOME i zarz?dca plik?w Summary(pt_BR): Nautilus ? um gerenciador de arquivos para o GNOME Name: nautilus -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b3d9551afc4f40fd5c90d2fc4dfd35 +# Source0-md5: 8ee9569339fa79ffa4f61f294d124201 Source1: %{name}.PLD.readme Patch0: %{name}-includes.patch Patch1: %{name}-desktop.patch @@ -20,11 +20,11 @@ BuildRequires: automake BuildRequires: cdparanoia-III-devel BuildRequires: docbook-utils >= 0.6.10 -BuildRequires: eel-devel >= 2.11.91 +BuildRequires: eel-devel >= 2.11.92 BuildRequires: esound-devel >= 1:0.2.30 BuildRequires: freetype-devel >= 2.1.4 BuildRequires: gettext-devel -BuildRequires: gnome-desktop-devel >= 2.11.90-2 +BuildRequires: gnome-desktop-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.11.1 BuildRequires: intltool >= 0.33 BuildRequires: libart_lgpl-devel >= 2.3.17 @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.156.2.8 2005/08/23 07:33:58 aflinta +- 2.11.92 + Revision 1.156.2.7 2005/08/17 21:02:14 aflinta - rebuild with new cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus.spec?r1=1.156.2.7&r2=1.156.2.8&f=u From aflinta at pld-linux.org Tue Aug 23 09:34:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: nautilus-2.11.92.tar.bz2 Message-ID: <16538.1124782454@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/nautilus-2.11.92.tar.bz2 8ee9569339fa79ffa4f61f294d124201 nautilus-2.11.92.tar.bz2 Size: 3994853 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:45:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): glib2.spec - updated to 2.8.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:45:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.8.1 ---- Files affected: SPECS: glib2.spec (1.108.2.9 -> 1.108.2.10) ---- Diffs: ================================================================ Index: SPECS/glib2.spec diff -u SPECS/glib2.spec:1.108.2.9 SPECS/glib2.spec:1.108.2.10 --- SPECS/glib2.spec:1.108.2.9 Sun Aug 14 02:04:25 2005 +++ SPECS/glib2.spec Tue Aug 23 09:45:11 2005 @@ -16,13 +16,13 @@ Summary(tr): Yararl? ufak yordamlar kitapl??? Summary(zh_CN): ?????????????? Name: glib2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 1 License: LGPL Group: Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-%{version}.tar.bz2 -# Source0-md5: 803305bfd59cf7421d90983bf63e5227 +# Source0-md5: 2229ca9d5490a87d5e027e029520df14 Patch0: %{name}-makefile.patch Patch1: %{name}-SEGV.patch URL: http://www.gtk.org/ @@ -212,6 +212,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108.2.10 2005/08/23 07:45:11 paladine +- updated to 2.8.1 + Revision 1.108.2.9 2005/08/14 00:04:25 freetz - 2.8.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.108.2.9&r2=1.108.2.10&f=u From paladine at pld-linux.org Tue Aug 23 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: glib-2.8.1.tar.bz2 Message-ID: <23192.1124783125@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.1.tar.bz2 2229ca9d5490a87d5e027e029520df14 glib-2.8.1.tar.bz2 Size: 2561938 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:46:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: tomboy-desktop.patch - fixed Categories - removed OnlySho... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:46:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed Categories - removed OnlyShowIn=KDE ---- Files affected: SOURCES: tomboy-desktop.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.2 SOURCES/tomboy-desktop.patch:1.3 --- SOURCES/tomboy-desktop.patch:1.2 Tue Aug 23 08:52:11 2005 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 09:46:45 2005 @@ -1,5 +1,6 @@ ---- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 -+++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +diff -urN tomboy-0.3.3.orig/data/tomboy.desktop.in tomboy-0.3.3/data/tomboy.desktop.in +--- tomboy-0.3.3.orig/data/tomboy.desktop.in 2005-08-23 09:34:25.546703880 +0200 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 09:36:34.600084784 +0200 @@ -1,6 +1,5 @@ - [Desktop Entry] @@ -8,3 +9,13 @@ Encoding=UTF-8 _Name=Tomboy Notes _Comment=Quick and handy note-taker +@@ -10,8 +9,7 @@ + StartupNotify=false + Terminal=false + Type=Application +-Categories=Application;Utility; +-OnlyShowIn=KDE; ++Categories=GTK;GNOME;Utility; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=tomboy + X-GNOME-Bugzilla-Component=General ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Tue Aug 23 09:50:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: tomboy.spec - proper license - sorted BRs/Rs - removed no l... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:50:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper license - sorted BRs/Rs - removed no locale - use new GConf schemas macros - removed useless scrollkeeper-update - sorted/fixed %%files - fixed desktop patch - rel. 2 ---- Files affected: SPECS: tomboy.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.10 SPECS/tomboy.spec:1.11 --- SPECS/tomboy.spec:1.10 Tue Aug 23 08:51:02 2005 +++ SPECS/tomboy.spec Tue Aug 23 09:49:57 2005 @@ -3,8 +3,8 @@ Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy Version: 0.3.3 -Release: 1 -License: GPL +Release: 2 +License: LGPL v2.1 Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b @@ -17,17 +17,18 @@ BuildRequires: dotnet-dbus-sharp-devel BuildRequires: dotnet-gtk-sharp-devel BuildRequires: dotnet-gtk-sharp-gnome-devel -BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: gnome-panel-devel +BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: intltool >= 0.25 BuildRequires: libtool BuildRequires: mono-csharp BuildRequires: pkgconfig -Requires(post): GConf2 +BuildRequires: rpmbuild(macros) >= 1.197 +Requires(post,preun): GConf2 Requires: mono +Requires: dotnet-dbus-sharp Requires: dotnet-gtk-sharp Requires: dotnet-gtk-sharp-gnome -Requires: dotnet-dbus-sharp Requires: gnome-panel ExclusiveArch: %{ix86} %{x8664} alpha arm hppa ppc s390 sparc sparcv9 sparc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -53,11 +54,11 @@ %{__automake} %configure \ --disable-schemas-install - %{__make} %install rm -rf $RPM_BUILD_ROOT + install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ @@ -67,34 +68,37 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install -/usr/bin/scrollkeeper-update +%gconf_schema_install tomboy.schemas + +%preun +%gconf_schema_uninstall tomboy.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/dbus-1/services/*.service +%{_datadir}/gnome-2.0/ui/* +%{_desktopdir}/*.desktop %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.config -%{_libdir}/%{name}/*.exe +%attr(755,root,root) %{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la -%dir %{_libdir}/%{name}/Plugins -%{_datadir}/dbus-1/services/*.service -%{_datadir}/gnome-2.0/ui/* -%{_desktopdir}/*.desktop -%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/%{name}/Plugins %{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc +%{_sysconfdir}/gconf/schemas/tomboy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +106,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 07:49:57 paladine +- proper license +- sorted BRs/Rs +- removed no locale +- use new GConf schemas macros +- removed useless scrollkeeper-update +- sorted/fixed %%files +- fixed desktop patch +- rel. 2 + Revision 1.10 2005/08/23 06:51:02 pawcioos - fixed path to *.service, desktop - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.10&r2=1.11&f=u From paszczus at pld-linux.org Tue Aug 23 10:00:54 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: horde-passwd.spec - little clean In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 08:00:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - little clean ---- Files affected: SPECS: horde-passwd.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.16 SPECS/horde-passwd.spec:1.17 --- SPECS/horde-passwd.spec:1.16 Mon Aug 22 22:58:46 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 10:00:47 2005 @@ -31,7 +31,7 @@ %define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org +%define _sysconfdir /etc/horde.org %define _appdir %{hordedir}/%{_hordeapp} %description @@ -138,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 08:00:47 paszczus +- little clean + Revision 1.16 2005/08/22 20:58:46 glen - fix partially configured hook ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.16&r2=1.17&f=u From paladine at pld-linux.org Tue Aug 23 10:09:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: openldev-0.4.2.tar.gz Message-ID: <5464.1124784596@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/openldev/openldev-0.4.2.tar.gz 9883643f1939f00f7c54318030d7b460 openldev-0.4.2.tar.gz Size: 418917 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 10:09:57 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: openldev.spec - updated to 0.4.2 - moved from gtkmm to gtk+... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 08:09:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 - moved from gtkmm to gtk+2 - updated descriptions ---- Files affected: SPECS: openldev.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/openldev.spec diff -u SPECS/openldev.spec:1.10 SPECS/openldev.spec:1.11 --- SPECS/openldev.spec:1.10 Fri Jul 22 23:42:31 2005 +++ SPECS/openldev.spec Tue Aug 23 10:09:51 2005 @@ -2,33 +2,32 @@ Summary: Graphical front-end to gcc/g++ Summary(pl): Graficzna nak?adka na gcc/g++ Name: openldev -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://dl.sourceforge.net/openldev/%{name}-%{version}.tar.gz -# Source0-md5: d22a497e87a6aafdfe663b3cffb1670d +# Source0-md5: 9883643f1939f00f7c54318030d7b460 Patch0: %{name}-desktop.patch Patch1: %{name}-makefile.patch URL: http://www.openldev.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: gnome-vfsmm-devel -BuildRequires: gtkmm-devel >= 2.6.0 +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk+2-devel >= 2.6.0 BuildRequires: gtksourceview-devel >= 1.2.0 -BuildRequires: libglademm-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: vte-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Open Linux Developer is a environment based on the Gtkmm libraries +Open Linux Developer is a environment based on the GTK+2 libraries that provides a graphical front-end to gcc/g++. It includes the basic essentials needed by a C/C++ programmer. %description -l pl -Open Linux Developer jest ?rodowiskiem opartym o bibliotek? Gtkmm, +Open Linux Developer jest ?rodowiskiem opartym o bibliotek? GTK+2, b?d?cym graficzn? nak?adk? na gcc/g++. Zawiera podstawowe sk?adniki porzebne dla programisty C/C++. @@ -75,6 +74,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 08:09:51 paladine +- updated to 0.4.2 +- moved from gtkmm to gtk+2 +- updated descriptions + Revision 1.10 2005/07/22 21:42:31 freetz - 0.4.1, missing libglademm-devel BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldev.spec?r1=1.10&r2=1.11&f=u From paladine at pld-linux.org Tue Aug 23 11:08:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): sound-juicer.spec - updated to 2.11.92 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 09:08:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files ---- Files affected: SPECS: sound-juicer.spec (1.36.2.7 -> 1.36.2.8) ---- Diffs: ================================================================ Index: SPECS/sound-juicer.spec diff -u SPECS/sound-juicer.spec:1.36.2.7 SPECS/sound-juicer.spec:1.36.2.8 --- SPECS/sound-juicer.spec:1.36.2.7 Thu Aug 18 13:50:47 2005 +++ SPECS/sound-juicer.spec Tue Aug 23 11:08:02 2005 @@ -2,17 +2,17 @@ Summary: CD ripper Summary(pl): Ripper p?yt CD Name: sound-juicer -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 226e799fea83a5522ea6d5babefd261e +# Source0-md5: b3e5f8e2dd1c3cf1246ed797903228d7 Patch0: %{name}-desktop.patch URL: http://www.burtonini.com/blog/computers/sound-juicer/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 -BuildRequires: automake >= 1.6 +BuildRequires: automake >= 1.9 BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-media-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.10.0-2 @@ -90,11 +90,11 @@ %defattr(644,root,root,755) %doc AUTHORS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* %{_omf_dest_dir}/%{name} +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.8 2005/08/23 09:08:02 paladine +- updated to 2.11.92 +- sorted %%files + Revision 1.36.2.7 2005/08/18 11:50:47 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sound-juicer.spec?r1=1.36.2.7&r2=1.36.2.8&f=u From paladine at pld-linux.org Tue Aug 23 11:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: sound-juicer-2.11.92.tar.bz2 Message-ID: <10686.1124788089@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/sound-juicer-2.11.92.tar.bz2 b3e5f8e2dd1c3cf1246ed797903228d7 sound-juicer-2.11.92.tar.bz2 Size: 550890 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 11:15:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: ApacheJServ-jre-env.patch (NEW) - set default LANG, jre b... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:15:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - set default LANG, jre behaves strange if it's unset ---- Files affected: SOURCES: ApacheJServ-jre-env.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ-jre-env.patch diff -u /dev/null SOURCES/ApacheJServ-jre-env.patch:1.1 --- /dev/null Tue Aug 23 11:15:37 2005 +++ SOURCES/ApacheJServ-jre-env.patch Tue Aug 23 11:15:31 2005 @@ -0,0 +1,10 @@ +--- ./conf/jserv.properties.in~ 2005-08-22 15:57:00.000000000 +0300 ++++ ./conf/jserv.properties.in 2005-08-23 12:14:27.000000000 +0300 +@@ -60,6 +60,7 @@ + # Syntax: wrapper.env=[name]=[value] (String) + # Default: NONE on Unix Systems + # SystemDrive and SystemRoot with appropriate values on Win32 systems ++wrapper.env=LANG=en_US + + # An environment name with value copied from caller to Java Virtual Machine + # Syntax: wrapper.env.copy=[name] (String) ================================================================ From aflinta at pld-linux.org Tue Aug 23 11:23:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: evolution-data-server-1.3.8.tar.bz2 Message-ID: <20109.1124789004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/evolution-data-server-1.3.8.tar.bz2 c6b2992c9a8f758a4a77511a4c2d5cfd evolution-data-server-1.3.8.tar.bz2 Size: 15019129 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 11:22:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): evolution-data-server.spec - 1.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:22:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.8 ---- Files affected: SPECS: evolution-data-server.spec (1.50.2.11 -> 1.50.2.12) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.50.2.11 SPECS/evolution-data-server.spec:1.50.2.12 --- SPECS/evolution-data-server.spec:1.50.2.11 Sun Aug 21 11:04:10 2005 +++ SPECS/evolution-data-server.spec Tue Aug 23 11:22:49 2005 @@ -12,12 +12,12 @@ Summary: Evolution data server Summary(pl): Serwer danych Evolution Name: evolution-data-server -Version: 1.3.7 -Release: 3 +Version: 1.3.8 +Release: 1 License: GPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: e05fe0e8607ed4403b19a9d3f407e8f9 +# Source0-md5: c6b2992c9a8f758a4a77511a4c2d5cfd Patch0: %{name}-system_db.patch Patch1: %{name}-GG-IM.patch Patch2: %{name}-workaround-cal-backend-leak.patch @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50.2.12 2005/08/23 09:22:49 aflinta +- 1.3.8 + Revision 1.50.2.11 2005/08/21 09:04:10 wiget - rebuild with new cairo, rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.50.2.11&r2=1.50.2.12&f=u From aflinta at pld-linux.org Tue Aug 23 11:26:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES (DEVEL): evolution-data-server-system_db.patch - up for ve... In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:26:03 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for version 1.3.8 ---- Files affected: SOURCES: evolution-data-server-system_db.patch (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ Index: SOURCES/evolution-data-server-system_db.patch diff -u SOURCES/evolution-data-server-system_db.patch:1.7.2.3 SOURCES/evolution-data-server-system_db.patch:1.7.2.4 --- SOURCES/evolution-data-server-system_db.patch:1.7.2.3 Sun Jul 3 18:28:46 2005 +++ SOURCES/evolution-data-server-system_db.patch Tue Aug 23 11:25:58 2005 @@ -1,6 +1,6 @@ -diff -aurN evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am ---- evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am 2005-06-25 12:17:17.000000000 +0200 -+++ evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am 2005-07-03 18:26:24.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am +--- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am 2005-08-23 11:04:40.302083616 +0200 ++++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am 2005-08-23 11:05:46.385037480 +0200 @@ -4,7 +4,6 @@ -I$(top_builddir) \ -I$(top_srcdir)/addressbook \ @@ -20,10 +20,10 @@ libebookbackendfile_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -diff -aurN evolution-data-server-1.3.4.orig/configure.in evolution-data-server-1.3.4/configure.in ---- evolution-data-server-1.3.4.orig/configure.in 2005-07-02 12:09:23.000000000 +0200 -+++ evolution-data-server-1.3.4/configure.in 2005-07-03 18:13:40.000000000 +0200 -@@ -1213,7 +1213,6 @@ +diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in +--- evolution-data-server-1.3.8.orig/configure.in 2005-08-23 11:04:38.291389288 +0200 ++++ evolution-data-server-1.3.8/configure.in 2005-08-23 11:05:46.387037176 +0200 +@@ -1253,7 +1253,6 @@ export privincludedir export privdatadir AC_CONFIG_SUBDIRS(calendar/libical) @@ -31,7 +31,7 @@ AC_OUTPUT([ Makefile -@@ -1268,7 +1267,6 @@ +@@ -1308,7 +1307,6 @@ camel/tests/stream/Makefile camel/camel.pc camel/camel-provider.pc @@ -39,9 +39,9 @@ libedataserver/Makefile libedataserver/libedataserver.pc libedataserverui/Makefile -diff -aurN evolution-data-server-1.3.4.orig/libedataserver/Makefile.am evolution-data-server-1.3.4/libedataserver/Makefile.am ---- evolution-data-server-1.3.4.orig/libedataserver/Makefile.am 2005-04-11 14:21:32.000000000 +0200 -+++ evolution-data-server-1.3.4/libedataserver/Makefile.am 2005-07-03 18:14:15.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am +--- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am 2005-08-23 11:04:40.526049568 +0200 ++++ evolution-data-server-1.3.8/libedataserver/Makefile.am 2005-08-23 11:06:56.983304912 +0200 @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ @@ -50,20 +50,18 @@ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \ $(E_DATA_SERVER_CFLAGS) -@@ -44,8 +43,8 @@ +@@ -44,7 +43,7 @@ libedataserver_1_2_la_LIBADD = \ $(E_DATA_SERVER_LIBS) \ $(ICONV_LIBS) \ -- $(top_builddir)/libdb/dist/libdb-4.1.la -- -+ -ldb -+ - libedataserver_1_2_la_LDFLAGS = \ - -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) +- $(top_builddir)/libdb/dist/libdb-4.1.la \ ++ -ldb \ + $(SOCKET_LIBS) -diff -aurN evolution-data-server-1.3.4.orig/Makefile.am evolution-data-server-1.3.4/Makefile.am ---- evolution-data-server-1.3.4.orig/Makefile.am 2005-04-11 14:21:26.000000000 +0200 -+++ evolution-data-server-1.3.4/Makefile.am 2005-07-03 18:18:54.000000000 +0200 + libedataserver_1_2_la_LDFLAGS = \ +diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am +--- evolution-data-server-1.3.8.orig/Makefile.am 2005-08-23 11:04:40.203098664 +0200 ++++ evolution-data-server-1.3.8/Makefile.am 2005-08-23 11:05:46.390036720 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/evolution-data-server-system_db.patch?r1=1.7.2.3&r2=1.7.2.4&f=u From glen at pld-linux.org Tue Aug 23 11:28:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: ApacheJServ.spec - user/groupadd to init package - secret.k... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - user/groupadd to init package - secret.key fill simplified - cleanups ---- Files affected: SPECS: ApacheJServ.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.38 SPECS/ApacheJServ.spec:1.39 --- SPECS/ApacheJServ.spec:1.38 Fri Aug 19 19:47:15 2005 +++ SPECS/ApacheJServ.spec Tue Aug 23 11:28:28 2005 @@ -1,14 +1,17 @@ # $Revision$, $Date$ +# TODO +# - separate package for jsdk? +# # Conditional build: %bcond_with gcj # use javac instead of GCJ - +# %define apxs /usr/sbin/apxs1 %define jsdkversion 20000924 Summary: Servlet engine with support for the leading web server Summary(pl): Silnik serwlet?w ze wsparciem dla wiod?cego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 0.19 +Release: 0.27 License: freely distributable & usable (JServ), LGPL (JSDK) Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -19,6 +22,7 @@ Source3: %{name}.init Patch0: %{name}-enable-secret.patch Patch1: %{name}-ac.patch +Patch2: %{name}-jre-env.patch URL: http://java.apache.org/ BuildRequires: apache1-devel >= 1.3.9-8 BuildRequires: rpmbuild(macros) >= 1.228 @@ -37,10 +41,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) -%define x_sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define httpdconf %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define _sysconfdir /etc/jserv -%define x_sysconfdir %{httpdconf}/jserv %define logdir /var/log/jserv %define servletdir %{_datadir}/jserv/servlets %define _noautocompressdoc package-list @@ -68,6 +70,11 @@ Summary: ApacheJServ initscript Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} +BuildRequires: rpmbuild(macros) >= 1.202 +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd %description init JServ initscript for standalone mode. @@ -83,6 +90,7 @@ %setup -q -a1 %patch0 -p0 %patch1 -p0 +%patch2 -p1 sed -i -e ' s|@JSDK_CLASSES@|%{_javadir}/servlet-2.0.jar|g @@ -127,7 +135,7 @@ --with-logdir=%{logdir} \ --with-servlets=%{servletdir} \ %{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=`pwd` JAVAC_OPT="-source 1.4"} \ - %{!?with_gcj:--with-javac=%{_bindir}/javac --with-jdk-home=%{_libdir}/java} \ + %{!?with_gcj:--with-javac=%{_bindir}/javac --with-java=%{_bindir}/java --with-jdk-home=%{_libdir}/java} \ %{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \ --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar @@ -165,14 +173,15 @@ find jsdk-doc -name 'Makefile*' | xargs rm -f rm -rf jsdk-doc/{COPYING.LIB,CVS} jsdk-doc/apidoc/CVS +# duplicate +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/jserv.conf + %clean rm -rf $RPM_BUILD_ROOT %post if [ "$1" = 1 ]; then - # use fortune + install-date + process-list to create pseudo-random, hardly - # guessable secret key. Use md5sum to create a hash from this, if available: - (fortune 2>/dev/null; date; ps -eal 2>/dev/null) \ + dd if=/dev/urandom bs=1 count=42 2>/dev/null \ | (md5sum 2>/dev/null || cat) > %{_sysconfdir}/jserv.secret.key fi %service apache restart @@ -182,6 +191,11 @@ %service -q apache restart fi + +%pre init +%groupadd -P %{name}-init -g 154 jserv +%useradd -P %{name}-init -u 154 -g jserv -d /etc/jserv -c "JServ User" jserv + %post init /sbin/chkconfig --add jserv @@ -193,6 +207,12 @@ /sbin/chkconfig --del jserv fi +%postun init +if [ "$1" = "0" ]; then + %userremove jserv + %groupremove jserv +fi + %files %defattr(644,root,root,755) %doc LICENSE README @@ -200,7 +220,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/*_mod_jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key #%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/jserv #%config /etc/profile.d/jserv.sh @@ -235,6 +254,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/23 09:28:28 glen +- user/groupadd to init package +- secret.key fill simplified +- cleanups + Revision 1.38 2005/08/19 17:47:15 glen - created -init subpackage for standalone mode - cruft removed from %post (we are rpm!) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Tue Aug 23 12:01:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: eventum.spec - add missing smarty modifier, rel 2, STBR In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:01:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add missing smarty modifier, rel 2, STBR ---- Files affected: SPECS: eventum.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.112 SPECS/eventum.spec:1.113 --- SPECS/eventum.spec:1.112 Sat Aug 20 13:39:59 2005 +++ SPECS/eventum.spec Tue Aug 23 12:01:01 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 1 +%define _rel 2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -537,7 +537,9 @@ rm -rf $RPM_BUILD_ROOT%{_appdir}/include/Smarty install -d $RPM_BUILD_ROOT%{_smartyplugindir} # These plugins are not in Smarty package (Smarty-2.6.2-3) -cp -a include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ +cp -a \ + include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ + include/Smarty/plugins/modifier.highlight_quoted.php \ $RPM_BUILD_ROOT%{_smartyplugindir} # qmail router @@ -853,6 +855,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/23 10:01:01 glen +- add missing smarty modifier, rel 2, STBR + Revision 1.112 2005/08/20 11:39:59 glen - 1.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.112&r2=1.113&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:40 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): evolution.spec - 2.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 10:27:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.3.8 ---- Files affected: SPECS: evolution.spec (1.171.2.10 -> 1.171.2.11) ---- Diffs: ================================================================ Index: SPECS/evolution.spec diff -u SPECS/evolution.spec:1.171.2.10 SPECS/evolution.spec:1.171.2.11 --- SPECS/evolution.spec:1.171.2.10 Thu Aug 18 17:37:59 2005 +++ SPECS/evolution.spec Tue Aug 23 12:27:35 2005 @@ -16,12 +16,12 @@ Summary(pt_BR): Cliente de email integrado com calend?rio e cat?logo de endere?os Summary(zh_CN): Evolution - GNOME2????????????????????????(??????????????????????????) Name: evolution -Version: 2.3.7 -Release: 3 +Version: 2.3.8 +Release: 1 License: GPL v2 Group: Applications/Mail Source0: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 12d29f28f8ecf302547c63ad137e0b4b +# Source0-md5: d5972fbb96b36cd3420bf1390d63c551 Source1: %{name}-gg16.png Source2: %{name}-gg48.png Patch0: %{name}-nolibs.patch @@ -373,7 +373,7 @@ %{_datadir}/evolution/*/weather %{_datadir}/idl/evolution-*/Evolution-Component.idl %{_datadir}/idl/evolution-*/Evolution-ConfigControl.idl -%{_datadir}/idl/evolution-*/Evolution-Offline.idl +#%{_datadir}/idl/evolution-*/Evolution-Offline.idl %{_datadir}/idl/evolution-*/Evolution-Shell.idl %{_datadir}/idl/evolution-*/Evolution.idl %{_desktopdir}/* @@ -449,6 +449,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171.2.11 2005/08/23 10:27:35 aflinta +- 2.3.8 + Revision 1.171.2.10 2005/08/18 15:37:59 wiget - BR libgnomeui builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.171.2.10&r2=1.171.2.11&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: evolution-2.3.8.tar.bz2 Message-ID: <24010.1124792873@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/evolution-2.3.8.tar.bz2 d5972fbb96b36cd3420bf1390d63c551 evolution-2.3.8.tar.bz2 Size: 11434516 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:28:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SOURCES: vte-atktextselection.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: vte-atktextselection.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: vte.spec - updated to 0.11.15 - removed atktextselection patch In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.11.15 - removed atktextselection patch ---- Files affected: SPECS: vte.spec (1.78 -> 1.79) ---- Diffs: ================================================================ Index: SPECS/vte.spec diff -u SPECS/vte.spec:1.78 SPECS/vte.spec:1.79 --- SPECS/vte.spec:1.78 Wed Aug 3 18:24:21 2005 +++ SPECS/vte.spec Tue Aug 23 12:28:32 2005 @@ -6,15 +6,14 @@ Summary: VTE terminal widget library Summary(pl): Biblioteka z kontrolk? terminala VTE Name: vte -Version: 0.11.14 +Version: 0.11.15 Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9676e430d951d617aff4672ed1b52fb1 +# Source0-md5: a9dc7b330d52ce384e3e5715d396c72f Patch0: %{name}-keys.patch -Patch1: %{name}-atktextselection.patch -Patch2: %{name}-nozvt.patch +Patch1: %{name}-nozvt.patch %{?with_glx:BuildRequires: OpenGL-devel} BuildRequires: autoconf BuildRequires: automake @@ -97,7 +96,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__glib_gettextize} @@ -165,6 +163,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79 2005/08/23 10:28:32 paladine +- updated to 0.11.15 +- removed atktextselection patch + Revision 1.78 2005/08/03 16:24:21 freetz - back to rel.1 (glib bug http://bugzilla.gnome.org/show_bug.cgi?id=312402) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vte.spec?r1=1.78&r2=1.79&f=u From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: vte-0.11.15.tar.bz2 Message-ID: <24519.1124792917@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/vte-0.11.15.tar.bz2 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 Size: 959449 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 12:30:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: php.spec - revert invalid last commit In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:30:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - revert invalid last commit ---- Files affected: SPECS: php.spec (1.465 -> 1.466) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.465 SPECS/php.spec:1.466 --- SPECS/php.spec:1.465 Mon Aug 22 14:11:35 2005 +++ SPECS/php.spec Tue Aug 23 12:30:30 2005 @@ -77,14 +77,13 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.1.0 -%define _version %{version}RC1 -Release: 0.1%{?with_hardening:hardened} +Version: 5.0.4 +Release: 9.28%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{_version}.tar.bz2 -# Source0-md5: c7aebeb915e6f898559365cf82493ad0 +Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 +# Source0-md5: fb1aac107870f897d26563a9cc5053c0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -1431,7 +1430,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q -n %{name}-%{_version} +%setup -q # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1442,23 +1441,23 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -#%patch9 -p1 +%patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 %patch12 -p1 -#%patch13 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -#%patch20 -p1 -#%patch21 -p1 -#%patch28 -p1 +%patch20 -p1 +%patch21 -p1 +%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1466,8 +1465,8 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -#%patch27 -p1 -#%patch29 -p1 +%patch27 -p1 +%patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -2911,8 +2910,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.465 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.466 2005/08/23 10:30:30 glen +- revert invalid last commit Revision 1.464 2005/08/16 09:38:28 glen - sed >= 4.0 for updated php-module-install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.465&r2=1.466&f=u From glen at pld-linux.org Tue Aug 23 12:31:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: php.spec - rel 10 for finished conf.d support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:31:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for finished conf.d support ---- Files affected: SPECS: php.spec (1.466 -> 1.467) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.466 SPECS/php.spec:1.467 --- SPECS/php.spec:1.466 Tue Aug 23 12:30:30 2005 +++ SPECS/php.spec Tue Aug 23 12:31:11 2005 @@ -78,7 +78,7 @@ Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php Version: 5.0.4 -Release: 9.28%{?with_hardening:hardened} +Release: 10%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -2910,6 +2910,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467 2005/08/23 10:31:11 glen +- rel 10 for finished conf.d support + Revision 1.466 2005/08/23 10:30:30 glen - revert invalid last commit ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.466&r2=1.467&f=u From pluto at pld-linux.org Tue Aug 23 12:33:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: qt4.spec - build/install fixes, release 1. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:33:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - build/install fixes, release 1. ---- Files affected: SPECS: qt4.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.36 SPECS/qt4.spec:1.37 --- SPECS/qt4.spec:1.36 Mon Aug 22 15:01:45 2005 +++ SPECS/qt4.spec Tue Aug 23 12:33:10 2005 @@ -35,7 +35,7 @@ Name: qt4 Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.1 +Release: 1 License: GPL/QPL Group: X11/Libraries Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz @@ -752,19 +752,12 @@ sub-demos-all-ordered \ sub-examples-all-ordered -# -# TODO: -# Check for "with" conditions befor build -# OR -# Find out why and fix the reason of building only mysql sqldriver -# (it is not installed either) -# -for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2} -do - cd $dir - %{__make} - cd - -done +%{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} +#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} +%{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} +%{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} +%{?with_sqlite3: %{__make} -C src/plugins/sqldrivers/sqlite} %if %{with dont_enable} %if %{with designer} @@ -783,6 +776,7 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} QTDIR=`/bin/pwd` export QTDIR @@ -855,6 +849,7 @@ ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h cd - +mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir} for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do HAVEDEBUG=`echo $f | grep _debug | wc -l` MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1` @@ -1135,6 +1130,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/23 10:33:10 pluto +- build/install fixes, release 1. + Revision 1.36 2005/08/22 13:01:45 pluto - updated to 4.0.1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.36&r2=1.37&f=u From glen at pld-linux.org Tue Aug 23 12:33:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: php4.spec - organization In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - organization ---- Files affected: SPECS: php4.spec (1.471 -> 1.472) ---- Diffs: ================================================================ Index: SPECS/php4.spec diff -u SPECS/php4.spec:1.471 SPECS/php4.spec:1.472 --- SPECS/php4.spec:1.471 Tue Aug 16 01:31:40 2005 +++ SPECS/php4.spec Tue Aug 23 12:33:21 2005 @@ -1876,16 +1876,21 @@ install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini +install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} +install %{SOURCE1} . -install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons +%if %{with apache1} install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons -install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE4} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php4.conf +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini +%endif + +%if %{with apache2} +install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons install %{SOURCE4} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php4.conf -install %{SOURCE1} . +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini +%endif cp -f Zend/LICENSE{,.Zend} @@ -3090,6 +3095,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.472 2005/08/23 10:33:21 glen +- organization + Revision 1.471 2005/08/15 23:31:40 glen - BR: rpm-build >= 4.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.471&r2=1.472&f=u From pluto at pld-linux.org Tue Aug 23 12:46:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: qt4.spec - missed %dir %{_libdir}/qt4 added. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:46:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missed %dir %{_libdir}/qt4 added. ---- Files affected: SPECS: qt4.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.37 SPECS/qt4.spec:1.38 --- SPECS/qt4.spec:1.37 Tue Aug 23 12:33:10 2005 +++ SPECS/qt4.spec Tue Aug 23 12:46:45 2005 @@ -972,6 +972,7 @@ %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_libdir}/libQtCore*.so.* +%dir %{_libdir}/qt4 %dir %{_libdir}/qt4/plugins %dir %{_libdir}/qt4/plugins/codecs %dir %{_libdir}/qt4/plugins/crypto @@ -1130,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/23 10:46:45 pluto +- missed %dir %{_libdir}/qt4 added. + Revision 1.37 2005/08/23 10:33:10 pluto - build/install fixes, release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.37&r2=1.38&f=u From paladine at pld-linux.org Tue Aug 23 12:55:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): gnome-terminal.spec - updated to 2.11.3 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:55:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 ---- Files affected: SPECS: gnome-terminal.spec (1.71.2.4 -> 1.71.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-terminal.spec diff -u SPECS/gnome-terminal.spec:1.71.2.4 SPECS/gnome-terminal.spec:1.71.2.5 --- SPECS/gnome-terminal.spec:1.71.2.4 Thu Aug 18 13:07:00 2005 +++ SPECS/gnome-terminal.spec Tue Aug 23 12:55:34 2005 @@ -8,12 +8,12 @@ Summary: GNOME Terminal Summary(pl): Terminal dla GNOME Name: gnome-terminal -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 61cb4c49ea465584e0fd35a7209a37f2 +# Source0-md5: 334eb33c416c39f14b390f91d44ccb98 Patch0: %{name}-TERM.patch Patch1: %{name}-disable-prev_next-tab-sensitivity-changes.patch Patch2: %{name}-desktop.patch @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71.2.5 2005/08/23 10:55:34 paladine +- updated to 2.11.3 + Revision 1.71.2.4 2005/08/18 11:07:00 aflinta - rebuild with cairo rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-terminal.spec?r1=1.71.2.4&r2=1.71.2.5&f=u From paladine at pld-linux.org Tue Aug 23 12:55:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: gnome-terminal-2.11.3.tar.bz2 Message-ID: <9593.1124794543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/gnome-terminal-2.11.3.tar.bz2 334eb33c416c39f14b390f91d44ccb98 gnome-terminal-2.11.3.tar.bz2 Size: 1682922 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Tue Aug 23 12:57:25 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: esmtp.spec - missing br's In-Reply-To: References: Message-ID: Author: spider Date: Tue Aug 23 10:57:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br's ---- Files affected: SPECS: esmtp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmtp.spec diff -u SPECS/esmtp.spec:1.4 SPECS/esmtp.spec:1.5 --- SPECS/esmtp.spec:1.4 Tue Jul 5 15:18:45 2005 +++ SPECS/esmtp.spec Tue Aug 23 12:57:20 2005 @@ -3,7 +3,7 @@ Summary(pl): esmtp - MTA obs?uguj?cy tylko przekazywanie poczty do serwera (E)SMTP Name: esmtp Version: 0.5.1 -Release: 0.2 +Release: 0.3 Epoch: 0 License: GPL v2 Group: Applications @@ -11,6 +11,7 @@ # Source0-md5: 9f0b809e891a548910f099efc4315b02 URL: http://esmtp.sourceforge.net/ BuildRequires: libesmtp-devel +Requires: libesmtp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 10:57:20 spider +- missing br's + Revision 1.4 2005/07/05 13:18:45 darekr - cosmetics, added %doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmtp.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Tue Aug 23 12:57:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: libgnome-2.11.3.tar.bz2 Message-ID: <10798.1124794656@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/libgnome-2.11.3.tar.bz2 26f795d586082417cb5cdcaf7e80563e libgnome-2.11.3.tar.bz2 Size: 946132 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:57:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): libgnome.spec - updated to 2.11.3 - itemize schemas... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:57:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - itemize schemas - sorted %%files ---- Files affected: SPECS: libgnome.spec (1.86.2.2 -> 1.86.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.2 SPECS/libgnome.spec:1.86.2.3 --- SPECS/libgnome.spec:1.86.2.2 Fri Aug 5 09:41:56 2005 +++ SPECS/libgnome.spec Tue Aug 23 12:57:31 2005 @@ -2,12 +2,12 @@ Summary: GNOME base library Summary(pl): Podstawowa biblioteka GNOME Name: libgnome -Version: 2.11.2 +Version: 2.11.3 Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9d8c2c3937516d6e6945da884f4b7f39 +# Source0-md5: 26f795d586082417cb5cdcaf7e80563e URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90 BuildRequires: audiofile-devel >= 1:0.2.3 @@ -154,20 +154,34 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%{_sysconfdir}/gconf/schemas/* -%{_sysconfdir}/sound %attr(755,root,root) %{_bindir}/gnome-open %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_help_viewer.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_terminal.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_window_manager.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_background.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_file_views.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_interface.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_lockdown.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_mouse.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_sound.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas +%{_sysconfdir}/sound %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnome-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnome-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -179,6 +193,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.3 2005/08/23 10:57:31 paladine +- updated to 2.11.3 +- itemize schemas +- sorted %%files + Revision 1.86.2.2 2005/08/05 07:41:56 aflinta - up to version 2.11.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.2&r2=1.86.2.3&f=u From kosmo at pld-linux.org Tue Aug 23 13:19:11 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: pam_mysql-0.6.0.tar.gz Message-ID: <25122.1124795951@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pam-mysql/pam_mysql-0.6.0.tar.gz b7f59c5450d89126b7f25fa2645b1b71 pam_mysql-0.6.0.tar.gz Size: 312187 bytes -- Virtually Yours: distfiles. From kosmo at pld-linux.org Tue Aug 23 13:19:07 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: pam-pam_mysql.spec - updated to 0.6.0 In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 11:19:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.6.0 ---- Files affected: SPECS: pam-pam_mysql.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/pam-pam_mysql.spec diff -u SPECS/pam-pam_mysql.spec:1.9 SPECS/pam-pam_mysql.spec:1.10 --- SPECS/pam-pam_mysql.spec:1.9 Sat Feb 19 09:07:11 2005 +++ SPECS/pam-pam_mysql.spec Tue Aug 23 13:19:01 2005 @@ -3,16 +3,19 @@ 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-%{modulename} -Version: 0.5 -Release: 4 +Version: 0.6.0 +Release: 1 Epoch: 0 License: GPL Group: Base -# Source0-md5: 8cf002392292ae2a5774545324739a94 -Source0: http://dl.sourceforge.net/pam-mysql/pam_mysql-%{version}.tar.gz +Source0: http://dl.sourceforge.net/pam-mysql/%{modulename}-%{version}.tar.gz +# Source0-md5: b7f59c5450d89126b7f25fa2645b1b71 URL: http://sourceforge.net/projects/pam-mysql/ +BuildRequires: autoconf +BuildRequires: automake BuildRequires: mysql-devel BuildRequires: pam-devel +BuildRequires: pkgconfig Obsoletes: pam_mysql BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -25,25 +28,29 @@ baz? danych MySQL. %prep -%setup -q -n %{modulename} +%setup -q -n %{modulename}-%{version} +sed -i 's/sinclude(.*)//' configure.in %build -%{__make} \ - CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -DLINUX_PAM -ansi -pedantic -D_POSIX_SOURCE -Wall -fPIC" \ - LD_D="%{__cc} -shared -Xlinker -x" +%{__aclocal} +%{__autoconf} +%{__automake} +%configure +%{__make} %install rm -rf $RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so +# install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Readme Changelog +%doc CREDITS ChangeLog INSTALL NEWS README %attr(755,root,root) /%{_lib}/security/pam_mysql.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -52,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 11:19:01 kosmo +- updated to 0.6.0 + Revision 1.9 2005/02/19 08:07:11 ankry - rel. 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam-pam_mysql.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Tue Aug 23 13:26:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): libgnomeui.spec - updated to 2.11.3 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:26:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - sorted %%files ---- Files affected: SPECS: libgnomeui.spec (1.79.2.6 -> 1.79.2.7) ---- Diffs: ================================================================ Index: SPECS/libgnomeui.spec diff -u SPECS/libgnomeui.spec:1.79.2.6 SPECS/libgnomeui.spec:1.79.2.7 --- SPECS/libgnomeui.spec:1.79.2.6 Thu Aug 18 17:44:40 2005 +++ SPECS/libgnomeui.spec Tue Aug 23 13:26:52 2005 @@ -2,12 +2,12 @@ Summary: GNOME base GUI library Summary(pl): Podstawowa biblioteka GUI GNOME Name: libgnomeui -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 029928502654b82aca140a608422ffed +# Source0-md5: aa772258869f8a5010cbf5e9bdb075fe Patch0: %{name}-threads.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -129,23 +129,23 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/gnome_segv2 -%attr(755,root,root) %{_libdir}/lib*.so.*.* -%attr(755,root,root) %{_libdir}/libglade/2.0/*.so -%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so -%{_pixmapsdir}/* # it seems that every package that uses %{_datadir}/gnome tree requires # libgnomeui - so added these directories to this package %dir %{_datadir}/gnome %dir %{_datadir}/gnome/help +%attr(755,root,root) %{_libdir}/gnome_segv2 +%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so +%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/libglade/2.0/*.so +%{_pixmapsdir}/* %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnomeui-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomeui-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -157,6 +157,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79.2.7 2005/08/23 11:26:52 paladine +- updated to 2.11.3 +- sorted %%files + Revision 1.79.2.6 2005/08/18 15:44:40 wiget - BR libgnomecanvas builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomeui.spec?r1=1.79.2.6&r2=1.79.2.7&f=u From paladine at pld-linux.org Tue Aug 23 13:27:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: libgnomeui-2.11.3.tar.bz2 Message-ID: <30210.1124796421@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/libgnomeui-2.11.3.tar.bz2 aa772258869f8a5010cbf5e9bdb075fe libgnomeui-2.11.3.tar.bz2 Size: 1822781 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 13:33:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): libgnome.spec - added missing manpage In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 11:33:01 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing manpage ---- Files affected: SPECS: libgnome.spec (1.86.2.3 -> 1.86.2.4) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.3 SPECS/libgnome.spec:1.86.2.4 --- SPECS/libgnome.spec:1.86.2.3 Tue Aug 23 12:57:31 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:32:55 2005 @@ -174,6 +174,7 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound +%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.4 2005/08/23 11:32:55 aflinta +- added missing manpage + Revision 1.86.2.3 2005/08/23 10:57:31 paladine - updated to 2.11.3 - itemize schemas ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.3&r2=1.86.2.4&f=u From paladine at pld-linux.org Tue Aug 23 13:43:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): libgnome.spec - sorted %%files again In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:43:28 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - sorted %%files again ---- Files affected: SPECS: libgnome.spec (1.86.2.4 -> 1.86.2.5) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.4 SPECS/libgnome.spec:1.86.2.5 --- SPECS/libgnome.spec:1.86.2.4 Tue Aug 23 13:32:55 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:43:23 2005 @@ -158,6 +158,7 @@ %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_mandir}/man7/gnome-options* %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas @@ -174,7 +175,6 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound -%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.5 2005/08/23 11:43:23 paladine +- sorted %%files again + Revision 1.86.2.4 2005/08/23 11:32:55 aflinta - added missing manpage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.4&r2=1.86.2.5&f=u From paladine at pld-linux.org Tue Aug 23 13:45:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: libgnomecanvas-2.11.2.tar.bz2 Message-ID: <16091.1124797558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/libgnomecanvas-2.11.2.tar.bz2 bd58220b0e5b3e71c46f36da72978064 libgnomecanvas-2.11.2.tar.bz2 Size: 588292 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 13:46:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): libgnomecanvas.spec - updated to 2.11.2 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:45:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.2 - sorted %%files ---- Files affected: SPECS: libgnomecanvas.spec (1.66.2.2 -> 1.66.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnomecanvas.spec diff -u SPECS/libgnomecanvas.spec:1.66.2.2 SPECS/libgnomecanvas.spec:1.66.2.3 --- SPECS/libgnomecanvas.spec:1.66.2.2 Thu Aug 18 17:43:41 2005 +++ SPECS/libgnomecanvas.spec Tue Aug 23 13:45:54 2005 @@ -2,12 +2,12 @@ Summary: GnomeCanvas widget Summary(pl): Widget GnomeCanvas Name: libgnomecanvas -Version: 2.11.1 -Release: 2 +Version: 2.11.2 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 06d900efedb6f3ea011b43053dab3c0b +# Source0-md5: bd58220b0e5b3e71c46f36da72978064 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -101,11 +101,11 @@ %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/* +%{_includedir}/libgnomecanvas-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomecanvas-2.0 -%{_gtkdocdir}/* %files static %defattr(644,root,root,755) @@ -117,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.3 2005/08/23 11:45:54 paladine +- updated to 2.11.2 +- sorted %%files + Revision 1.66.2.2 2005/08/18 15:43:41 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomecanvas.spec?r1=1.66.2.2&r2=1.66.2.3&f=u From aflinta at pld-linux.org Tue Aug 23 14:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: gedit-2.11.92.tar.bz2 Message-ID: <25517.1124798459@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-2.11.92.tar.bz2 f8cb7042d7d60694cc64553675ff8874 gedit-2.11.92.tar.bz2 Size: 2103799 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 14:00:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS (DEVEL): gedit2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 12:00:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gedit2.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/gedit2.spec diff -u SPECS/gedit2.spec:1.81.2.2 SPECS/gedit2.spec:1.81.2.3 --- SPECS/gedit2.spec:1.81.2.2 Thu Aug 18 23:12:39 2005 +++ SPECS/gedit2.spec Tue Aug 23 14:00:48 2005 @@ -2,12 +2,12 @@ Summary: gEdit - small but powerful text editor for X Window Summary(pl): gEdit - ma?y ale pot??ny edytor tekstu dla X Window Name: gedit2 -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications/Editors Source0: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-%{version}.tar.bz2 -# Source0-md5: 1401595bdfe004fee3f3a567b6c356e0 +# Source0-md5: f8cb7042d7d60694cc64553675ff8874 Patch0: %{name}-use_default_font.patch Patch1: %{name}-desktop.patch URL: http://gedit.sourceforge.net/ @@ -148,6 +148,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/23 12:00:48 aflinta +- 2.11.92 + Revision 1.81.2.2 2005/08/18 21:12:39 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From baggins at pld-linux.org Tue Aug 23 14:01:32 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:02 2005 Subject: SPECS: grub.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 12:01:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: grub.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/grub.spec diff -u SPECS/grub.spec:1.101 SPECS/grub.spec:1.102 --- SPECS/grub.spec:1.101 Sun Jul 31 22:37:17 2005 +++ SPECS/grub.spec Tue Aug 23 14:01:26 2005 @@ -18,7 +18,7 @@ Summary(de): GRUB - ein Bootloader f?r x86 Name: grub Version: 0.97 -Release: 0.4 +Release: 1 License: GPL Group: Base Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/23 12:01:26 baggins +- release 1 + Revision 1.101 2005/07/31 20:37:17 saq - rmf unpackaged file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grub.spec?r1=1.101&r2=1.102&f=u From paladine at pld-linux.org Tue Aug 23 14:04:15 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:02 2005 Subject: DISTFILES: gnome-applets-2.11.92.tar.bz2 Message-ID: <468.1124798655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.tar.bz2 2b78a6c5d59aa889979dbb54a301bf4e gnome-applets-2.11.92.tar.bz2 Size: 3786655 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 14:04:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92 - updated %... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 12:04:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated %%files ---- Files affected: SPECS: gnome-applets.spec (1.152.2.6 -> 1.152.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.6 SPECS/gnome-applets.spec:1.152.2.7 --- SPECS/gnome-applets.spec:1.152.2.6 Sun Aug 14 23:31:38 2005 +++ SPECS/gnome-applets.spec Tue Aug 23 14:04:08 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 011374d970db4018e1237d395ef45241 +# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -556,6 +556,7 @@ %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas %{_omf_dest_dir}/char-palette/char-palette-C.omf +%lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf %files cpufreq -f cpufreq-applet.lang @@ -570,6 +571,7 @@ %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf +%lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf %files drivemount -f drivemount.lang %defattr(644,root,root,755) @@ -579,6 +581,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas %{_omf_dest_dir}/drivemount/drivemount-C.omf +%lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf %files geyes -f geyes.lang %defattr(644,root,root,755) @@ -590,6 +593,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas %{_omf_dest_dir}/geyes/geyes-C.omf +%lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf %files gtik -f gtik2_applet2.lang %defattr(644,root,root,755) @@ -600,6 +604,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf +%lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf %files gweather -f gweather.lang %defattr(644,root,root,755) @@ -669,6 +674,7 @@ %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas %{_omf_dest_dir}/gswitchit/gswitchit-C.omf +%lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf %files minicommander -f command-line.lang %defattr(644,root,root,755) @@ -682,6 +688,7 @@ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas %{_omf_dest_dir}/command-line/command-line-C.omf +%lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf %files mixer %defattr(644,root,root,755) @@ -691,6 +698,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf +%lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf %files modemlights %defattr(644,root,root,755) @@ -709,6 +717,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas %{_omf_dest_dir}/multiload/multiload-C.omf +%lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf %files stickynotes -f stickynotes_applet.lang %defattr(644,root,root,755) @@ -720,6 +729,7 @@ %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf +%lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf %files trash -f trashapplet.lang %defattr(644,root,root,755) @@ -729,6 +739,8 @@ %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml %{_omf_dest_dir}/trashapplet/trashapplet-C.omf +%lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf +%lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -736,6 +748,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.7 2005/08/23 12:04:08 paladine +- updated to 2.11.92 +- updated %%files + Revision 1.152.2.6 2005/08/14 21:31:38 freetz - calling BR gtk+2-devel >= 2:2.8.0 instead of pango-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.6&r2=1.152.2.7&f=u From glen at pld-linux.org Tue Aug 23 14:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: libmemcache.spec - updated to 1.4.0, API is preserved but a... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling ---- Files affected: SPECS: libmemcache.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/libmemcache.spec diff -u SPECS/libmemcache.spec:1.4 SPECS/libmemcache.spec:1.5 --- SPECS/libmemcache.spec:1.4 Sat Jun 25 23:59:31 2005 +++ SPECS/libmemcache.spec Tue Aug 23 14:23:30 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define _beta 9 Summary: libmemcache - the C API for memcached Summary(pl): libmemcache - API C do memcached Name: libmemcache -Version: 1.3.0 +Version: 1.4.0 +%define _beta 4 Release: 0.beta%{_beta}.1 Epoch: 0 License: MIT Group: Libraries -Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.beta%{_beta}.tar.bz2 -# Source0-md5: 7b2579095cd758e575f0e4ce5f686305 +Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.b%{_beta}.tar.bz2 +# Source0-md5: 74b6c17686a852a3f20d8e621fd0ab69 Patch0: %{name}-make.patch URL: http://people.freebsd.org/~seanc/libmemcache/ BuildRequires: autoconf @@ -74,7 +74,7 @@ Statyczna biblioteka libmemcache. %prep -%setup -q -n %{name}-%{version}.beta%{_beta} +%setup -q -n %{name}-%{version}.b%{_beta} %patch0 -p1 cp -a test tests rm -f tests{,/*}/Makefile* @@ -110,6 +110,8 @@ %attr(755,root,root) %{_libdir}/libmemcache.so %{_libdir}/libmemcache.la %{_includedir}/memcache.h +%{_includedir}/buffer.h +%{_includedir}/_buffer.h %files static %defattr(644,root,root,755) @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 12:23:30 glen +- updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling + Revision 1.4 2005/06/25 21:59:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libmemcache.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 14:23:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: libmemcache-1.4.0.b4.tar.bz2 Message-ID: <12899.1124799820@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.b4.tar.bz2 74b6c17686a852a3f20d8e621fd0ab69 libmemcache-1.4.0.b4.tar.bz2 Size: 267487 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: php-mcache-ext-1.2.0-beta7.tar.gz Message-ID: <27277.1124800953@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-1.2.0-beta7.tar.gz bbe636154f8dc8ab3889054cf4ace2bd php-mcache-ext-1.2.0-beta7.tar.gz Size: 15415 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: php4-mcache.spec - up to 1.2.0-beta7 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:42:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.0-beta7 ---- Files affected: SPECS: php4-mcache.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.6 SPECS/php4-mcache.spec:1.7 --- SPECS/php4-mcache.spec:1.6 Mon Jul 18 16:26:39 2005 +++ SPECS/php4-mcache.spec Tue Aug 23 14:42:29 2005 @@ -6,13 +6,13 @@ Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 -%define _beta 6 -Release: 0.beta%{_beta}.2 +%define _beta 7 +Release: 0.beta%{_beta}.1 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-%{version}-beta%{_beta}.tar.gz -# Source0-md5: 914b0272fe68d808ffa11edd741f2eae +# Source0-md5: bbe636154f8dc8ab3889054cf4ace2bd URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 12:42:29 glen +- up to 1.2.0-beta7 + Revision 1.6 2005/07/18 14:26:39 glen - fix epoch for php-common ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.6&r2=1.7&f=u From troll at pld-linux.org Tue Aug 23 14:42:52 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: bochs.spec - don't put VGABIOS-lgpl image to docs, but to %... In-Reply-To: References: Message-ID: Author: troll Date: Tue Aug 23 12:42:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs ---- Files affected: SPECS: bochs.spec (1.50 -> 1.51) ---- Diffs: ================================================================ Index: SPECS/bochs.spec diff -u SPECS/bochs.spec:1.50 SPECS/bochs.spec:1.51 --- SPECS/bochs.spec:1.50 Sun Jul 10 15:39:10 2005 +++ SPECS/bochs.spec Tue Aug 23 14:42:47 2005 @@ -112,7 +112,7 @@ DESTDIR=$RPM_BUILD_ROOT \ docdir=%{_docdir}/%{name}-%{version} -mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \ +mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51 2005/08/23 12:42:47 troll +- don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs + Revision 1.50 2005/07/10 13:39:10 saq - patch0 made its way to the sources ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bochs.spec?r1=1.50&r2=1.51&f=u From baggins at pld-linux.org Tue Aug 23 15:06:42 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (LINUX_2_6): kernel.spec - added bind mount extensions for v... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:06:42 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ---- Files affected: SPECS: kernel.spec (1.441.2.1160 -> 1.441.2.1161) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1160 SPECS/kernel.spec:1.441.2.1161 --- SPECS/kernel.spec:1.441.2.1160 Mon Aug 22 18:21:58 2005 +++ SPECS/kernel.spec Tue Aug 23 15:06:36 2005 @@ -262,8 +262,6 @@ # http://openmosix.snarc.org/files/releases/2.6/ # derived from openMosix-r570.patch Patch201: linux-2.6-omosix.patch -# vserver-2.0-pre4 -Patch202: linux-2.6-vs2.patch # xen http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html Patch203: linux-xen-2.0.6.patch Patch204: linux-2.6.12-smp-alts.patch @@ -271,6 +269,17 @@ Patch206: linux-2.6.12.3-xenbus.patch Patch207: linux-2.6.12.3-xen-fixes.patch +# vserver-2.0 +Patch300: linux-2.6-vs2.patch +# Bind Mount Extensions +Patch301: linux-2.6-vs2-BME.patch +# http://vserver.13thfloor.at/Experimental/FOR-2.0.1/ +Patch310: delta-vroot-fix01.diff +Patch311: delta-dlimit-feat01.diff +Patch312: delta-dlimit-fix01.diff +Patch313: delta-loopback-fix01.diff +Patch314: delta-dlimit-fix02.diff + Patch400: kernel-gcc4.patch Patch401: kernel-hotfixes.patch Patch402: linux-em8300-2.6.11.2.patch @@ -694,7 +703,13 @@ %{__patch} -p1 -F3 < %{PATCH201} %endif %if %{with vserver} -%patch202 -p1 +%patch300 -p1 +%patch301 -p1 +%patch310 -p1 +%patch311 -p1 +%patch312 -p1 +%patch313 -p1 +%patch314 -p1 %endif %if %{with xen} %if %{with xendev} @@ -1466,6 +1481,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1161 2005/08/23 13:06:36 baggins +- added bind mount extensions for vservers +- added fixes for vserver 2.0.1 + Revision 1.441.2.1160 2005/08/22 16:21:58 pluto - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1160&r2=1.441.2.1161&f=u From pluto at pld-linux.org Tue Aug 23 15:22:08 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: gcc.spec - updated to 4.1.0-20050823T1409UTC. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 13:22:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.0-20050823T1409UTC. ---- Files affected: SPECS: gcc.spec (1.357 -> 1.358) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.357 SPECS/gcc.spec:1.358 --- SPECS/gcc.spec:1.357 Fri Aug 19 01:15:01 2005 +++ SPECS/gcc.spec Tue Aug 23 15:21:59 2005 @@ -40,7 +40,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.1.0 -%define _snap 20050818T2314UTC +%define _snap 20050823T1409UTC Release: 0.%{_snap}.1 Epoch: 5 License: GPL v2+ @@ -48,7 +48,7 @@ #Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 #Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2 Source0: gcc-4.1-%{_snap}.tar.bz2 -# Source0-md5: 6579390fb1ef8b02e9667c7db1c52327 +# Source0-md5: f268cc87697cacde32240036d54cf209 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -1280,6 +1280,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.358 2005/08/23 13:21:59 pluto +- updated to 4.1.0-20050823T1409UTC. + Revision 1.357 2005/08/18 23:15:01 pluto - x87/mmx patchest. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.357&r2=1.358&f=u From pluto at pld-linux.org Tue Aug 23 15:22:16 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: gcc-4.1-20050823T1409UTC.tar.bz2 Message-ID: <20414.1124803336@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gcc-4.1-20050823T1409UTC.tar.bz2 f268cc87697cacde32240036d54cf209 gcc-4.1-20050823T1409UTC.tar.bz2 Size: 33406105 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 15:33:29 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES: delta-dlimit-feat01.diff (NEW), delta-dlimit-fix01.diff (... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:33:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes for vserver 2.0.1 ---- Files affected: SOURCES: delta-dlimit-feat01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix02.diff (NONE -> 1.1) (NEW), delta-loopback-fix01.diff (NONE -> 1.1) (NEW), delta-vroot-fix01.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/delta-dlimit-feat01.diff diff -u /dev/null SOURCES/delta-dlimit-feat01.diff:1.1 --- /dev/null Tue Aug 23 15:33:29 2005 +++ SOURCES/delta-dlimit-feat01.diff Tue Aug 23 15:33:23 2005 @@ -0,0 +1,880 @@ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c 2005-08-17 23:13:13 +0200 +@@ -261,7 +261,7 @@ do_more: + } + error_return: + brelse(bitmap_bh); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, freed); ++ DLIMIT_FREE_BLOCK(inode, freed); + release_blocks(sb, freed); + DQUOT_FREE_BLOCK(inode, freed); + } +@@ -365,7 +365,7 @@ int ext2_new_block(struct inode *inode, + *err = -ENOSPC; + goto out_dquot; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, es_alloc)) { ++ if (DLIMIT_ALLOC_BLOCK(inode, es_alloc)) { + *err = -ENOSPC; + goto out_dlimit; + } +@@ -516,7 +516,7 @@ got_block: + *err = 0; + out_release: + group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, es_alloc); ++ DLIMIT_FREE_BLOCK(inode, es_alloc); + out_dlimit: + release_blocks(sb, es_alloc); + out_dquot: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c 2005-08-17 23:29:16 +0200 +@@ -126,7 +126,7 @@ void ext2_free_inode (struct inode * ino + if (!is_bad_inode(inode)) { + /* Quota is already initialized in iput() */ + ext2_xattr_delete_inode(inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + } +@@ -469,7 +469,7 @@ struct inode *ext2_new_inode(struct inod + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto fail_dlim; + } +@@ -615,28 +615,29 @@ got: + + if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); +- err = -ENOSPC; ++ err = -EDQUOT; + goto fail2; + } + err = ext2_init_acl(inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; ++ + mark_inode_dirty(inode); + ext2_debug("allocating inode %lu\n", inode->i_ino); + ext2_preread_inode(inode); + return inode; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); + return ERR_PTR(err); + + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + fail_dlim: + make_bad_inode(inode); + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext2/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c 2005-08-17 23:21:26 +0200 +@@ -651,11 +651,11 @@ ext2_xattr_set2(struct inode *inode, str + ea_bdebug(new_bh, "reusing block"); + + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + error = -EDQUOT; + if (DQUOT_ALLOC_BLOCK(inode, 1)) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + unlock_buffer(new_bh); + goto cleanup; + } +@@ -749,7 +749,7 @@ ext2_xattr_set2(struct inode *inode, str + le32_to_cpu(HDR(old_bh)->h_refcount) - 1); + if (ce) + mb_cache_entry_release(ce); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + mark_buffer_dirty(old_bh); + ea_bdebug(old_bh, "refcount now=%d", +@@ -810,7 +810,7 @@ ext2_xattr_delete_inode(struct inode *in + mark_buffer_dirty(bh); + if (IS_SYNC(inode)) + sync_dirty_buffer(bh); +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + } + ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1); +Files linux-2.6.12.3-vs2.0/fs/ext3/.ialloc.c.swp and linux-2.6.12.3-vs2.0.0.1/fs/ext3/.ialloc.c.swp differ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c 2005-08-17 23:22:11 +0200 +@@ -505,7 +505,7 @@ void ext3_free_blocks(handle_t *handle, + } + ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks); + if (dquot_freed_blocks) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, dquot_freed_blocks); ++ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks); + DQUOT_FREE_BLOCK(inode, dquot_freed_blocks); + } + return; +@@ -1218,7 +1218,7 @@ int ext3_new_block(handle_t *handle, str + *errp = -EDQUOT; + return 0; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto out_dlimit; + + sbi = EXT3_SB(sb); +@@ -1421,7 +1421,7 @@ io_error: + *errp = -EIO; + out: + if (!performed_allocation) +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + out_dlimit: + if (fatal) { + *errp = fatal; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c 2005-08-17 23:26:01 +0200 +@@ -127,7 +127,7 @@ void ext3_free_inode (handle_t *handle, + */ + DQUOT_INIT(inode); + ext3_xattr_delete_inode(handle, inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + +@@ -448,7 +448,7 @@ struct inode *ext3_new_inode(handle_t *h + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto out; + } +@@ -606,27 +606,24 @@ got: + sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0; + + ret = inode; +- if(DQUOT_ALLOC_INODE(inode)) { ++ if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); + err = -EDQUOT; + goto fail2; + } + err = ext3_init_acl(handle, inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; + err = ext3_mark_inode_dirty(handle, inode); + if (err) { + ext3_std_error(sb, err); +- DQUOT_FREE_INODE(inode); +- goto fail2; ++ goto fail2_free; + } + + ext3_debug("allocating inode %lu\n", inode->i_ino); + goto really_out; + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + ext3_std_error(sb, err); + out: + iput(inode); +@@ -635,8 +632,10 @@ really_out: + brelse(bitmap_bh); + return ret; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext3/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c 2005-08-17 23:30:04 +0200 +@@ -496,7 +496,7 @@ ext3_xattr_release_block(handle_t *handl + ext3_journal_dirty_metadata(handle, bh); + if (IS_SYNC(inode)) + handle->h_sync = 1; +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + unlock_buffer(bh); + ea_bdebug(bh, "refcount now=%d; releasing", +@@ -766,7 +766,7 @@ inserted: + ea_bdebug(new_bh, "keeping"); + else { + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + /* The old block is released after updating + the inode. */ +@@ -849,7 +849,7 @@ cleanup: + cleanup_dquot: + DQUOT_FREE_BLOCK(inode, 1); + cleanup_dlimit: +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + goto cleanup; + + bad_block: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c 2005-08-17 23:45:37 +0200 +@@ -102,6 +102,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_filsys.h" +@@ -381,9 +382,11 @@ static u32 add_index(tid_t tid, struct i + * It's time to move the inline table to an external + * page and begin to build the xtree + */ +- if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage) || ++ if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage)) ++ goto clean_up; ++ if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage) || + dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) +- goto clean_up; /* No space */ ++ goto clean_up_dlim; /* No space */ + + /* + * Save the table, we're going to overwrite it with the +@@ -474,6 +477,9 @@ static u32 add_index(tid_t tid, struct i + + return index; + ++ clean_up_dlim: ++ DQUOT_FREE_BLOCK(ip, sbi->nbperpage); ++ + clean_up: + + jfs_ip->next_index--; +@@ -925,7 +931,8 @@ int dtInsert(tid_t tid, struct inode *ip + static int dtSplitUp(tid_t tid, + struct inode *ip, struct dtsplit * split, struct btstack * btstack) + { +- struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); ++ struct super_block *sb = ip->i_sb; ++ struct jfs_sb_info *sbi = JFS_SBI(sb); + int rc = 0; + struct metapage *smp; + dtpage_t *sp; /* split page */ +@@ -947,6 +954,7 @@ static int dtSplitUp(tid_t tid, + struct tlock *tlck; + struct lv *lv; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + /* get split page */ + smp = split->mp; +@@ -1028,6 +1036,12 @@ static int dtSplitUp(tid_t tid, + } + quota_allocation += n; + ++ if (DLIMIT_ALLOC_BLOCK(ip, n)) { ++ rc = -ENOSPC; ++ goto extendOut; ++ } ++ dlimit_allocation += n; ++ + if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen, + (s64) n, &nxaddr))) + goto extendOut; +@@ -1296,6 +1310,9 @@ static int dtSplitUp(tid_t tid, + freeKeyName: + kfree(key.name); + ++ /* Rollback dlimit allocation */ ++ if (rc && dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation */ + if (rc && quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1363,6 +1380,12 @@ static int dtSplitPage(tid_t tid, struct + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp); + +@@ -1913,6 +1936,12 @@ static int dtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + BT_MARK_DIRTY(rmp, ip); + /* +@@ -2279,6 +2308,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&fp->header.self); + ++ /* Free dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation. */ + DQUOT_FREE_BLOCK(ip, xlen); + +@@ -2355,6 +2386,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&p->header.self); + ++ /* Free dlimit allocation */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation */ + DQUOT_FREE_BLOCK(ip, xlen); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c 2004-10-23 05:06:16 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c 2005-08-17 23:46:44 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -151,6 +152,13 @@ extAlloc(struct inode *ip, s64 xlen, s64 + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + /* determine the value of the extent flag */ + xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0; +@@ -169,6 +177,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 + */ + if (rc) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + up(&JFS_IP(ip)->commit_sem); + return (rc); +@@ -266,6 +275,13 @@ int extRealloc(struct inode *ip, s64 nxl + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + delta = nxlen - xlen; + +@@ -302,6 +318,7 @@ int extRealloc(struct inode *ip, s64 nxl + /* extend the extent */ + if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) { + dbFree(ip, xaddr + xlen, delta); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +@@ -313,6 +330,7 @@ int extRealloc(struct inode *ip, s64 nxl + */ + if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c 2005-08-01 10:32:42 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c 2005-08-17 23:46:24 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include "jfs_incore.h" + #include "jfs_filsys.h" +@@ -61,12 +62,18 @@ struct inode *ialloc(struct inode *paren + mode |= S_ISGID; + } else + inode->i_gid = current->fsgid; ++ + inode->i_xid = vx_current_fsxid(sb); ++ if (DLIMIT_ALLOC_INODE(inode)) { ++ iput(inode); ++ return NULL; ++ } + + /* + * Allocate inode to quota. + */ + if (DQUOT_ALLOC_INODE(inode)) { ++ DLIMIT_FREE_INODE(inode); + DQUOT_DROP(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c 2005-08-17 23:45:13 +0200 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_filsys.h" + #include "jfs_metapage.h" +@@ -849,7 +850,12 @@ int xtInsert(tid_t tid, /* transaction + hint = 0; + if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen))) + goto out; ++ if ((rc = DLIMIT_ALLOC_BLOCK(ip, xlen))) { ++ DQUOT_FREE_BLOCK(ip, xlen); ++ goto out; ++ } + if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) { ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + goto out; + } +@@ -879,6 +885,7 @@ int xtInsert(tid_t tid, /* transaction + /* undo data extent allocation */ + if (*xaddrp == 0) { + dbFree(ip, xaddr, (s64) xlen); ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + } + return rc; +@@ -927,7 +934,6 @@ int xtInsert(tid_t tid, /* transaction + out: + /* unpin the leaf page */ + XT_PUTPAGE(mp); +- + return rc; + } + +@@ -1239,6 +1245,7 @@ xtSplitPage(tid_t tid, struct inode *ip, + struct tlock *tlck; + struct xtlock *sxtlck = NULL, *rxtlck = NULL; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + smp = split->mp; + sp = XT_PAGE(ip, smp); +@@ -1251,13 +1258,19 @@ xtSplitPage(tid_t tid, struct inode *ip, + rbn = addressPXD(pxd); + + /* Allocate blocks to quota. */ +- if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { + rc = -EDQUOT; + goto clean_up; + } +- + quota_allocation += lengthPXD(pxd); + ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ rc = -ENOSPC; ++ goto clean_up; ++ } ++ dlimit_allocation += lengthPXD(pxd); ++ + /* + * allocate the new right page for the split + */ +@@ -1459,6 +1472,9 @@ xtSplitPage(tid_t tid, struct inode *ip, + + clean_up: + ++ /* Rollback dlimit allocation. */ ++ if (dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation. */ + if (quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1523,6 +1539,12 @@ xtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp); + +@@ -3949,6 +3971,8 @@ s64 xtTruncate(tid_t tid, struct inode * + else + ip->i_size = newsize; + ++ /* update dlimit allocation to reflect freed blocks */ ++ DLIMIT_FREE_BLOCK(ip, nfreed); + /* update quota allocation to reflect freed blocks */ + DQUOT_FREE_BLOCK(ip, nfreed); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c +--- linux-2.6.12.3-vs2.0/fs/jfs/xattr.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c 2005-08-17 23:47:01 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -275,9 +276,16 @@ static int ea_write(struct inode *ip, st + if (DQUOT_ALLOC_BLOCK(ip, nblocks)) { + return -EDQUOT; + } ++ /* Allocate new blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) { ++ DQUOT_FREE_BLOCK(ip, nblocks); ++ return -ENOSPC; ++ } + + rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno); + if (rc) { ++ /*Rollback dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, nblocks); + /*Rollback quota allocation. */ <> From baggins at pld-linux.org Tue Aug 23 15:34:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES: linux-2.6-vs2-BME.patch (NEW) - vserver bind mount extens... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:34:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - vserver bind mount extensions ---- Files affected: SOURCES: linux-2.6-vs2-BME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2-BME.patch diff -u /dev/null SOURCES/linux-2.6-vs2-BME.patch:1.1 --- /dev/null Tue Aug 23 15:34:03 2005 +++ SOURCES/linux-2.6-vs2-BME.patch Tue Aug 23 15:33:58 2005 @@ -0,0 +1,911 @@ +; +; http://vserver.13thfloor.at/Experimental/BME/delta-2.6.11.5-vs1.9.5.3-bme0.06.1.diff +; +; Bind Mount Extensions +; +; this patch adds some functionality to the --bind +; type of vfs mounts. +; +; (C) 2003-2004 Herbert P?tzl +; +; Changelog: +; +; 0.01 - readonly bind mounts +; 0.02 - added ro truncate handling +; - added ro (f)chown, (f)chmod handling +; 0.03 - added ro utime(s) handling +; - added ro access and *_ioctl +; 0.04 - added noatime and nodiratime +; - made autofs4 update_atime uncond +; 0.05 - rewrite regarding (a)time +; - adapted to new 2.6 vfs +; 0.05.1 check for *->mnt added +; +; this patch 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 patch 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. + +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c +--- linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c 2004-12-25 01:54:50 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c 2005-03-26 00:25:23 +0100 +@@ -362,7 +362,7 @@ static int report_statvfs(struct vfsmoun + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +@@ -398,7 +398,7 @@ static int report_statvfs64(struct vfsmo + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c 2005-03-23 21:34:31 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -29,7 +29,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETFLAGS: { + unsigned int oldflags; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -70,7 +71,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETVERSION: + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(inode->i_generation, (int __user *) arg)) + return -EFAULT; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c 2005-03-23 21:34:33 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -36,7 +36,8 @@ int ext3_ioctl (struct inode * inode, st + unsigned int oldflags; + unsigned int jflag; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -114,7 +115,8 @@ flags_err: + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(generation, (int __user *) arg)) + return -EFAULT; +@@ -165,7 +167,8 @@ flags_err: + if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode)) + return -ENOTTY; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -186,7 +189,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (get_user(n_blocks_count, (__u32 __user *)arg)) +@@ -207,7 +211,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg, +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -34,7 +34,8 @@ int hfsplus_ioctl(struct inode *inode, s + flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */ + return put_user(flags, (int __user *)arg); + case HFSPLUS_IOC_EXT2_SETFLAGS: { +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namei.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namei.c 2005-03-25 23:52:18 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c 2005-03-26 00:25:23 +0100 +@@ -242,7 +242,7 @@ int permission(struct inode *inode, int + /* + * Nobody gets write access to a read-only fs. + */ +- if (IS_RDONLY(inode) && ++ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) && + (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) + return -EROFS; + +@@ -1162,7 +1162,8 @@ static inline int check_sticky(struct in + * 10. We don't allow removal of NFS sillyrenamed files; it's handled by + * nfs_async_unlink(). + */ +-static inline int may_delete(struct inode *dir,struct dentry *victim,int isdir) ++static inline int may_delete(struct inode *dir, struct dentry *victim, ++ int isdir, struct nameidata *nd) + { + int error; + +@@ -1171,7 +1172,7 @@ static inline int may_delete(struct inod + + BUG_ON(victim->d_parent->d_inode != dir); + +- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); ++ error = permission(dir,MAY_WRITE | MAY_EXEC, nd); + if (error) + return error; + if (IS_APPEND(dir)) +@@ -1332,7 +1333,8 @@ int may_open(struct nameidata *nd, int a + return -EACCES; + + flag &= ~O_TRUNC; +- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE)) ++ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt)) ++ && (flag & FMODE_WRITE)) + return -EROFS; + /* + * An append-only file must be opened in append mode for writing. +@@ -1580,9 +1582,10 @@ fail: + } + EXPORT_SYMBOL_GPL(lookup_create); + +-int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) ++int vfs_mknod(struct inode *dir, struct dentry *dentry, ++ int mode, dev_t dev, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1624,7 +1627,6 @@ asmlinkage long sys_mknod(const char __u + goto out; + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); +- + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; + if (!IS_ERR(dentry)) { +@@ -1633,11 +1635,12 @@ asmlinkage long sys_mknod(const char __u + error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); + break; + case S_IFCHR: case S_IFBLK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode, +- new_decode_dev(dev)); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ new_decode_dev(dev), &nd); + break; + case S_IFIFO: case S_IFSOCK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ 0, &nd); + break; + case S_IFDIR: + error = -EPERM; +@@ -1655,9 +1658,10 @@ out: + return error; + } + +-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ++int vfs_mkdir(struct inode *dir, struct dentry *dentry, ++ int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1698,7 +1702,8 @@ asmlinkage long sys_mkdir(const char __u + if (!IS_ERR(dentry)) { + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; +- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); ++ error = vfs_mkdir(nd.dentry->d_inode, dentry, ++ mode, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1742,9 +1747,10 @@ void dentry_unhash(struct dentry *dentry + spin_unlock(&dcache_lock); + } + +-int vfs_rmdir(struct inode *dir, struct dentry *dentry) ++int vfs_rmdir(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 1); ++ int error = may_delete(dir, dentry, 1, nd); + + if (error) + return error; +@@ -1806,7 +1812,7 @@ asmlinkage long sys_rmdir(const char __u + dentry = lookup_hash(&nd.last, nd.dentry); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_rmdir(nd.dentry->d_inode, dentry); ++ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1817,9 +1823,10 @@ exit: + return error; + } + +-int vfs_unlink(struct inode *dir, struct dentry *dentry) ++int vfs_unlink(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 0); ++ int error = may_delete(dir, dentry, 0, nd); + + if (error) + return error; +@@ -1881,7 +1888,7 @@ asmlinkage long sys_unlink(const char __ + inode = dentry->d_inode; + if (inode) + atomic_inc(&inode->i_count); +- error = vfs_unlink(nd.dentry->d_inode, dentry); ++ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd); + exit2: + dput(dentry); + } +@@ -1900,9 +1907,10 @@ slashes: + goto exit2; + } + +-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode) ++int vfs_symlink(struct inode *dir, struct dentry *dentry, ++ const char *oldname, int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1944,7 +1952,8 @@ asmlinkage long sys_symlink(const char _ + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); ++ error = vfs_symlink(nd.dentry->d_inode, dentry, ++ from, S_IALLUGO, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1956,7 +1965,8 @@ out: + return error; + } + +-int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry) ++int vfs_link(struct dentry *old_dentry, struct inode *dir, ++ struct dentry *new_dentry, struct nameidata *nd) + { + struct inode *inode = old_dentry->d_inode; + int error; +@@ -1964,7 +1974,7 @@ int vfs_link(struct dentry *old_dentry, + if (!inode) + return -ENOENT; + +- error = may_create(dir, new_dentry, NULL); ++ error = may_create(dir, new_dentry, nd); + if (error) + return error; + +@@ -2028,7 +2038,8 @@ asmlinkage long sys_link(const char __us + new_dentry = lookup_create(&nd, 0); + error = PTR_ERR(new_dentry); + if (!IS_ERR(new_dentry)) { +- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); ++ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, ++ new_dentry, &nd); + dput(new_dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -2158,14 +2169,14 @@ int vfs_rename(struct inode *old_dir, st + if (old_dentry->d_inode == new_dentry->d_inode) + return 0; + +- error = may_delete(old_dir, old_dentry, is_dir); ++ error = may_delete(old_dir, old_dentry, is_dir, NULL); + if (error) + return error; + + if (!new_dentry->d_inode) + error = may_create(new_dir, new_dentry, NULL); + else +- error = may_delete(new_dir, new_dentry, is_dir); ++ error = may_delete(new_dir, new_dentry, is_dir, NULL); + if (error) + return error; + +@@ -2241,6 +2252,9 @@ static inline int do_rename(const char * + error = -EINVAL; + if (old_dentry == trap) + goto exit4; ++ error = -EROFS; ++ if (MNT_IS_RDONLY(newnd.mnt)) ++ goto exit4; + new_dentry = lookup_hash(&newnd.last, new_dir); + error = PTR_ERR(new_dentry); + if (IS_ERR(new_dentry)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namespace.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namespace.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c 2005-03-26 00:20:19 +0100 +@@ -252,24 +252,26 @@ static int show_vfsmnt(struct seq_file * + struct vfsmount *mnt = v; + int err = 0; + static struct proc_fs_info { +- int flag; +- char *str; ++ int s_flag; ++ int mnt_flag; ++ char *set_str; ++ char *unset_str; + } fs_info[] = { +- { MS_SYNCHRONOUS, ",sync" }, +- { MS_DIRSYNC, ",dirsync" }, +- { MS_MANDLOCK, ",mand" }, +- { MS_NOATIME, ",noatime" }, +- { MS_NODIRATIME, ",nodiratime" }, +- { MS_TAGXID, ",tagxid" }, +- { 0, NULL } +- }; +- static struct proc_fs_info mnt_info[] = { +- { MNT_NOSUID, ",nosuid" }, +- { MNT_NODEV, ",nodev" }, +- { MNT_NOEXEC, ",noexec" }, +- { 0, NULL } ++ { MS_RDONLY, MNT_RDONLY, "ro", "rw" }, ++ { MS_SYNCHRONOUS, 0, ",sync", NULL }, ++ { MS_DIRSYNC, 0, ",dirsync", NULL }, ++ { MS_MANDLOCK, 0, ",mand", NULL }, ++ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL }, ++ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL }, ++ { 0, MNT_NOSUID, ",nosuid", NULL }, ++ { 0, MNT_NODEV, ",nodev", NULL }, ++ { 0, MNT_NOEXEC, ",noexec", NULL }, ++ { MS_TAGXID, 0, ",tagxid", NULL }, ++ { 0, 0, NULL, NULL } + }; +- struct proc_fs_info *fs_infop; ++ struct proc_fs_info *p; ++ unsigned long s_flags = mnt->mnt_sb->s_flags; ++ int mnt_flags = mnt->mnt_flags; + + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return 0; +@@ -285,14 +287,15 @@ static int show_vfsmnt(struct seq_file * + seq_putc(m, ' '); + } + mangle(m, mnt->mnt_sb->s_type->name); +- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw"); +- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_sb->s_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); +- } +- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); ++ seq_putc(m, ' '); ++ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) { ++ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) { ++ if (p->set_str) ++ seq_puts(m, p->set_str); ++ } else { ++ if (p->unset_str) ++ seq_puts(m, p->unset_str); ++ } + } + if (mnt->mnt_flags & MNT_XID) + seq_printf(m, ",xid=%d", mnt->mnt_xid); +@@ -684,7 +687,8 @@ out_unlock: + /* + * do loopback mount. + */ +-static int do_loopback(struct nameidata *nd, char *old_name, xid_t xid, int flags) ++static int do_loopback(struct nameidata *nd, char *old_name, ++ xid_t xid, int flags, int mnt_flags) + { + struct nameidata old_nd; + struct vfsmount *mnt = NULL; +@@ -725,6 +729,7 @@ static int do_loopback(struct nameidata + spin_unlock(&vfsmount_lock); + } else + mntput(mnt); ++ mnt->mnt_flags = mnt_flags; + } + + up_write(¤t->namespace->sem); +@@ -1112,12 +1117,18 @@ long do_mount(char * dev_name, char * di + } + + /* Separate the per-mountpoint flags */ ++ if (flags & MS_RDONLY) ++ mnt_flags |= MNT_RDONLY; + if (flags & MS_NOSUID) + mnt_flags |= MNT_NOSUID; + if (flags & MS_NODEV) + mnt_flags |= MNT_NODEV; + if (flags & MS_NOEXEC) + mnt_flags |= MNT_NOEXEC; ++ if (flags & MS_NOATIME) ++ mnt_flags |= MNT_NOATIME; ++ if (flags & MS_NODIRATIME) ++ mnt_flags |= MNT_NODIRATIME; + flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE); + + if (vx_ccaps(VXC_SECURE_MOUNT)) +@@ -1136,7 +1147,7 @@ long do_mount(char * dev_name, char * di + retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, + data_page, xid); + else if (flags & MS_BIND) +- retval = do_loopback(&nd, dev_name, xid, flags); ++ retval = do_loopback(&nd, dev_name, xid, flags, mnt_flags); + else if (flags & MS_MOVE) + retval = do_move_mount(&nd, dev_name); + else +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c 2005-03-26 00:25:23 +0100 +@@ -773,7 +773,8 @@ static int is_atomic_open(struct inode * + if (nd->flags & LOOKUP_DIRECTORY) + return 0; + /* Are we trying to write to a read only partition? */ +- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) ++ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) && ++ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) + return 0; + return 1; + } +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c 2005-03-02 12:38:45 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c 2005-03-26 00:25:23 +0100 +@@ -1115,13 +1115,13 @@ nfsd_create(struct svc_rqst *rqstp, stru + err = vfs_create(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFDIR: +- err = vfs_mkdir(dirp, dchild, iap->ia_mode); ++ err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: +- err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); ++ err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL); + break; + default: + printk("nfsd: bad file type %o in nfsd_create\n", type); +@@ -1397,11 +1397,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str + else { + strncpy(path_alloced, path, plen); + path_alloced[plen] = 0; +- err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path_alloced, mode, NULL); + kfree(path_alloced); + } + } else +- err = vfs_symlink(dentry->d_inode, dnew, path, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path, mode, NULL); + + if (!err) { + if (EX_ISSYNC(fhp->fh_export)) +@@ -1459,7 +1461,7 @@ nfsd_link(struct svc_rqst *rqstp, struct + dold = tfhp->fh_dentry; + dest = dold->d_inode; + +- err = vfs_link(dold, dirp, dnew); ++ err = vfs_link(dold, dirp, dnew, NULL); + if (!err) { + if (EX_ISSYNC(ffhp->fh_export)) { + nfsd_sync_dir(ddir); +@@ -1620,9 +1622,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru + err = nfserr_perm; + } else + #endif +- err = vfs_unlink(dirp, rdentry); ++ err = vfs_unlink(dirp, rdentry, NULL); + } else { /* It's RMDIR */ +- err = vfs_rmdir(dirp, rdentry); ++ err = vfs_rmdir(dirp, rdentry, NULL); + } + + dput(rdentry); +@@ -1734,7 +1736,8 @@ nfsd_permission(struct svc_export *exp, + */ + if (!(acc & MAY_LOCAL_ACCESS)) + if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) { +- if (EX_RDONLY(exp) || IS_RDONLY(inode)) ++ if (EX_RDONLY(exp) || IS_RDONLY(inode) ++ || MNT_IS_RDONLY(exp->ex_mnt)) + return nfserr_rofs; + if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode)) + return nfserr_perm; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/open.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c +--- linux-2.6.11.5-vs1.9.5.3/fs/open.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c 2005-03-26 00:25:24 +0100 +@@ -244,7 +244,7 @@ static inline long do_sys_truncate(const + goto dput_and_out; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + error = -EPERM; +@@ -368,7 +368,7 @@ asmlinkage long sys_utime(char __user * + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + /* Don't worry, the checks are done in inode_change_ok() */ +@@ -425,7 +425,7 @@ long do_utimes(char __user * filename, s + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + <> From baggins at pld-linux.org Tue Aug 23 15:35:46 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES: pam-allow_root_ttyS0.patch (REMOVED), pam-fPIC.patch (REM... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:35:46 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: pam-allow_root_ttyS0.patch (1.1 -> NONE) (REMOVED), pam-fPIC.patch (1.4 -> NONE) (REMOVED), pam-gcc4.patch (1.1 -> NONE) (REMOVED), pam-mail.patch (1.3 -> NONE) (REMOVED), pam-noinstalled.patch (1.1 -> NONE) (REMOVED), pam-selinux-1.patch (1.17 -> NONE) (REMOVED), pam-selinux.patch (1.1 -> NONE) (REMOVED), pam-tcpd-severity.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 15:42:37 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: lvm2.spec - no spaces in bconds In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:42:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - no spaces in bconds ---- Files affected: SPECS: lvm2.spec (1.59 -> 1.60) ---- Diffs: ================================================================ Index: SPECS/lvm2.spec diff -u SPECS/lvm2.spec:1.59 SPECS/lvm2.spec:1.60 --- SPECS/lvm2.spec:1.59 Wed Aug 10 00:06:29 2005 +++ SPECS/lvm2.spec Tue Aug 23 15:42:32 2005 @@ -39,7 +39,7 @@ BuildRequires: readline-devel Requires: device-mapper Requires: dlm >= 1.0-0.pre21.2 -%{?with_clvmd: Requires: gulm >= 1.0-0.pre26.2} +%{?with_clvmd:Requires: gulm >= 1.0-0.pre26.2} %{?with_selinux:Requires: libselinux >= 1.10} Obsoletes: lvm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -160,6 +160,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.60 2005/08/23 13:42:32 baggins +- no spaces in bconds + Revision 1.59 2005/08/09 22:06:29 areq - fix Requires without clvmd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lvm2.spec?r1=1.59&r2=1.60&f=u From romke at pld-linux.org Tue Aug 23 15:48:43 2005 From: romke at pld-linux.org (romke) Date: Tue Dec 20 09:14:03 2005 Subject: PLDWWW: FrontPage Message-ID: <20050823134843.3441.32436@korupcja.pld-linux.org> Author: romke Date: Tue Aug 23 13:48:43 2005 GMT Module: PLDWWW URL: http://www.pld-linux.org/FrontPage ---- Log message: News PLD Mugs ---- Page affected: FrontPage ---- Diffs: ================================================================ PLD is a free, RPM-based Linux distribution, aimed at the more advanced users and administrators, who accept the tradeoffs of using a system, that might require manual tweaking in exchange for much flexibility. Simultaneous support for a wide variety of architectures and non-conservative approach to RPM usage provides our users with a consistent environment on almost all available architectures. More details are available in the [:About:about] section. == News == + + === 23 August 2005 PLD Mugs === + We are preparing 360ml (12 1/4 oz) frosted glass mugs with PLD logo - [http://wojtaszek.name/kubki/ sign up for one]! === 6 July 2005 Forum back up === After a (too) long period of downtime, our [http://forum.pld-linux.org/ web forum] is again available. Unfortunately we're starting from zero, since the old data got definitively lost, so users need to reregister. We're sorry for the inconvenience and hope that everyone will find the new functionality useful. The forum currently looks raw, but that should change in the near future. From kosmo at pld-linux.org Tue Aug 23 16:01:51 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES: web-cyradm-locale.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:01:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-locale.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u /dev/null SOURCES/web-cyradm-locale.patch:1.1 --- /dev/null Tue Aug 23 16:01:50 2005 +++ SOURCES/web-cyradm-locale.patch Tue Aug 23 16:01:43 2005 @@ -0,0 +1,13 @@ +diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php +--- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 ++++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 +@@ -70,9 +70,6 @@ + putenv("LANG=" . $LANG); + putenv("LANGUAGE=" . $LANG); + +- // Specify location of translation tables +- bindtextdomain("web-cyradm", "./locale"); +- + // Choose domain + textdomain("web-cyradm"); + require_once WC_BASE . "/session.php"; ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:20 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: web-cyradm.spec (NEW) - initial release. In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:02:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial release. ---- Files affected: SPECS: web-cyradm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u /dev/null SPECS/web-cyradm.spec:1.1 --- /dev/null Tue Aug 23 16:02:20 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 16:02:14 2005 @@ -0,0 +1,136 @@ +# $Revision$, $Date$ +# +# TODO: +# - R: & BR: +# - better /etc/httpd/web-cyradm.conf +# - many more +# +%define version_major 0.5.4 +%define version_minor 1 +# +Summary: Cyrus-IMAP based mail accounts managment system. +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Name: web-cyradm +Version: %{version_major}.%{version_minor} +Release: 0.1 +Epoch: 0 +License: GPL +Group: Applications +Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Patch0: %{name}-locale.patch +# Source0-md5: d06dc16899680c29b94a5460709b5fe0 +URL: http://www.web-cyradm.org/ +Requires: mysql +Requires: webserver +Requires: php +Requires: php-gettext +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Web-cyradm is a software that glues topnotch mailing technologies +together. The software on which web-cyradm relies on is completely +free and opensource software. Web-cyradm is continously developed +further to expand its functionality and usability. + +Features: + - Administer multiple virtual domains + - Manage user-accounts + - Map useraccounts to emailadresses + - Create, delete and rename cyrus-imap mailboxes + - Setting of quotas for users and domains + - Delegation of some tasks to domain adminstrators + - Resetting password for accountusers by its domainadmins + and superusers + - Sieve functions like forwarding single e-mail adresses + and out-of-office replies + - Enable/Disable different services like imap, pop, sieve and stmp + for particular users + - Support for MySQL and PostgreSQL databases + - Storing passwords in crypt, md5 or MySQL passwd compatible format + +%description -l pl +Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Source w jeden du?y system pocztowy. + +Mo?liwo?ci: + - Administracja wieloma wirtualnymu domenami + - Zarz?dzanie kontami urzytkownik?w + - Mapowanie kont urzytkownik?w na adresy e-mail + - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Delegacja zada? do administrator?w domen + - Resetowanie hase? u?ytkownikom przez administrator?w domen + - Filtry poczty Sieve + - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w + - Wsparcie dla MySQL'a i PostgreSQL'a + - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() + +%prep +%setup -q -n %{name}-%{version_major}-%{version_minor} +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},httpd} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} +install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} + +install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf + +install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} +install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css +install images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images +install lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lib + +ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/config + +for i in locale/?? locale/??_??; do + install -d $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES + install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES +done + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi +fi + +%preun +if [ "$1" = "0" ]; then + umask 027 + if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi + fi +fi + +%files -f %{name}.lang +%defattr(644,root,root,755) +%doc ChangeLog COPYRIGHT INSTALL README README.translations TO-BE-DONE migrate.php-dist doc/* scripts +%dir %{_sysconfdir}/%{name} +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%{_datadir}/%{name} + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/23 14:02:14 kosmo +- initial release. + ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:18 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: web-cyradm-0.5.4-1.tar.gz Message-ID: <15611.1124805738@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.web-cyradm.org/web-cyradm-0.5.4-1.tar.gz d06dc16899680c29b94a5460709b5fe0 web-cyradm-0.5.4-1.tar.gz Size: 455900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:35:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): dbus.spec, gnome-system-tools.spec, gnome-vfs2.spec... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:35:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: ---- Files affected: SPECS: dbus.spec (1.90 -> 1.91) , gnome-system-tools.spec (1.46.2.3 -> 1.46.2.4) , gnome-vfs2.spec (1.157.2.10 -> 1.157.2.11) , gnome-volume-manager.spec (1.28 -> 1.29) , hal.spec (1.79 -> 1.80) , mlview.spec (1.34 -> 1.35) , streamtuner.spec (1.11 -> 1.12) , sylpheed.spec (1.167.2.1 -> 1.167.2.2) , system-tools-backends.spec (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.90&r2=1.91&f=u http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.3&r2=1.46.2.4&f=u http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.10&r2=1.157.2.11&f=u http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.79&r2=1.80&f=u http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.34&r2=1.35&f=u http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.1&r2=1.167.2.2&f=u http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.3&r2=1.7.2.4&f=u From paladine at pld-linux.org Tue Aug 23 16:35:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: gnome-system-tools-1.3.92.tar.bz2 Message-ID: <3195.1124807735@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/gnome-system-tools-1.3.92.tar.bz2 c51a1867e130d5cdb0e389be59867a83 gnome-system-tools-1.3.92.tar.bz2 Size: 1957351 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 16:37:00 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: eclipse-plugin-ajdt.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:37:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: eclipse-plugin-ajdt.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-ajdt.spec diff -u SPECS/eclipse-plugin-ajdt.spec:1.4 SPECS/eclipse-plugin-ajdt.spec:1.5 --- SPECS/eclipse-plugin-ajdt.spec:1.4 Wed Dec 1 16:21:39 2004 +++ SPECS/eclipse-plugin-ajdt.spec Tue Aug 23 16:36:55 2005 @@ -2,19 +2,19 @@ Summary: AJDT - aspectJ development tools Summary(pl): AJDT - narz?dzia programistyczne aspectJ Name: eclipse-plugin-ajdt -Version: 1.1.12 +Version: 1.3.0 Release: 1 License: CPL v0.5 Group: Development/Languages -Source0: http://download.eclipse.org/technology/ajdt/30/update/ajdt_%{version}_archive.zip -# Source0-md5: 80a9fcbdb18d5ca46340c011cf28f45a +Source0: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_%{version}.20050823115355_archive.zip +# Source0-md5: ae776fad1db899469c8a1aee9a5de752 URL: http://www.eclipse.org/ajdt/ BuildRequires: unzip -Requires: eclipse >= 3.0 +Requires: eclipse >= 3.1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _eclipsedir %{_datadir}/eclipse +%define _eclipsedir %{_libdir}/eclipse %description The AspectJ Development Tools (AJDT) project provides Eclipse platform @@ -40,8 +40,8 @@ %files %defattr(644,root,root,755) -%{_eclipsedir}/features/* -%{_eclipsedir}/plugins/* +%{_libdir}/eclipse/features/* +%{_libdir}/eclipse/plugins/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -49,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 14:36:55 pawcioos +- updated to 1.3.0 + Revision 1.4 2004/12/01 15:21:39 zbyniu - BR: unzip ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-ajdt.spec?r1=1.4&r2=1.5&f=u From pawcioos at pld-linux.org Tue Aug 23 16:38:20 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated to 3.0.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:38:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.0 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.13 SPECS/eclipse-plugin-cdt.spec:1.14 --- SPECS/eclipse-plugin-cdt.spec:1.13 Fri Jul 1 22:54:44 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 16:38:15 2005 @@ -28,31 +28,30 @@ %endif %endif -%define _rc RC1 Summary: CDT - a set of plugins for Eclipse that implement a C/C++ IDE Summary(pl): CDT - zestaw wtyczek do ?rodowiska Eclipse implementuj?cy IDE C/C++ Name: eclipse-plugin-cdt %define _ver_major 3.0 %define _ver_minor 0 Version: %{_ver_major}.%{_ver_minor} -Release: 0.%{_rc}.1 +Release: 0.1 License: CPL v1.0 Group: Development/Languages %if %{need_x86} -Source0: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86.tar.gz -# Source0-md5: 454b6e0279c83fd209d6ac839a459134 +Source0: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86.tar.gz +# Source0-md5: fd578bf9bcbcd89cdbf1480e792a5506 %endif %if %{need_ppc} -Source1: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ppc.tar.gz -# Source1-md5: 1e5e716bf6f0bfd56139c706d344142a +Source1: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ppc.tar.gz +# Source1-md5: 92e83865c079406a231114f3fea74aa0 %endif %if %{need_ia64} -Source2: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ia64.tar.gz +Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz # Source2-md5: 80ba477131beb0c0682019a7705b1cfe %endif %if %{need_x8664} -Source3: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86_64.tar.gz -# Source3-md5: 7d8e6c97e9a8055b0823292064f71dbd +Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz +# Source3-md5: 05f7bdaba4eb8fa0ac07c62c722a6f65 %endif URL: http://www.eclipse.org/cdt/ BuildRequires: unzip @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/23 14:38:15 pawcioos +- updated to 3.0.0 + Revision 1.13 2005/07/01 20:54:44 qboosh - incall enabled by default - updated ia64 md5 as well ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.13&r2=1.14&f=u From paladine at pld-linux.org Tue Aug 23 16:39:38 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: dbus.spec - added missing commit log - added BR: libselinux... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:39:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log - added BR: libselinux-devel ---- Files affected: SPECS: dbus.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.91 SPECS/dbus.spec:1.92 --- SPECS/dbus.spec:1.91 Tue Aug 23 16:35:14 2005 +++ SPECS/dbus.spec Tue Aug 23 16:39:33 2005 @@ -61,6 +61,7 @@ %{?with_qt:BuildRequires: qt-devel >= %{qt_version}} BuildRequires: rpmbuild(macros) >= 1.202 BuildRequires: sed >= 4.0 +BuildRequires: libselinux-devel >= 1.17.13 BuildRequires: xmlto PreReq: rc-scripts Requires: %{name}-libs = %{version}-%{release} @@ -344,7 +345,6 @@ --with-system-pid-file=%{_localstatedir}/run/dbus.pid \ --with-system-socket=%{_localstatedir}/lib/dbus-1/system_bus_socket \ --enable-selinux - %{__make} \ pythondir=%{py_sitedir} @@ -546,8 +546,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/23 14:39:33 paladine +- added missing commit log +- added BR: libselinux-devel + Revision 1.91 2005/08/23 14:35:14 paladine -*** empty log message *** +- added --enable-selinux to configure Revision 1.90 2005/08/02 16:18:30 jpc - add a patch fixing the dbus serializer type definitions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.91&r2=1.92&f=u From paladine at pld-linux.org Tue Aug 23 16:50:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:50:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.4 -> 1.46.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.4 SPECS/gnome-system-tools.spec:1.46.2.5 --- SPECS/gnome-system-tools.spec:1.46.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-system-tools.spec Tue Aug 23 16:50:22 2005 @@ -114,8 +114,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.5 2005/08/23 14:50:22 paladine +- added missing commit log + Revision 1.46.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- use more macros +- sorted files Revision 1.46.2.3 2005/08/18 11:03:33 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.4&r2=1.46.2.5&f=u From paladine at pld-linux.org Tue Aug 23 16:52:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:52:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.11 -> 1.157.2.12) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.11 SPECS/gnome-vfs2.spec:1.157.2.12 --- SPECS/gnome-vfs2.spec:1.157.2.11 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-vfs2.spec Tue Aug 23 16:51:55 2005 @@ -195,8 +195,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.12 2005/08/23 14:51:55 paladine +- added missing commit log + Revision 1.157.2.11 2005/08/23 14:35:15 paladine -*** empty log message *** +- itemize schemas Revision 1.157.2.10 2005/08/14 09:28:25 freetz - dropped patches: resolve_fstab_symlinks, user_visible_drives, get_volume_ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.11&r2=1.157.2.12&f=u From pawcioos at pld-linux.org Tue Aug 23 16:54:15 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: ajdt_1.3.0.20050823115355_archive.zip Message-ID: <4210.1124808855@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_1.3.0.20050823115355_archive.zip ae776fad1db899469c8a1aee9a5de752 ajdt_1.3.0.20050823115355_archive.zip Size: 15684941 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:56:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: gnome-volume-manager.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:56:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-volume-manager.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.29 SPECS/gnome-volume-manager.spec:1.30 --- SPECS/gnome-volume-manager.spec:1.29 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-volume-manager.spec Tue Aug 23 16:55:56 2005 @@ -96,8 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 14:55:56 paladine +- added missing commit log + Revision 1.29 2005/08/23 14:35:15 paladine -*** empty log message *** +- unpmountize +- itemize schemas Revision 1.28 2005/08/04 18:02:39 freetz - R: eject for CD volumes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Tue Aug 23 16:58:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: hal.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: hal.spec (1.80 -> 1.81) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.80 SPECS/hal.spec:1.81 --- SPECS/hal.spec:1.80 Tue Aug 23 16:35:15 2005 +++ SPECS/hal.spec Tue Aug 23 16:58:25 2005 @@ -230,8 +230,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81 2005/08/23 14:58:25 paladine +- added missing commit log + Revision 1.80 2005/08/23 14:35:15 paladine -*** empty log message *** +- back to fstab-sync +- enable verbose-mode Revision 1.79 2005/08/07 19:52:44 freetz - changelog typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.80&r2=1.81&f=u From paladine at pld-linux.org Tue Aug 23 17:00:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: mlview.spec - reverted accidental commit In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:00:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted accidental commit ---- Files affected: SPECS: mlview.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/mlview.spec diff -u SPECS/mlview.spec:1.35 SPECS/mlview.spec:1.36 --- SPECS/mlview.spec:1.35 Tue Aug 23 16:35:15 2005 +++ SPECS/mlview.spec Tue Aug 23 17:00:44 2005 @@ -2,36 +2,30 @@ Summary: XML Editor for GNOME Summary(pl): Edytor XML-a dla GNOME Name: mlview -Version: 0.9.0 -Release: 1 +Version: 0.7.1 +Release: 2 License: GPL Group: X11/Applications/Editors -Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.9/%{name}-%{version}.tar.bz2 -# Source0-md5: eb3722950af8d78556b197f23870adba +Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.7/%{name}-%{version}.tar.bz2 +# Source0-md5: 85383331e5bb6d59293cee5b86595284 Patch0: %{name}-locale-names.patch Patch1: %{name}-desktop.patch URL: http://www.freespiders.org/projects/gmlview/ BuildRequires: GConf2-devel >= 2.10.0 -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: dbus-devel >= 0.22 BuildRequires: eel-devel >= 2.10.0 BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 -BuildRequires: gnome-vfs2-devel >= 2.6.0 BuildRequires: gtk+2-devel >= 2:2.6.4 -BuildRequires: gktmm-devel >= 2.4.0 -BuildRequires: gktsourceview-devel >= 1.0.0 BuildRequires: intltool >= 0.33 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libglademm-devel >= 2.4.0 BuildRequires: libgnome-devel >= 2.10.0-2 -BuildRequires: libgnomeui-devel >= 2.2.0 +#BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libtool BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt >= 1.1.14 BuildRequires: rpmbuild(macros) >= 1.197 -BuildRequires: vte-devel >= 0.11.12 Requires(post): /sbin/ldconfig Requires(post,preun): GConf2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -107,8 +101,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.35 2005/08/23 14:35:15 paladine -*** empty log message *** +Revision 1.36 2005/08/23 15:00:44 paladine +- reverted accidental commit Revision 1.34 2005/04/18 10:22:51 paladine - no ldconfig_post{,un} macros, use %%postun -p ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.35&r2=1.36&f=u From paladine at pld-linux.org Tue Aug 23 17:02:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: streamtuner.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:02:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: streamtuner.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/streamtuner.spec diff -u SPECS/streamtuner.spec:1.12 SPECS/streamtuner.spec:1.13 --- SPECS/streamtuner.spec:1.12 Tue Aug 23 16:35:15 2005 +++ SPECS/streamtuner.spec Tue Aug 23 17:02:37 2005 @@ -224,8 +224,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 15:02:37 paladine +- added missing commit log + Revision 1.12 2005/08/23 14:35:15 paladine -*** empty log message *** +- removed todo +- works for me, rel. 1 Revision 1.11 2005/02/18 21:48:43 qboosh - missing defattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.12&r2=1.13&f=u From paladine at pld-linux.org Tue Aug 23 17:05:52 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: system-tools-backends-1.3.92.tar.bz2 Message-ID: <22092.1124809552@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/1.3/system-tools-backends-1.3.92.tar.bz2 fac8b7604603690e3e171086e42ba75b system-tools-backends-1.3.92.tar.bz2 Size: 705920 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 17:05:51 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): system-tools-backends.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:05:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: system-tools-backends.spec (1.7.2.4 -> 1.7.2.5) ---- Diffs: ================================================================ Index: SPECS/system-tools-backends.spec diff -u SPECS/system-tools-backends.spec:1.7.2.4 SPECS/system-tools-backends.spec:1.7.2.5 --- SPECS/system-tools-backends.spec:1.7.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/system-tools-backends.spec Tue Aug 23 17:05:46 2005 @@ -61,8 +61,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7.2.5 2005/08/23 15:05:46 paladine +- added missing commit log + Revision 1.7.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- sorted %%files Revision 1.7.2.3 2005/08/09 11:52:46 aflinta - up to version 1.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.4&r2=1.7.2.5&f=u From paladine at pld-linux.org Tue Aug 23 17:07:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS (DEVEL): sylpheed.spec - updated to 2.1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:07:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.1.1 ---- Files affected: SPECS: sylpheed.spec (1.167.2.2 -> 1.167.2.3) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167.2.2 SPECS/sylpheed.spec:1.167.2.3 --- SPECS/sylpheed.spec:1.167.2.2 Tue Aug 23 16:35:15 2005 +++ SPECS/sylpheed.spec Tue Aug 23 17:07:26 2005 @@ -139,8 +139,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.167.2.3 2005/08/23 15:07:26 paladine +- updated to 2.1.1 + Revision 1.167.2.2 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 2.1.1 Revision 1.167.2.1 2005/08/14 18:31:50 freetz - starting developement on 2.1.x unstable series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.2&r2=1.167.2.3&f=u From paladine at pld-linux.org Tue Aug 23 17:07:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: sylpheed-2.1.1.tar.bz2 Message-ID: <22913.1124809662@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.1.tar.bz2 422db3499bec693f53673cf97f6ebb0c sylpheed-2.1.1.tar.bz2 Size: 2323547 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 17:27:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: ERRORS: org.eclipse.cdt-3.0.0-linux.x86.tar.gz org.eclipse.cdt-3.0.0-linux.ppc.tar.gz org.eclipse.cdt-3.0.0-linux.ia64.tar.gz org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Message-ID: <4975.1124810873@distfiles.pld-linux.org> FATAL: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ia64.tar.gz md5 mismatch, needed 80ba477131beb0c0682019a7705b1cfe, got ee07f4d21c3785e7d3b2b40b4669def0 Files fetched: 3 STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86.tar.gz fd578bf9bcbcd89cdbf1480e792a5506 org.eclipse.cdt-3.0.0-linux.x86.tar.gz Size: 11946636 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ppc.tar.gz 92e83865c079406a231114f3fea74aa0 org.eclipse.cdt-3.0.0-linux.ppc.tar.gz Size: 11949813 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz 05f7bdaba4eb8fa0ac07c62c722a6f65 org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Size: 11946896 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 17:59:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-vs2.patch - fix for removed fbsplash In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 15:59:17 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix for removed fbsplash ---- Files affected: SOURCES: linux-2.6-vs2.patch (1.1.2.6 -> 1.1.2.7) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2.patch diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.6 SOURCES/linux-2.6-vs2.patch:1.1.2.7 --- SOURCES/linux-2.6-vs2.patch:1.1.2.6 Sun Aug 7 02:14:10 2005 +++ SOURCES/linux-2.6-vs2.patch Tue Aug 23 17:59:11 2005 @@ -7572,10 +7572,10 @@ --- linux-2.6.12.3/include/linux/sysctl.h 2005-06-22 02:38:52 +0200 +++ linux-2.6.12.3-vs2.0-rc9/include/linux/sysctl.h 2005-08-01 10:32:45 +0200 @@ -136,6 +136,7 @@ enum + KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */ KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ KERN_RANDOMIZE=68, /* int: randomize virtual address space */ - KERN_FBSPLASH=69, /* string: path to fbsplash helper */ -+ KERN_VSHELPER=70, /* string: path to vshelper policy agent */ ++ KERN_VSHELPER=69, /* string: path to vshelper policy agent */ }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.patch?r1=1.1.2.6&r2=1.1.2.7&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:42 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: lms.spec - up to 1.6.3 (security update) In-Reply-To: References: Message-ID: Author: dzeus Date: Tue Aug 23 16:21:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.3 (security update) ---- Files affected: SPECS: lms.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/lms.spec diff -u SPECS/lms.spec:1.62 SPECS/lms.spec:1.63 --- SPECS/lms.spec:1.62 Thu Aug 11 17:20:59 2005 +++ SPECS/lms.spec Tue Aug 23 18:21:32 2005 @@ -8,17 +8,17 @@ # - cosmetics (sort in %%files and %%install) # - contrib split %define lmsver 1.6 -%define lmssubver 2 +%define lmssubver 3 Summary: LAN Managment System Summary(pl): System Zarz?dzania Sieci? Lokaln? Name: lms Version: %{lmsver}.%{lmssubver} -Release: 0.1 +Release: 1 License: GPL Vendor: LMS Developers Group: Networking/Utilities Source0: http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz -# Source0-md5: 36700215ccdb81674d183b7531d1a00c +# Source0-md5: 07619fbe576c6801fdb82d5a73fbb1ae Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig @@ -318,6 +318,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/23 16:21:32 dzeus +- up to 1.6.3 (security update) + Revision 1.62 2005/08/11 15:20:59 dzeus - up to 1.6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lms.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:51 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:14:03 2005 Subject: DISTFILES: lms-1.6.3.tar.gz Message-ID: <1322.1124814111@distfiles.pld-linux.org> Files fetched: 1 STORED: http://lms.rulez.pl/download/1.6/lms-1.6.3.tar.gz 07619fbe576c6801fdb82d5a73fbb1ae lms-1.6.3.tar.gz Size: 1980733 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Tue Aug 23 18:26:57 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: rc-scripts/trunk/rc.d/init.d/network Message-ID: <6327@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:26:48 2005 New Revision: 6327 Modified: rc-scripts/trunk/rc.d/init.d/network Log: [a-z] doesn't always mean whole alphabet (for example et_EE locale). Use C locale when searching. (Patch by Elan Ruusam?e) Modified: rc-scripts/trunk/rc.d/init.d/network ============================================================================== --- rc-scripts/trunk/rc.d/init.d/network (original) +++ rc-scripts/trunk/rc.d/init.d/network Tue Aug 23 18:26:48 2005 @@ -134,7 +134,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -143,7 +143,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep 'ifcfg-(.*)\.(.*)' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -151,7 +151,7 @@ interfaces_br_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-br* | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -159,7 +159,7 @@ interfaces_sit_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-sit* | \ - egrep 'ifcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -167,7 +167,7 @@ fi tunnels=$((cd /etc/sysconfig/interfaces && ls -1 tnlcfg-* | \ xargs egrep -l "ONBOOT=[^n][^o]" | \ - egrep 'tnlcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'tnlcfg-[a-z0-9]+$' | \ awk ' { gsub(/tnlcfg-/,NIL); print $0 } ') 2> /dev/null) # See how we were called. From cvs at pld-linux.org Tue Aug 23 18:28:27 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: rc-scripts/trunk/inittab Message-ID: <6328@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:28:24 2005 New Revision: 6328 Modified: rc-scripts/trunk/inittab Log: Example for agetty on serial port. Modified: rc-scripts/trunk/inittab ============================================================================== --- rc-scripts/trunk/inittab (original) +++ rc-scripts/trunk/inittab Tue Aug 23 18:28:24 2005 @@ -45,6 +45,8 @@ # If power was restored before the shutdown kicked in, cancel it. pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" +# Run agetty on serial port +# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels 1:12345:respawn:/sbin/mingetty --noclear tty1 From cvs at pld-linux.org Tue Aug 23 18:29:41 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: rc-scripts/trunk/sysconfig/interfaces: data/chat-ppp0.gprs-plusgsm ifcfg-ppp0.gprs-plusgsm Message-ID: <6329@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:29:35 2005 New Revision: 6329 Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Log: Fixed PlusGSM examples. (Patch by Pawe? Go?aszewski) Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -1,6 +1,9 @@ -ABORT BUSY -ABORT ERROR +ABORT "BUSY" +ABORT "ERROR" ABORT "NO CARRIER" +ABORT "NO DIALTONE" +ABORT "NO ANSWER" +ABORT "Username/Password Incorrect" "" AT -OK-AT-OK ATD"$PHONE" +OK-AT-OK ATDT"$PHONE" CONNECT Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -16,8 +16,8 @@ #ACTIVEFILTER= #IDLE= PHONE='*99***1#' -USER=ppp -PASSWORD=ppp +USER=plusgsm +PASSWORD=plusgsm #INITSTRING=ATe0s2=255 DATAFORCHAT="USER PASSWORD INITSTRING PHONE" From cvs at pld-linux.org Tue Aug 23 18:32:52 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: rc-scripts/trunk: ChangeLog configure.ac Message-ID: <6330@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:32:43 2005 New Revision: 6330 Modified: rc-scripts/trunk/ChangeLog rc-scripts/trunk/configure.ac Log: Update for 0.4.0.20. Modified: rc-scripts/trunk/ChangeLog ============================================================================== --- rc-scripts/trunk/ChangeLog (original) +++ rc-scripts/trunk/ChangeLog Tue Aug 23 18:32:43 2005 @@ -1,3 +1,115 @@ +2005-08-23 16:29 +0000 [r6327-6329] Arkadiusz Mi?kiewicz + + * sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm, + sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm: Fixed PlusGSM + examples. (Patch by Pawe? Go?aszewski) + + * inittab: Example for agetty on serial port. + + * rc.d/init.d/network: [a-z] doesn't always mean whole alphabet + (for example et_EE locale). Use C locale when searching. (Patch + by Elan Ruusam?e) + +2005-08-15 22:45 +0000 [r6315] Jan R?korajski + + * rc.d/init.d/cpusets: - don't spew errors on stdout - inform about + failurse + +2005-08-14 18:32 +0000 [r6311] Tomasz Wittner + + * DEVELOPMENT: - typo in enumeration + +2005-08-13 23:06 +0000 [r6307-6310] Jan R?korajski + + * rc.d/init.d/cpusets: - added echo for better status readability + + * rc.d/init.d/cpusets: - properly test cpuset dir for status + display + + * rc.d/init.d/cpusets: - properly escape message + + * rc.d/init.d/cpusets: - use show() when creating/removing cpusets + +2005-08-13 22:58 +0000 [r6306] Jan R?korajski + + * rc.d/init.d/cpusets: - typo + +2005-08-13 22:34 +0000 [r6305] Jan R?korajski + + * rc.d/init.d/functions: - take CPUSETS setting into account + +2005-08-13 22:00 +0000 [r6304] Jan R?korajski + + * rc.d/rc.sysinit: - mount cpuset filesystem if kernel capable + +2005-08-11 17:43 +0000 [r6300] Jan R?korajski + + * doc/sysconfig.txt, doc/sysconfig.docb: - added description for + available per-service settings + +2005-08-11 17:11 +0000 [r6299] Jan R?korajski + + * rc-scripts.spec.in: - cpusets added + +2005-08-11 17:04 +0000 [r6297-6298] Jan R?korajski + + * rc.d/init.d/Makefile.am: - cpusets script added + + * configure.ac: - sysconfig/cpusets/Makefile added + +2005-08-11 16:58 +0000 [r6294-6296] Jan R?korajski + + * po/pl.po: - final touch + + * po/pl.po: - updated + + * rc.d/init.d/functions: - added some code for completness + +2005-08-11 16:36 +0000 [r6293] Jan R?korajski + + * rc.d/init.d/cpusets: - defile cpuset settings as local in + function + +2005-08-11 16:35 +0000 [r6292] Arkadiusz Mi?kiewicz + + * rc.d/init.d/functions: filter_chroot(): Do not filter pids for + processes that no longer exists. We don't know whether these were + from current (ch)root so we assume that they were. + +2005-08-11 16:23 +0000 [r6291] Jan R?korajski + + * rc.d/init.d/functions: - added cpuset support to daemon and + status functions + +2005-08-10 20:10 +0000 [r6290] Jan R?korajski + + * sysconfig/system, sysconfig/cpusets/cpuset-test (added), + sysconfig/Makefile.am, rc.d/init.d/cpusets (added), + sysconfig/cpusets/Makefile.am (added): - CPUSETS support (work in + progress) + +2005-08-10 19:49 +0000 [r6289] Jan R?korajski + + * sysconfig/cpusets (added): - a place for cpusets config files + +2005-08-08 21:53 +0000 [r6288] Andrzej Dopiera?a + + * rc.d/init.d/network: - get only tnlcfg-name, not tnlcfg-name~ + +2005-07-27 09:09 +0000 [r6229] Arkadiusz Mi?kiewicz + + * sysconfig/network-scripts/ifup: ifup: Handle special + pcmcia-hotplug case. + +2005-07-21 22:35 +0000 [r6226] Andrzej Dopiera?a + + * rc.d/init.d/network: - first up bridge, next tunnels (tunnels can + be on bridges) - first down tunnels, next bridge ;) + +2005-05-30 18:54 +0000 [r6028] Arkadiusz Mi?kiewicz + + * configure.ac: Release 0.4.0.19. + 2005-05-30 18:47 +0000 [r6027] Arkadiusz Mi?kiewicz * sysconfig/network-scripts/ifup: Understand BOOTPROTO=static Modified: rc-scripts/trunk/configure.ac ============================================================================== --- rc-scripts/trunk/configure.ac (original) +++ rc-scripts/trunk/configure.ac Tue Aug 23 18:32:43 2005 @@ -1,6 +1,6 @@ dnl $Id$ -AC_INIT(["rc-scripts"], [0.4.0.19], [pld-rc-scripts@pld-linux.org], [rc-scripts]) +AC_INIT(["rc-scripts"], [0.4.0.20], [pld-rc-scripts@pld-linux.org], [rc-scripts]) AM_INIT_AUTOMAKE ALL_LINGUAS="pl de" From cvs at pld-linux.org Tue Aug 23 18:33:37 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: rc-scripts/tags/0.4.0.20 Message-ID: <6331@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:33:34 2005 New Revision: 6331 Added: rc-scripts/tags/0.4.0.20/ - copied from rev 6330, rc-scripts/trunk/ Log: Released 0.4.0.20. From glen at pld-linux.org Tue Aug 23 18:45:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: macromedia-flash.spec - use non-expanding heredoc redirecti... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:45:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use non-expanding heredoc redirection for readiness ---- Files affected: SPECS: macromedia-flash.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.24 SPECS/macromedia-flash.spec:1.25 --- SPECS/macromedia-flash.spec:1.24 Fri Jan 21 23:21:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:45:34 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla}.1 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -82,38 +82,37 @@ %if ! %{with license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install +cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install #!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/%{base_name}.spec ]; then BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev + mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" else - cp -f "\$3" . + cp -f "$3" . fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 + cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 else - cp -i "\$3" \$SPECDIR || exit 1 + cp -i "$3" $SPECDIR || exit 1 fi - ( cd \$SPECDIR + ( cd $SPECDIR %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then + if [ "$?" -ne 0 ]; then exit 2 fi RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm @@ -121,28 +120,27 @@ RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm RPMNAMES= if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=\$RPMDIR/\$RPMNAME1 - echo "Installing \$RPMNAME1" + RPMNAMES=$RPMDIR/$RPMNAME1 + echo "Installing $RPMNAME1" else - echo "Not installing \$RPMNAME1" + echo "Not installing $RPMNAME1" fi if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" + echo "Installing $RPMNAME2" else - echo "Not installing \$RPMNAME2" + echo "Not installing $RPMNAME2" fi if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME3" - echo "Installing \$RPMNAME3" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" + echo "Installing $RPMNAME3" else - echo "Not installing \$RPMNAME3" + echo "Not installing $RPMNAME3" fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/%{base_name}.spec.prev ]; then + mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec fi fi else @@ -151,7 +149,7 @@ this package by default. If you want to create full working package please build it with the following command: -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec +$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " fi EOF @@ -224,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/23 16:45:34 glen +- use non-expanding heredoc redirection for readiness + Revision 1.24 2005/01/21 22:21:34 qboosh - don't mention netraider, it's dead @@ -289,7 +290,7 @@ - updated to version 6.0.79.0 Revision 1.4 2003/03/04 10:47:30 grabba -added bcond to build in RA environment +- added bcond to build in RA environment Revision 1.3 2003/01/13 10:09:05 adgor - Prefix /usr @@ -318,7 +319,7 @@ - Release 2 Revision 1.6 2002/10/28 12:09:55 grabba -tested with mozilla 1.0 +- tested with mozilla 1.0 Revision 1.5 2002/10/28 10:56:25 misiek - updated to 6.0 beta @@ -327,7 +328,7 @@ - updated to 5.0r51 Revision 1.3 2002/08/18 12:34:00 blues -license fix +- license fix Revision 1.2 2002/08/12 18:27:34 blues - 5.0r50 - SECURITY update @@ -337,13 +338,13 @@ - License forbids distribution! Revision 1.12 2002/04/25 16:18:26 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/04/18 10:47:33 misiek -5.0r48 (still doesn't work with mozilla 0.9.9 +- 5.0r48 (still doesn't work with mozilla 0.9.9 Revision 1.10 2002/03/27 11:05:59 roman -s/Distribuable/distributable in License +- s/Distribuable/distributable in License Revision 1.9 2002/03/24 02:04:52 blues - s/Exclude/Exclusive/ @@ -356,13 +357,13 @@ Group field using gettext). Revision 1.6 2002/01/28 10:31:00 marcus --s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.5 2002/01/18 02:12:57 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.4 2001/07/12 14:07:53 kloczek -- ExcludeArch: %%{ix86} +- ExcludeArch: %{ix86} Revision 1.3 2001/07/12 14:04:47 kloczek - cosmetics and some minor changes in macros using. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.24&r2=1.25&f=u From glen at pld-linux.org Tue Aug 23 18:47:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: macromedia-flash.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:47:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: macromedia-flash.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.25 SPECS/macromedia-flash.spec:1.26 --- SPECS/macromedia-flash.spec:1.25 Tue Aug 23 18:45:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:47:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.1 +Release: 2%{?with_license_agreement:wla}.2 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -79,7 +79,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -169,7 +169,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -194,7 +194,7 @@ MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if ! %{with license_agreement} +%if %{without license_agreement} %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{base_name}.install @@ -222,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/23 16:47:51 glen +- use without macro + Revision 1.25 2005/08/23 16:45:34 glen - use non-expanding heredoc redirection for readiness ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.25&r2=1.26&f=u From arekm at pld-linux.org Tue Aug 23 18:50:37 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: CVSROOT: loginfo Drop old stuff. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:50:37 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Drop old stuff. ---- Files affected: CVSROOT: loginfo (1.194 -> 1.195) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.194 CVSROOT/loginfo:1.195 --- CVSROOT/loginfo:1.194 Thu Feb 3 17:42:53 2005 +++ CVSROOT/loginfo Tue Aug 23 18:50:32 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m ser-cvs@it-zone.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.194&r2=1.195&f=u From arekm at pld-linux.org Tue Aug 23 18:51:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:51:47 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.13 -> 1.14) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.13 test/plik:1.14 --- test/plik:1.13 Tue Feb 1 20:38:34 2005 +++ test/plik Tue Aug 23 18:51:42 2005 @@ -1,3 +1,4 @@ +alala 1112 4682 85 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.13&r2=1.14&f=u From arekm at pld-linux.org Tue Aug 23 18:57:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:57:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.14 -> 1.15) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.14 test/plik:1.15 --- test/plik:1.14 Tue Aug 23 18:51:42 2005 +++ test/plik Tue Aug 23 18:57:24 2005 @@ -1,3 +1,4 @@ +test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 18:58:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:05 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.15 -> 1.16) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.15 test/plik:1.16 --- test/plik:1.15 Tue Aug 23 18:57:24 2005 +++ test/plik Tue Aug 23 18:58:00 2005 @@ -1,4 +1,5 @@ test1 +test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.15&r2=1.16&f=u From arekm at pld-linux.org Tue Aug 23 18:58:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test3 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:25 2005 GMT Module: test Tag: HEAD ---- Log message: - test3 ---- Files affected: test: plik (1.16 -> 1.17) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.16 test/plik:1.17 --- test/plik:1.16 Tue Aug 23 18:58:00 2005 +++ test/plik Tue Aug 23 18:58:20 2005 @@ -1,5 +1,6 @@ test1 test2 +test3 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.16&r2=1.17&f=u From glen at pld-linux.org Tue Aug 23 19:02:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: gplflash.spec - typos fixed In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:02:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typos fixed ---- Files affected: SPECS: gplflash.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.8 SPECS/gplflash.spec:1.9 --- SPECS/gplflash.spec:1.8 Wed Aug 17 23:05:16 2005 +++ SPECS/gplflash.spec Tue Aug 23 19:02:05 2005 @@ -78,7 +78,7 @@ Obsoletes: mozilla-plugin-gplflash Requires: browser-plugins -# use macro, otherwise extra LF isinserted along with the ifarch +# use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 %define browsers mozilla, mozilla-firefox, opera, konqueror %else @@ -145,7 +145,7 @@ %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libnpflash.so %ifarch %{ix86} ppc sparc sparc64 -%triggerin -n browser-plugin-%{name} -n browser-plugin-%{name} -- opera +%triggerin -n browser-plugin-%{name} -- opera %nsplugin_install -d %{_libdir}/opera/plugins libnpflash.so %triggerun -n browser-plugin-%{name} -- opera @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 17:02:05 glen +- typos fixed + Revision 1.8 2005/08/17 21:05:16 qboosh - pl update ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Tue Aug 23 19:12:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: CVSROOT: ciabot.pl Updated to latest version. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:12:15 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Updated to latest version. ---- Files affected: CVSROOT: ciabot.pl (1.9 -> 1.10) ---- Diffs: ================================================================ Index: CVSROOT/ciabot.pl diff -u CVSROOT/ciabot.pl:1.9 CVSROOT/ciabot.pl:1.10 --- CVSROOT/ciabot.pl:1.9 Sun Jan 4 17:55:22 2004 +++ CVSROOT/ciabot.pl Tue Aug 23 19:12:10 2005 @@ -12,32 +12,45 @@ # Free Software Foundation. # # The master location of this file is -# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# +# This version has been modified a bit, and is available on CIA's web site: +# http://cia.navi.cx/clients/cvs/ciabot_cvs.pl # # This program is designed to run from the loginfo CVS administration file. It # takes a log message, massaging it and mailing it to the address given below. # # Its record in the loginfo file should look like: # -# ALL $CVSROOT/CVSROOT/ciabot.pl %s $USER project from_email dest_email +# ALL /usr/bin/perl $CVSROOT/CVSROOT/ciabot_cvs.pl %{,,,s} $USER project from_email dest_email ignore_regexp +# +# IMPORTANT: The %{,,,s} in loginfo is new, and is required for proper operation. # -# Note that the last three parameters are optional, you can alternatively change -# the defaults below in the configuration section. +# Make sure that you add the script to 'checkoutlist' before +# committing it. You may need to change /usr/bin/perl to point to your +# system's perl binary. # -# If it does not work, try to disable $xml_rpc in the configuration section -# below. +# Note that the last four parameters are optional, you can alternatively +# change the defaults below in the configuration section. # -# $Id$ use strict; -use vars qw ($project $from_email $dest_email $rpc_uri @sendmail $sync_delay $xml_rpc); - - +use vars qw ($project $from_email $dest_email $rpc_uri $sendmail $sync_delay + $xml_rpc $ignore_regexp $alt_local_message_target); ### Configuration # Project name (as known to CIA). +# +# NOTE: This shouldn't be a long description of your project. Ideally +# it is a short identifier with no spaces, punctuation, or +# unnecessary capitalization. This will be used in URLs related +# to your project, as an internal identifier, and in IRC messages. +# If you want a longer name shown for your project on the web +# interface, please use the "title" metadata key rather than +# putting that here. +# $project = 'pld'; # The from address in generated mails. @@ -49,25 +62,48 @@ # If using XML-RPC, connect to this URI. $rpc_uri = 'http://cia.navi.cx/RPC2'; -# Path to your sendmail binary. If you have it at a different place (and -# outside of $PATH), add your location at the start of this list. By all means -# keep the trailing empty string in the array. -@sendmail = ('sendmail', '/usr/lib/sendmail', '/usr/sbin/sendmail', ''); +# Path to your USCD sendmail compatible binary (your mailer daemon created this +# program somewhere). +$sendmail = '/usr/sbin/sendmail'; # Number of seconds to wait for possible concurrent instances. CVS calls up # this script for each involved directory separately and this is the sync # delay. 5s looks as a safe value, but feel free to increase if you are running # this on a slower (or overloaded) machine or if you have really a lot of # directories. +# Increasing this could be a very good idea if you're on Sourceforge ;) $sync_delay = 5; # This script can communicate with CIA either by mail or by an XML-RPC # interface. The XML-RPC interface is faster and more efficient, however you # need to have RPC::XML perl module installed, and some large CVS hosting sites # (like Savannah or Sourceforge) might not allow outgoing HTTP connections -# while they allow outgoing mail. +# while they allow outgoing mail. Also, this script will hang and eventually +# not deliver the event at all if CIA server happens to be down, which is +# unfortunately not an uncommon condition. $xml_rpc = 0; +# You can make this bot to totally ignore events concerning the objects +# specified below. Each object is composed of //, +# therefore file Manifest in root directory of module gentoo will be called +# "gentoo/Manifest", while file src/bfu/inphist.c of module elinks will be +# called "elinks/src/bfu/inphist.c". Easy, isn't it? +# +# This variable should contain regexp, against which will each object be +# checked, and if the regexp is matched, the file is ignored. Therefore ie. to +# ignore all changes in the two files above and everything concerning module +# 'admin', use: +# +# $ignore_regexp = "^(gentoo/Manifest|elinks/src/bfu/inphist.c|admin/)"; +$ignore_regexp = ""; + +# It can be useful to also grab the generated XML message by some other +# programs and ie. autogenerate some content based on it. Here you can specify +# a file to which it will be appended. +$alt_local_message_target = ""; + + + ### The code itself @@ -78,6 +114,16 @@ # affected in each directory +# A nice nonprinting character we can use as a separator relatively safely. +# The commas in loginfo above give us 4 commas and a space between file +# names given to us on the command line. This is the separator used internally. +# Now we can handle filenames containing spaces, and probably anything except +# strings of 4 commas or the ASCII bell character. +# +# This was inspired by the suggestion in: +# http://mail.gnu.org/archive/html/info-cvs/2003-04/msg00267.html +# +$" = "\7"; ### Input data loading @@ -85,7 +131,7 @@ # These arguments are from %s; first the relative path in the repository # and then the list of files modified. -@files = split (' ', ($ARGV[0] or '')); +@files = split (' ,,,', ($ARGV[0] or '')); $dir[0] = shift @files or die "$0: no directory specified\n"; $dirfiles[0] = "@files" or die "$0: no files specified\n"; @@ -97,6 +143,7 @@ # Figure out who is doing the update. +# $user = $ARGV[1]; $user = $ENV{'CVS_USER'} || $ENV{'CVS_USERNAME'} || $ENV{'CVSUSER'} || getlogin || (getpwuid($<))[0] || "nobody"; @@ -105,6 +152,7 @@ $project = $ARGV[2] if $ARGV[2]; $from_email = $ARGV[3] if $ARGV[3]; $dest_email = $ARGV[4] if $ARGV[4]; +$ignore_regexp = $ARGV[5] if $ARGV[5]; # Parse stdin (what's interesting is the tag and log message) @@ -114,11 +162,25 @@ last if /^Log Message/; } +$logmsg = ""; while () { next unless ($_ and $_ ne "\n" and $_ ne "\r\n"); + s/&/&/g; + s//>/g; $logmsg .= $_; } +### Remove to-be-ignored files + +$dirfiles[0] = join (' ', + grep { + my $f = "$module/$dir[0]/$_"; + $f !~ m/$ignore_regexp/; + } split (/\s+/, $dirfiles[0]) +) if ($ignore_regexp); +exit unless $dirfiles[0]; + ### Sync between the multiple instances potentially being ran simultanously @@ -126,6 +188,7 @@ my $sum; # _VERY_ simple hash of the log message. It is really weak, but I'm # lazy and it's really sorta exceptional to even get more commits # running simultanously anyway. +$sum = 0; map { $sum += ord $_ } split(//, $logmsg); my $syncfile; # Name of the file used for syncing @@ -173,7 +236,8 @@ ### Compose the mail message -my ($VERSION) = '$Revision$' =~ / (\d+\.\d+) /; +my ($VERSION) = '2.3'; +my ($URL) = 'http://cia.navi.cx/clients/cvs/ciabot_cvs.pl'; my $ts = time; $message = < CIA Perl client for CVS $VERSION - http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl + $URL $project @@ -205,11 +269,11 @@ map { $_ = $dir[$dirnum] . '/' . $_; s#^.*?/##; # weed out the module name - s/ / /g; + s/&/&/g; s//>/g; $message .= " $_\n"; - } split(/ /, $dirfiles[$dirnum]); + } split($", $dirfiles[$dirnum]); } $message .= <>$alt_local_message_target")) { + print ALT $message; + close ALT; +} + + + ### Send out the XML-RPC message @@ -254,10 +327,7 @@ # Open our mail program -foreach my $sendmail (@sendmail) { - die "$0: cannot fork sendmail: $!\n" unless ($sendmail); - open (MAIL, "| $sendmail -t -oi -oem") and last; -} +open (MAIL, "| $sendmail -t -oi -oem") or die "Cannot execute $sendmail : " . ($?>>8); # The mail header @@ -276,6 +346,6 @@ # Close the mail close MAIL; -die "$0: sendmail exit status " . $? >> 8 . "\n" unless ($? == 0); +die "$0: sendmail exit status " . ($? >> 8) . "\n" unless ($? == 0); # vi: set sw=2: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/ciabot.pl?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Tue Aug 23 19:13:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test4 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:13:13 2005 GMT Module: test Tag: HEAD ---- Log message: - test4 ---- Files affected: test: plik (1.17 -> 1.18) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.17 test/plik:1.18 --- test/plik:1.17 Tue Aug 23 18:58:20 2005 +++ test/plik Tue Aug 23 19:13:08 2005 @@ -1,6 +1,7 @@ test1 test2 test3 +test4 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.17&r2=1.18&f=u From pawcioos at pld-linux.org Tue Aug 23 19:14:03 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated md5 for Source2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 17:14:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 for Source2 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.14 SPECS/eclipse-plugin-cdt.spec:1.15 --- SPECS/eclipse-plugin-cdt.spec:1.14 Tue Aug 23 16:38:15 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 19:13:58 2005 @@ -47,7 +47,7 @@ %endif %if %{need_ia64} Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz -# Source2-md5: 80ba477131beb0c0682019a7705b1cfe +# Source2-md5: ee07f4d21c3785e7d3b2b40b4669def0 %endif %if %{need_x8664} Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/23 17:13:58 pawcioos +- updated md5 for Source2 + Revision 1.14 2005/08/23 14:38:15 pawcioos - updated to 3.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 19:16:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: CVSROOT: loginfo Fix for new ciabot.pl. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Fix for new ciabot.pl. ---- Files affected: CVSROOT: loginfo (1.195 -> 1.196) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.195 CVSROOT/loginfo:1.196 --- CVSROOT/loginfo:1.195 Tue Aug 23 18:50:32 2005 +++ CVSROOT/loginfo Tue Aug 23 19:16:05 2005 @@ -30,5 +30,5 @@ #^test /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -ALL /cvsroot/CVSROOT/ciabot.pl %s +ALL /cvsroot/CVSROOT/ciabot.pl %{,,,s} ALL /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.195&r2=1.196&f=u From arekm at pld-linux.org Tue Aug 23 19:16:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:03 2005 Subject: test: plik - test5 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:52 2005 GMT Module: test Tag: HEAD ---- Log message: - test5 ---- Files affected: test: plik (1.18 -> 1.19) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.18 test/plik:1.19 --- test/plik:1.18 Tue Aug 23 19:13:08 2005 +++ test/plik Tue Aug 23 19:16:47 2005 @@ -2,6 +2,7 @@ test2 test3 test4 +test5 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Tue Aug 23 19:21:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:03 2005 Subject: SOURCES: linux-libc-headers-endian.patch (NEW) - glibc header (nam... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:21:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - glibc header (namely ) defines both __LITTLE_ENDIAN and __BIG_ENDIAN so check __BYTE_ORDER value instead of *_ENDIAN macros presence ---- Files affected: SOURCES: linux-libc-headers-endian.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u /dev/null SOURCES/linux-libc-headers-endian.patch:1.1 --- /dev/null Tue Aug 23 19:21:36 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:21:31 2005 @@ -0,0 +1,641 @@ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + /* M32R relocation types */ + #define R_M32R_NONE 0 +@@ -82,9 +83,9 @@ + * These are used to set parameters in the core dumps. + */ + #define ELF_CLASS ELFCLASS32 +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define ELF_DATA ELFDATA2LSB +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define ELF_DATA ELFDATA2MSB + #else + #error no endian defined +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 +@@ -5,7 +5,7 @@ + + /* orig : i386 2.4.18 */ + +-#include ++#include + + struct __old_kernel_stat { + unsigned short st_dev; +@@ -67,10 +67,10 @@ + long long st_size; + unsigned long st_blksize; + +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + unsigned long __pad4; /* future possible st_blocks high bits */ + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ + unsigned long __pad4; /* future possible st_blocks high bits */ + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 +@@ -16,6 +16,7 @@ + #ifndef __ASSEMBLY__ + #include + #endif ++#include + + /* CS */ + #define JMR3927_ROMCE0 0x1fc00000 /* 4M */ +@@ -148,10 +149,10 @@ + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned short *)(a)) = (d) << 8) + #define jmr3927_ioc_reg_in(a) (((*(volatile unsigned short *)(a)) >> 8) & 0xff) + #else +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)(a)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)(a)) +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)((a)^1)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)((a)^1)) + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 +@@ -67,9 +67,9 @@ + volatile unsigned long csr; + }; + +-#include ++#include + +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + #define endian_def_s2(e1,e2) \ + volatile unsigned short e1,e2 + #define endian_def_sb2(e1,e2,e3) \ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 +@@ -53,9 +53,9 @@ + __s64 res2; /* secondary result */ + }; + +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define PADDED(x,y) x, y +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define PADDED(x,y) y, x + #else + #error edit for your odd byteorder. +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 +@@ -15,7 +15,7 @@ + #include + #include + +-#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) ++#if (__BYTE_ORDER != __LITTLE_ENDIAN) && (__BYTE_ORDER != __BIG_ENDIAN) + #error "Endian problem - this didn't happen" + #endif + +@@ -699,20 +699,20 @@ + } dvd_authinfo; + + struct request_sense { +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 valid : 1; + __u8 error_code : 7; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 error_code : 7; + __u8 valid : 1; + #endif + __u8 segment_number; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 ili : 1; + __u8 reserved2 : 1; + __u8 sense_key : 4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 sense_key : 4; + __u8 reserved2 : 1; + __u8 ili : 1; +@@ -771,22 +771,22 @@ + + struct mrw_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; + __u8 reserved1 : 2; + #endif + __u8 add_len; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 write : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 write : 1; + __u8 reserved2 : 7; + #endif +@@ -798,12 +798,12 @@ + /* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */ + struct rwrt_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; +@@ -813,10 +813,10 @@ + __u32 last_lba; + __u32 block_size; + __u16 blocking; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 page_present : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 page_present : 1; + __u8 reserved2 : 7; + #endif +@@ -825,12 +825,12 @@ + + typedef struct { + __u16 disc_information_length; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 3; + __u8 erasable : 1; + __u8 border_status : 2; + __u8 disc_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 disc_status : 2; + __u8 border_status : 2; + __u8 erasable : 1; +@@ -840,14 +840,14 @@ + __u8 n_sessions_lsb; + __u8 first_track_lsb; + __u8 last_track_lsb; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 did_v : 1; + __u8 dbc_v : 1; + __u8 uru : 1; + __u8 reserved2 : 2; + __u8 dbit : 1; + __u8 mrw_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 mrw_status : 2; + __u8 dbit : 1; + __u8 reserved2 : 2; +@@ -872,7 +872,7 @@ + __u8 track_lsb; + __u8 session_lsb; + __u8 reserved1; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 2; + __u8 damage : 1; + __u8 copy : 1; +@@ -885,7 +885,7 @@ + __u8 reserved3 : 6; + __u8 lra_v : 1; + __u8 nwa_v : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 track_mode : 4; + __u8 copy : 1; + __u8 damage : 1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 +@@ -24,13 +24,13 @@ + } u_echo; + + struct icmpv6_nd_advt { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u32 reserved:5, + override:1, + solicited:1, + router:1, + reserved2:24; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u32 router:1, + solicited:1, + override:1, +@@ -42,12 +42,12 @@ + + struct icmpv6_nd_ra { + __u8 hop_limit; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6, + other:1, + managed:1; + +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 managed:1, + other:1, + reserved:6; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 +@@ -221,14 +221,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned set_geometry : 1; + unsigned recalibrate : 1; + unsigned set_multmode : 1; + unsigned set_tune : 1; + unsigned serviced : 1; + unsigned reserved : 3; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved : 3; + unsigned serviced : 1; + unsigned set_tune : 1; +@@ -250,10 +250,10 @@ + typedef union { + unsigned all :16; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned low :8; /* LSB */ + unsigned high :8; /* MSB */ +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned high :8; /* MSB */ + unsigned low :8; /* LSB */ + #else +@@ -277,7 +277,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned mark :1; + unsigned tzero :1; + unsigned abrt :1; +@@ -286,7 +286,7 @@ + unsigned mce :1; + unsigned ecc :1; + unsigned bdd :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bdd :1; + unsigned ecc :1; + unsigned mce :1; +@@ -313,13 +313,13 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned head : 4; + unsigned unit : 1; + unsigned bit5 : 1; + unsigned lba : 1; + unsigned bit7 : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bit7 : 1; + unsigned lba : 1; + unsigned bit5 : 1; +@@ -351,7 +351,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned check :1; + unsigned idx :1; + unsigned corr :1; +@@ -360,7 +360,7 @@ + unsigned df :1; + unsigned drdy :1; + unsigned bsy :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bsy :1; + unsigned drdy :1; + unsigned df :1; +@@ -388,14 +388,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned bit0 : 1; + unsigned nIEN : 1; + unsigned SRST : 1; + unsigned bit3 : 1; + unsigned reserved456 : 3; + unsigned HOB : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned HOB : 1; + unsigned reserved456 : 3; + unsigned bit3 : 1; +@@ -419,12 +419,12 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned dma :1; + unsigned reserved321 :3; + unsigned reserved654 :3; + unsigned reserved7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved7 :1; + unsigned reserved654 :3; + unsigned reserved321 :3; +@@ -445,11 +445,11 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned cod :1; + unsigned io :1; + unsigned reserved :6; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved :6; + unsigned io :1; + unsigned cod :1; +@@ -471,13 +471,13 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned ili :1; + unsigned eom :1; + unsigned abrt :1; + unsigned mcr :1; + unsigned sense_key :4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned sense_key :4; + unsigned mcr :1; + unsigned abrt :1; +@@ -506,14 +506,14 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned sam_lun :3; + unsigned reserved3 :1; + unsigned drv :1; + unsigned one5 :1; + unsigned reserved6 :1; + unsigned one7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned one7 :1; + unsigned reserved6 :1; + unsigned one5 :1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 +@@ -82,7 +82,7 @@ + { + #if 0 + __u8 ulp; /* must contain 4 */ +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 d1_data_present:1; /* must be 1 */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 reserved:6; /* must be zero */ +@@ -91,7 +91,7 @@ + __u16 d1_area_size:8; /* must be 3 */ + __u16 d2_offset:3; /* must be zero */ + #endif +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6; /* must be zero */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 d1_data_present:1; /* must be 1 */ +@@ -111,20 +111,20 @@ + + struct hippi_le_hdr + { +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 fc:3; + __u8 double_wide:1; + __u8 message_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 message_type:4; + __u8 double_wide:1; + __u8 fc:3; + #endif + __u8 dest_switch_addr[3]; +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 dest_addr_type:4, + src_addr_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 src_addr_type:4, + dest_addr_type:4; + #endif +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 +@@ -91,10 +91,10 @@ + #define PTT_GEN_ERR __constant_htons(0x0203) + + struct pppoe_hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ver : 4; + __u8 type : 4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 type : 4; + __u8 ver : 4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 +@@ -67,11 +67,11 @@ + __u8 code; + __u16 csum; + __u32 group; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 qrv:3, + suppress:1, + resv:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 resv:4, + suppress:1, + qrv:3; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 +@@ -83,10 +83,10 @@ + #ifndef __NETINET_IP_H + + struct iphdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ihl:4, + version:4; +-#elif defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + ihl:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 +@@ -102,10 +102,10 @@ + */ + + struct ipv6hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 priority:4, + version:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + priority:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + /* The map stuff is very simple. You fill in your struct map_info with + a handful of routines for accessing the device, making sure they handle +@@ -160,7 +161,7 @@ + } else { + for (i=start; i < start+len; i++) { + int bitpos; +-#ifdef __LITTLE_ENDIAN ++#if __BYTE_ORDER == __LITTLE_ENDIAN + bitpos = i*8; + #else /* __BIG_ENDIAN */ + bitpos = (map_bankwidth(map)-1-i)*8; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 +@@ -16,6 +16,7 @@ + #define _MD_P_H + + #include ++#include + + /* + * RAID superblock. +@@ -130,7 +131,7 @@ + __u32 failed_disks; /* 4 Number of failed disks */ + __u32 spare_disks; /* 5 Number of spare disks */ + __u32 sb_csum; /* 6 checksum of the whole superblock */ +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + __u32 events_hi; /* 7 high-order of superblock update count */ <> From glen at pld-linux.org Tue Aug 23 19:22:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:03 2005 Subject: SPECS: macromedia-flash.spec - single package with triggers on bro... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:22:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - single package with triggers on browser packages ---- Files affected: SPECS: macromedia-flash.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.26 SPECS/macromedia-flash.spec:1.27 --- SPECS/macromedia-flash.spec:1.26 Tue Aug 23 18:47:51 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:22:40 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.2 +Release: 2.13%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -20,57 +20,33 @@ # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %endif URL: http://www.macromedia.com/software/flash/ +BuildRequires: rpmbuild(macros) >= 1.224 +Requires: browser-plugins +%if %{without license_agreement} +Requires: /usr/bin/builder +%endif +Obsoletes: flash-plugin +Obsoletes: mozilla-plugin-macromedia-flash +Obsoletes: mozilla-firefox-plugin-macromedia-flash +Obsoletes: konqueror-plugin-macromedia-flash ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _plugindir %{_libdir}/browser-plugins + +# TODO: opera, galeon and skipstone. +# use macro, otherwise extra LF inserted along with the ifarch +%define browsers mozilla, mozilla-firefox, konqueror + %description Flash plugin for Netscape-compatible WWW browsers. +Supported browsers: %{browsers}. + %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -%package -n mozilla-plugin-macromedia-flash -Summary: Flash plugin for Mozilla based browsers -Summary(pl): Wtyczka Flash dla przegl?darek opartych na Mozilli -Group: X11/Applications/Multimedia -PreReq: mozilla-embedded >= 1.0 -Obsoletes: flash-plugin - -%description -n mozilla-plugin-macromedia-flash -This package contains flash plugin for Mozilla based browsers, i.e. -mozilla itself, galeon or skipstone. - -%description -n mozilla-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darek opartych -na Mozilli, np.: mozilli jako takiej, galeona czy te? skipstone'a. - -%package -n mozilla-firefox-plugin-macromedia-flash -Summary: Flash plugin for Mozilla Firefox browser -Summary(pl): Wtyczka Flash dla Mozilla Firefox -Group: X11/Applications/Multimedia -PreReq: mozilla-firefox -Obsoletes: flash-plugin - -%description -n mozilla-firefox-plugin-macromedia-flash -This package contains flash plugin for Mozilla Firefox browser. - -%description -n mozilla-firefox-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darki -Mozilla Firefox. - -%package -n konqueror-plugin-macromedia-flash -Summary: Flash plugin for Konqueror browser -Summary(pl): Wtyczka obs?uguj?ca Flash dla przegl?darki Konqueror -Group: X11/Applications/Multimedia -PreReq: konqueror >= 3.0.8-2.3 -Obsoletes: flash-plugin - -%description -n konqueror-plugin-macromedia-flash -This package contains flash plugin for Konqueror browser. - -%description -n konqueror-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? obs?uguj?c? technologi? Flash dla przegl?darki -Konqueror. +Supported browsers: %{browsers}. %prep %if %{with license_agreement} @@ -115,28 +91,8 @@ if [ "$?" -ne 0 ]; then exit 2 fi - RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-firefox-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES= - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=$RPMDIR/$RPMNAME1 - echo "Installing $RPMNAME1" - else - echo "Not installing $RPMNAME1" - fi - if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" - echo "Installing $RPMNAME2" - else - echo "Not installing $RPMNAME2" - fi - if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" - echo "Installing $RPMNAME3" - else - echo "Not installing $RPMNAME3" - fi + RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/%{base_name}.spec.prev ]; then @@ -158,11 +114,8 @@ %else -install -d $RPM_BUILD_ROOT%{_libdir}/{mozilla/plugins,/mozilla-firefox/plugins,/kde3/plugins/konqueror} - -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins -install *.so $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror +install -d $RPM_BUILD_ROOT%{_plugindir} +install *.{so,xpt} $RPM_BUILD_ROOT%{_plugindir} %endif @@ -178,42 +131,48 @@ %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " -%endif +%else -%post -n mozilla-plugin-macromedia-flash +%triggerin -- mozilla-firefox +%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerun -- mozilla-firefox +%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerin -- mozilla +%nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%postun -n mozilla-plugin-macromedia-flash +%triggerun -- mozilla +%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if %{without license_agreement} +%triggerin -- konqueror +%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%triggerun -- konqueror +%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%endif + %files %defattr(644,root,root,755) + +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else -%files -n mozilla-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla/plugins/*.so -%{_libdir}/mozilla/plugins/*.xpt - -%files -n mozilla-firefox-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/*.so -%{_libdir}/mozilla-firefox/plugins/*.xpt - -%files -n konqueror-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/kde3/plugins/konqueror/*.so +%attr(755,root,root) %{_plugindir}/*.so +%{_plugindir}/*.xpt %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -222,6 +181,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/23 17:22:40 glen +- single package with triggers on browser packages + Revision 1.26 2005/08/23 16:47:51 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Tue Aug 23 19:23:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: linux-libc-headers.spec - added endian patch, release 2 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:23:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added endian patch, release 2 ---- Files affected: SPECS: linux-libc-headers.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.98 SPECS/linux-libc-headers.spec:1.99 --- SPECS/linux-libc-headers.spec:1.98 Thu Aug 4 21:33:48 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:23:22 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 1 +Release: 2 Epoch: 7 License: GPL Group: Development @@ -15,6 +15,7 @@ Patch3: %{name}-fbsplash.patch Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch +Patch6: %{name}-endian.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -58,6 +59,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %ifarch %{x8664} @@ -172,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/23 17:23:22 qboosh +- added endian patch, release 2 + Revision 1.98 2005/08/04 19:33:48 pluto - imq headers added. - release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.98&r2=1.99&f=u From arekm at pld-linux.org Tue Aug 23 19:26:22 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:04 2005 Subject: CVSROOT: loginfo Add pld commit ml. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:26:22 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Add pld commit ml. ---- Files affected: CVSROOT: loginfo (1.196 -> 1.197) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.196 CVSROOT/loginfo:1.197 --- CVSROOT/loginfo:1.196 Tue Aug 23 19:16:05 2005 +++ CVSROOT/loginfo Tue Aug 23 19:26:17 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.196&r2=1.197&f=u From arekm at pld-linux.org Tue Aug 23 19:27:20 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:04 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:27:20 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.19 -> 1.20) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.19 test/plik:1.20 --- test/plik:1.19 Tue Aug 23 19:16:47 2005 +++ test/plik Tue Aug 23 19:27:15 2005 @@ -3,6 +3,7 @@ test3 test4 test5 +test6 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Tue Aug 23 19:30:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: test: pask2 - test In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:30:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: pask2 (1.2 -> 1.3) ---- Diffs: ================================================================ Index: test/pask2 diff -u test/pask2:1.2 test/pask2:1.3 --- test/pask2:1.2 Thu Jun 23 19:13:17 2005 +++ test/pask2 Tue Aug 23 19:30:24 2005 @@ -1 +1 @@ -Thu Jun 23 20:13:06 EEST 2005 +Tue Aug 23 20:30:20 EEST 2005 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/pask2?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Tue Aug 23 19:30:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: iproute2.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:30:35 Modified files: iproute2.spec Log message: - release 5: rebuild with fixed on big-endians Index: iproute2.spec =================================================================== RCS file: /cvsroot/SPECS/iproute2.spec,v diff -d -u -r1.145 -r1.146 --- iproute2.spec 5 Jul 2005 16:38:17 -0000 1.145 +++ iproute2.spec 23 Aug 2005 17:30:30 -0000 1.146 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 From qboosh at pld-linux.org Tue Aug 23 19:30:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: iproute2.spec - release 5: rebuild with fixed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:30:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 5: rebuild with fixed on big-endians ---- Files affected: SPECS: iproute2.spec (1.145 -> 1.146) ---- Diffs: ================================================================ Index: SPECS/iproute2.spec diff -u SPECS/iproute2.spec:1.145 SPECS/iproute2.spec:1.146 --- SPECS/iproute2.spec:1.145 Tue Jul 5 18:38:17 2005 +++ SPECS/iproute2.spec Tue Aug 23 19:30:30 2005 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iproute2.spec?r1=1.145&r2=1.146&f=u From baggins at pld-linux.org Tue Aug 23 19:38:05 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: rc-scripts-con_serial_sparc.patch, rc-scripts-dev_alias.p... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.4.0.20 ---- Files affected: SOURCES: rc-scripts-con_serial_sparc.patch (1.2 -> 1.3) , rc-scripts-dev_alias.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-con_serial_sparc.patch diff -u SOURCES/rc-scripts-con_serial_sparc.patch:1.2 SOURCES/rc-scripts-con_serial_sparc.patch:1.3 --- SOURCES/rc-scripts-con_serial_sparc.patch:1.2 Wed Jun 15 21:59:32 2005 +++ SOURCES/rc-scripts-con_serial_sparc.patch Tue Aug 23 19:38:00 2005 @@ -1,10 +1,10 @@ --- rc-scripts-0.4.0.19/inittab.orig 2005-06-15 19:55:54.862429768 +0200 +++ rc-scripts-0.4.0.19/inittab 2005-06-15 19:56:09.442213304 +0200 -@@ -45,6 +45,8 @@ - # If power was restored before the shutdown kicked in, cancel it. +@@ -45,7 +45,7 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" -+# Run agetty on serial port + # Run agetty on serial port +-# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels ================================================================ Index: SOURCES/rc-scripts-dev_alias.patch diff -u SOURCES/rc-scripts-dev_alias.patch:1.3 SOURCES/rc-scripts-dev_alias.patch:1.4 --- SOURCES/rc-scripts-dev_alias.patch:1.3 Tue Mar 29 20:18:46 2005 +++ SOURCES/rc-scripts-dev_alias.patch Tue Aug 23 19:38:00 2005 @@ -4,8 +4,8 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ -- egrep 'ifcfg-[a-z0-9\.]+$' | \ -+ egrep 'ifcfg-[a-z0-9\.:]+$' | \ +- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ ++ LC_ALL=C egrep 'ifcfg-[a-z0-9\.:]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rc-scripts-con_serial_sparc.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/rc-scripts-dev_alias.patch?r1=1.3&r2=1.4&f=u From baggins at pld-linux.org Tue Aug 23 19:38:26 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: rc-scripts-az-locale.patch (REMOVED), rc-scripts-plusgsm_... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: outdated ---- Files affected: SOURCES: rc-scripts-az-locale.patch (1.1 -> NONE) (REMOVED), rc-scripts-plusgsm_example.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 19:40:07 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: DISTFILES: rc-scripts-0.4.0.20.tar.gz Message-ID: <19301.1124818807@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/people/arekm/software/rc-scripts-0.4.0.20.tar.gz d67b427da40f42b6b2fc5f562dc9286d rc-scripts-0.4.0.20.tar.gz Size: 309815 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 19:40:00 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:39:58 Modified files: rc-scripts.spec Log message: - updated to 0.4.0.20 - release 0.1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.195 -r1.196 --- rc-scripts.spec 7 Jul 2005 16:42:20 -0000 1.195 +++ rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default From baggins at pld-linux.org Tue Aug 23 19:40:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rc-scripts.spec - updated to 0.4.0.20 - release 0.1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.0.20 - release 0.1 ---- Files affected: SPECS: rc-scripts.spec (1.195 -> 1.196) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.195 SPECS/rc-scripts.spec:1.196 --- SPECS/rc-scripts.spec:1.195 Thu Jul 7 18:42:20 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:39:58 2005 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.195&r2=1.196&f=u From qboosh at pld-linux.org Tue Aug 23 19:47:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: linux-libc-headers-endian.patch - bugfixes in ip.h and tcp.h In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:47:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - bugfixes in ip.h and tcp.h ---- Files affected: SOURCES: linux-libc-headers-endian.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u SOURCES/linux-libc-headers-endian.patch:1.1 SOURCES/linux-libc-headers-endian.patch:1.2 --- SOURCES/linux-libc-headers-endian.patch:1.1 Tue Aug 23 19:21:31 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:47:28 2005 @@ -1,6 +1,6 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 22:19:47.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -23,7 +23,7 @@ #error no endian defined diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 22:19:47.000000000 +0200 @@ -5,7 +5,7 @@ /* orig : i386 2.4.18 */ @@ -48,7 +48,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #ifndef __ASSEMBLY__ #include @@ -72,7 +72,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,9 +67,9 @@ volatile unsigned long csr; }; @@ -87,7 +87,7 @@ #define endian_def_sb2(e1,e2,e3) \ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 -+++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 22:19:47.000000000 +0200 @@ -53,9 +53,9 @@ __s64 res2; /* secondary result */ }; @@ -102,7 +102,7 @@ #error edit for your odd byteorder. diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h --- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 22:19:47.000000000 +0200 @@ -15,7 +15,7 @@ #include #include @@ -244,7 +244,7 @@ __u8 damage : 1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -24,13 +24,13 @@ } u_echo; @@ -278,7 +278,7 @@ reserved:6; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 22:19:47.000000000 +0200 @@ -221,14 +221,14 @@ typedef union { unsigned all : 8; @@ -442,7 +442,7 @@ unsigned one5 :1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 22:19:47.000000000 +0200 @@ -82,7 +82,7 @@ { #if 0 @@ -488,7 +488,7 @@ #endif diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 22:19:47.000000000 +0200 @@ -91,10 +91,10 @@ #define PTT_GEN_ERR __constant_htons(0x0203) @@ -504,7 +504,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,11 +67,11 @@ __u8 code; __u16 csum; @@ -521,7 +521,7 @@ qrv:3; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 22:21:06.000000000 +0200 @@ -83,10 +83,10 @@ #ifndef __NETINET_IP_H @@ -531,13 +531,13 @@ __u8 ihl:4, version:4; -#elif defined (__BIG_ENDIAN) -+#if __BYTE_ORDER == __BIG_ENDIAN ++#elif __BYTE_ORDER == __BIG_ENDIAN __u8 version:4, ihl:4; #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -102,10 +102,10 @@ */ @@ -553,7 +553,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h --- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 22:19:47.000000000 +0200 @@ -7,6 +7,7 @@ #include #include @@ -573,7 +573,7 @@ bitpos = (map_bankwidth(map)-1-i)*8; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h --- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #define _MD_P_H @@ -593,16 +593,16 @@ __u32 cp_events_hi; /* 9 high-order of checkpoint update count */ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-headers-2.6.12.0/include/linux/tcp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h 2005-01-08 15:03:40.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 21:48:11.000000000 +0200 -@@ -18,14 +18,14 @@ ++++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 22:22:11.000000000 +0200 +@@ -18,6 +18,7 @@ #define _LINUX_TCP_H #include --#include +#include + #include struct tcphdr { - __u16 source; +@@ -25,7 +26,7 @@ __u16 dest; __u32 seq; __u32 ack_seq; @@ -611,7 +611,7 @@ __u16 res1:4, doff:4, fin:1, -@@ -36,7 +36,7 @@ +@@ -36,7 +37,7 @@ urg:1, ece:1, cwr:1; @@ -622,7 +622,7 @@ cwr:1, diff -Nur linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h --- linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h 2005-03-25 20:30:35.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 21:49:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 22:19:47.000000000 +0200 @@ -27,12 +27,12 @@ #ifndef __CS46XX_DSP_SCB_TYPES_H__ #define __CS46XX_DSP_SCB_TYPES_H__ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-libc-headers-endian.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 19:48:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: linux-libc-headers.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:48:17 Modified files: linux-libc-headers.spec Log message: - bugfix in endian patch, release 3 Index: linux-libc-headers.spec =================================================================== RCS file: /cvsroot/SPECS/linux-libc-headers.spec,v diff -d -u -r1.99 -r1.100 --- linux-libc-headers.spec 23 Aug 2005 17:23:22 -0000 1.99 +++ linux-libc-headers.spec 23 Aug 2005 17:48:17 -0000 1.100 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 From qboosh at pld-linux.org Tue Aug 23 19:48:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: linux-libc-headers.spec - bugfix in endian patch, release 3 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:48:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - bugfix in endian patch, release 3 ---- Files affected: SPECS: linux-libc-headers.spec (1.99 -> 1.100) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.99 SPECS/linux-libc-headers.spec:1.100 --- SPECS/linux-libc-headers.spec:1.99 Tue Aug 23 19:23:22 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:48:17 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.99&r2=1.100&f=u From baggins at pld-linux.org Tue Aug 23 19:55:19 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:55:17 Modified files: rc-scripts.spec Log message: - release 1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.196 -r1.197 --- rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 +++ rc-scripts.spec 23 Aug 2005 17:55:17 -0000 1.197 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 From baggins at pld-linux.org Tue Aug 23 19:55:22 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rc-scripts.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:55:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: rc-scripts.spec (1.196 -> 1.197) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.196 SPECS/rc-scripts.spec:1.197 --- SPECS/rc-scripts.spec:1.196 Tue Aug 23 19:39:58 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:55:17 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.196&r2=1.197&f=u From glen at pld-linux.org Tue Aug 23 19:56:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: license-installer.sh (NEW) - shared installer, extracted ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - shared installer, extracted from macromedia-flash.spec ---- Files affected: SOURCES: license-installer.sh (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u /dev/null SOURCES/license-installer.sh:1.1 --- /dev/null Tue Aug 23 19:56:21 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:56:16 2005 @@ -0,0 +1,48 @@ +#!/bin/sh +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%{_rpmdir}"`; export RPMDIR + BACKUP=0 + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/@BASE_NAME@.spec ]; then + BACKUP=1 + mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev + fi + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" + else + cp -f "$3" . + fi + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) + ) + cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + else + cp -i "$3" $SPECDIR || exit 1 + fi + ( cd $SPECDIR + /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + if [ "$?" -ne 0 ]; then + exit 2 + fi + RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then + mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + fi +else + echo " +License issues made us not to include inherent files into +this package by default. If you want to create full working +package please build it with the following command: + +$0 --with license_agreement @SPECFILE@ +" +fi ================================================================ From glen at pld-linux.org Tue Aug 23 19:56:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 19:56:48 Modified files: macromedia-flash.spec Log message: - use shared installer script from SOURCES Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.27 -r1.28 --- macromedia-flash.spec 23 Aug 2005 17:22:40 -0000 1.27 +++ macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages From glen at pld-linux.org Tue Aug 23 19:56:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec - use shared installer script from SO... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES ---- Files affected: SPECS: macromedia-flash.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.27 SPECS/macromedia-flash.spec:1.28 --- SPECS/macromedia-flash.spec:1.27 Tue Aug 23 19:22:40 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:56:48 2005 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.27&r2=1.28&f=u From glen at pld-linux.org Tue Aug 23 19:59:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: license-installer.sh - show install progress In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:59:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - show install progress ---- Files affected: SOURCES: license-installer.sh (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.1 SOURCES/license-installer.sh:1.2 --- SOURCES/license-installer.sh:1.1 Tue Aug 23 19:56:16 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:58:56 2005 @@ -31,7 +31,7 @@ exit 2 fi RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + rpm -Uhv $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Tue Aug 23 20:02:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:02:03 Modified files: macromedia-flash.spec Log message: - add opera support Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.28 -r1.29 --- macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 +++ macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES From glen at pld-linux.org Tue Aug 23 20:02:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec - add opera support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:02:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add opera support ---- Files affected: SPECS: macromedia-flash.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.28 SPECS/macromedia-flash.spec:1.29 --- SPECS/macromedia-flash.spec:1.28 Tue Aug 23 19:56:48 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:02:03 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.28&r2=1.29&f=u From glen at pld-linux.org Tue Aug 23 20:05:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec - arch dependant due %{_libdir} usage In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:05:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - arch dependant due %{_libdir} usage ---- Files affected: SPECS: browser-plugins.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.3 SPECS/browser-plugins.spec:1.4 --- SPECS/browser-plugins.spec:1.3 Thu Jun 23 15:05:39 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:05:28 2005 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 20:05:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:05:29 Modified files: browser-plugins.spec Log message: - arch dependant due %{_libdir} usage Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.3 -r1.4 --- browser-plugins.spec 23 Jun 2005 13:05:39 -0000 1.3 +++ browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 From glen at pld-linux.org Tue Aug 23 20:07:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec - provide virtual to identify built ar... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:07:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - provide virtual to identify built archdecture ---- Files affected: SPECS: browser-plugins.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.4 SPECS/browser-plugins.spec:1.5 --- SPECS/browser-plugins.spec:1.4 Tue Aug 23 20:05:28 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:07:14 2005 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 20:07:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:07:15 Modified files: browser-plugins.spec Log message: - provide virtual to identify built archdecture Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.4 -r1.5 --- browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 +++ browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage From glen at pld-linux.org Tue Aug 23 20:10:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) template-browser-plugin.spec (HEAD) gplflash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:10:13 Modified files: macromedia-flash.spec template-browser-plugin.spec gplflash.spec Log message: - require correct arch of browser-plugins Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.29 -r1.30 --- macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 +++ macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.4 -r1.5 --- template-browser-plugin.spec 23 Jun 2005 12:54:15 -0000 1.4 +++ template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) Index: gplflash.spec =================================================================== RCS file: /cvsroot/SPECS/gplflash.spec,v diff -d -u -r1.9 -r1.10 --- gplflash.spec 23 Aug 2005 17:02:05 -0000 1.9 +++ gplflash.spec 23 Aug 2005 18:10:13 -0000 1.10 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed From glen at pld-linux.org Tue Aug 23 20:10:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec, template-browser-plugin.spec, gplfla... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:10:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require correct arch of browser-plugins ---- Files affected: SPECS: macromedia-flash.spec (1.29 -> 1.30) , template-browser-plugin.spec (1.4 -> 1.5) , gplflash.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.29 SPECS/macromedia-flash.spec:1.30 --- SPECS/macromedia-flash.spec:1.29 Tue Aug 23 20:02:03 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:10:13 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.4 SPECS/template-browser-plugin.spec:1.5 --- SPECS/template-browser-plugin.spec:1.4 Thu Jun 23 14:54:15 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:10:13 2005 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.9 SPECS/gplflash.spec:1.10 --- SPECS/gplflash.spec:1.9 Tue Aug 23 19:02:05 2005 +++ SPECS/gplflash.spec Tue Aug 23 20:10:13 2005 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.29&r2=1.30&f=u http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 20:14:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:14:06 Modified files: browser-plugins.spec Log message: - include VR in virtual prov, rel 2 Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.5 -r1.6 --- browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 +++ browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture From glen at pld-linux.org Tue Aug 23 20:14:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec - include VR in virtual prov, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:14:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - include VR in virtual prov, rel 2 ---- Files affected: SPECS: browser-plugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.5 SPECS/browser-plugins.spec:1.6 --- SPECS/browser-plugins.spec:1.5 Tue Aug 23 20:07:14 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:14:05 2005 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Tue Aug 23 20:19:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rpm-macros.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:19:50 Modified files: rpm-macros.spec Log message: - rpm macros 1.233 Index: rpm-macros.spec =================================================================== RCS file: /cvsroot/SPECS/rpm-macros.spec,v diff -d -u -r1.18 -r1.19 --- rpm-macros.spec 15 Jul 2005 11:15:25 -0000 1.18 +++ rpm-macros.spec 23 Aug 2005 18:19:49 -0000 1.19 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 From glen at pld-linux.org Tue Aug 23 20:19:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: rpm-macros.spec - rpm macros 1.233 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:19:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rpm macros 1.233 ---- Files affected: SPECS: rpm-macros.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.18 SPECS/rpm-macros.spec:1.19 --- SPECS/rpm-macros.spec:1.18 Fri Jul 15 13:15:25 2005 +++ SPECS/rpm-macros.spec Tue Aug 23 20:19:49 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 20:32:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - allow additional dir... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:32:10 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - allow additional dirs to wipe .py files in %py_postclean ---- Files affected: SOURCES: rpm.macros (1.158.4.54 -> 1.158.4.55) SOURCES: rpm.macros (1.233 -> 1.234) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.54 SOURCES/rpm.macros:1.158.4.55 --- SOURCES/rpm.macros:1.158.4.54 Mon Jul 25 11:05:50 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -505,7 +505,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.233 SOURCES/rpm.macros:1.234 --- SOURCES/rpm.macros:1.233 Thu Aug 11 18:54:56 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -508,7 +508,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.54&r2=1.158.4.55&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.233&r2=1.234&f=u From glen at pld-linux.org Tue Aug 23 20:33:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: PLD-doc: BuildRequires.txt - enhanced %py_postclean macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:33:15 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - enhanced %py_postclean macro ---- Files affected: PLD-doc: BuildRequires.txt (1.39 -> 1.40) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.39 PLD-doc/BuildRequires.txt:1.40 --- PLD-doc/BuildRequires.txt:1.39 Tue Aug 16 01:32:09 2005 +++ PLD-doc/BuildRequires.txt Tue Aug 23 20:33:10 2005 @@ -119,6 +119,8 @@ # %py_postclean BuildRequires: rpmbuild(macros) >= 1.219 +# %py_postclean with additional dirs to wipe .py files from +BuildRequires: rpmbuild(macros) >= 1.234 # %gconf_schema_uninstall BuildRequires: rpmbuild(macros) >= 1.198 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.39&r2=1.40&f=u From twittner at pld-linux.org Tue Aug 23 20:39:14 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: darkice.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 20:39:12 Modified files: darkice.spec Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. Index: darkice.spec =================================================================== RCS file: /cvsroot/SPECS/darkice.spec,v diff -d -u -r1.20 -r1.21 --- darkice.spec 22 Aug 2005 14:50:06 -0000 1.20 +++ darkice.spec 23 Aug 2005 18:39:11 -0000 1.21 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ From twittner at pld-linux.org Tue Aug 23 20:39:17 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: darkice.spec - reverted last blekot's change - I've checked... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 18:39:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. ---- Files affected: SPECS: darkice.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.20 SPECS/darkice.spec:1.21 --- SPECS/darkice.spec:1.20 Mon Aug 22 16:50:06 2005 +++ SPECS/darkice.spec Tue Aug 23 20:39:11 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Tue Aug 23 20:44:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - %nsplugin_install fi... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:44:05 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - %nsplugin_install fix: check for target dir existence, if installing on alien base arch (i686 package on amd64) as the dependencies are basename based ---- Files affected: SOURCES: rpm.macros (1.158.4.55 -> 1.158.4.56) SOURCES: rpm.macros (1.234 -> 1.235) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.55 SOURCES/rpm.macros:1.158.4.56 --- SOURCES/rpm.macros:1.158.4.55 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -719,7 +719,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.234 SOURCES/rpm.macros:1.235 --- SOURCES/rpm.macros:1.234 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -722,7 +722,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.55&r2=1.158.4.56&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.234&r2=1.235&f=u From glen at pld-linux.org Tue Aug 23 20:45:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:45:30 Modified files: macromedia-flash.spec Log message: - make i686 package install on amd64 Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.30 -r1.31 --- macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 +++ macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:45:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec - make i686 package install on amd64 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:45:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - make i686 package install on amd64 ---- Files affected: SPECS: macromedia-flash.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.30 SPECS/macromedia-flash.spec:1.31 --- SPECS/macromedia-flash.spec:1.30 Tue Aug 23 20:10:13 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:45:30 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Tue Aug 23 20:46:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: template-browser-plugin.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:46:11 Modified files: template-browser-plugin.spec Log message: - up macros requirement for installing cross-arch packages Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.5 -r1.6 --- template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 +++ template-browser-plugin.spec 23 Aug 2005 18:46:11 -0000 1.6 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:46:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: template-browser-plugin.spec - up macros requirement for in... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up macros requirement for installing cross-arch packages ---- Files affected: SPECS: template-browser-plugin.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.5 SPECS/template-browser-plugin.spec:1.6 --- SPECS/template-browser-plugin.spec:1.5 Tue Aug 23 20:10:13 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:46:11 2005 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.5&r2=1.6&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 20:53:34 Modified files: man.spec Log message: - updated to 1.6a - added URL - adaptarized - sorted BR Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.102 -r1.103 --- man.spec 9 Aug 2005 18:37:01 -0000 1.102 +++ man.spec 23 Aug 2005 18:53:33 -0000 1.103 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it From paszczus at pld-linux.org Tue Aug 23 20:53:39 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: man.spec - updated to 1.6a - added URL - adaptarized - sort... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 18:53:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.6a - added URL - adaptarized - sorted BR ---- Files affected: SPECS: man.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.102 SPECS/man.spec:1.103 --- SPECS/man.spec:1.102 Tue Aug 9 20:37:01 2005 +++ SPECS/man.spec Tue Aug 23 20:53:33 2005 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.102&r2=1.103&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:04 2005 Subject: DISTFILES: man-1.6a.tar.gz man-additional-man-pages.tar.bz2 Message-ID: <9685.1124823224@distfiles.pld-linux.org> Files fetched: 1 STORED: http://primates.ximian.com/~flucifredi/man/man-1.6a.tar.gz d53114b9ec030be32b858b1618da3c25 man-1.6a.tar.gz Size: 234660 bytes ALREADY GOT: no-url://man-additional-man-pages.tar.bz2 16c3fde2243289524cf40c1d2e7150e4 man-additional-man-pages.tar.bz2 -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 20:54:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:54:26 Modified files: browser-plugins.spec Log message: - listing browsers (please complete the list if you find somebody missing) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.6 -r1.7 --- browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 +++ browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:54:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec - listing browsers (please complete th... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:54:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - listing browsers (please complete the list if you find somebody missing) ---- Files affected: SPECS: browser-plugins.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.6 SPECS/browser-plugins.spec:1.7 --- SPECS/browser-plugins.spec:1.6 Tue Aug 23 20:14:05 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:54:24 2005 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Tue Aug 23 20:55:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:55:18 Modified files: browser-plugins.spec Log message: - i belive browser is a thing (fix last commit msg) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.7 -r1.8 --- browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 +++ browser-plugins.spec 23 Aug 2005 18:55:18 -0000 1.8 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:55:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: browser-plugins.spec - i belive browser is a thing (fix las... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:55:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - i belive browser is a thing (fix last commit msg) ---- Files affected: SPECS: browser-plugins.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.7 SPECS/browser-plugins.spec:1.8 --- SPECS/browser-plugins.spec:1.7 Tue Aug 23 20:54:24 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:55:18 2005 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Tue Aug 23 20:57:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:57:27 Modified files: w32codec.spec Log message: - use without macro Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.70 -r1.71 --- w32codec.spec 15 Apr 2005 07:15:57 -0000 1.70 +++ w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs From glen at pld-linux.org Tue Aug 23 20:57:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: w32codec.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:57:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: w32codec.spec (1.70 -> 1.71) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.70 SPECS/w32codec.spec:1.71 --- SPECS/w32codec.spec:1.70 Fri Apr 15 09:15:57 2005 +++ SPECS/w32codec.spec Tue Aug 23 20:57:26 2005 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.70&r2=1.71&f=u From glen at pld-linux.org Tue Aug 23 21:17:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:28 Modified files: macromedia-flash.spec Log message: - sync requires from w32codec.spec Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.31 -r1.32 --- macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 +++ macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 From glen at pld-linux.org Tue Aug 23 21:17:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec - sync requires from w32codec.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sync requires from w32codec.spec ---- Files affected: SPECS: macromedia-flash.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.31 SPECS/macromedia-flash.spec:1.32 --- SPECS/macromedia-flash.spec:1.31 Tue Aug 23 20:45:30 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:25 2005 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 21:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:50 Modified files: macromedia-flash.spec Log message: - unzip unneccessary Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.32 -r1.33 --- macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 +++ macromedia-flash.spec 23 Aug 2005 19:17:50 -0000 1.33 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec From glen at pld-linux.org Tue Aug 23 21:17:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: macromedia-flash.spec - unzip unneccessary In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unzip unneccessary ---- Files affected: SPECS: macromedia-flash.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.32 SPECS/macromedia-flash.spec:1.33 --- SPECS/macromedia-flash.spec:1.32 Tue Aug 23 21:17:25 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:50 2005 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.32&r2=1.33&f=u From paszczus at pld-linux.org Tue Aug 23 21:18:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 21:18:09 Modified files: man.spec Log message: - backing to %{__make} Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.103 -r1.104 --- man.spec 23 Aug 2005 18:53:33 -0000 1.103 +++ man.spec 23 Aug 2005 19:18:09 -0000 1.104 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL From paszczus at pld-linux.org Tue Aug 23 21:18:14 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: man.spec - backing to %{__make} In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 19:18:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - backing to %{__make} ---- Files affected: SPECS: man.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.103 SPECS/man.spec:1.104 --- SPECS/man.spec:1.103 Tue Aug 23 20:53:33 2005 +++ SPECS/man.spec Tue Aug 23 21:18:09 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.103&r2=1.104&f=u From twittner at pld-linux.org Tue Aug 23 21:18:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: luma.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 21:18:44 Modified files: luma.spec Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. Index: luma.spec =================================================================== RCS file: /cvsroot/SPECS/luma.spec,v diff -d -u -r1.8 -r1.9 --- luma.spec 22 Aug 2005 21:33:56 -0000 1.8 +++ luma.spec 23 Aug 2005 19:18:44 -0000 1.9 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog From twittner at pld-linux.org Tue Aug 23 21:18:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:04 2005 Subject: SPECS: luma.spec - truly noarch - %%_libdir replaced with %%{_pref... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 19:18:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. ---- Files affected: SPECS: luma.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.8 SPECS/luma.spec:1.9 --- SPECS/luma.spec:1.8 Mon Aug 22 23:33:56 2005 +++ SPECS/luma.spec Tue Aug 23 21:18:44 2005 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Tue Aug 23 21:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:04 2005 Subject: SOURCES: license-installer.sh - mirrors file not present, disable ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:20:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - mirrors file not present, disable mirrors file ---- Files affected: SOURCES: license-installer.sh (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.2 SOURCES/license-installer.sh:1.3 --- SOURCES/license-installer.sh:1.2 Tue Aug 23 19:58:56 2005 +++ SOURCES/license-installer.sh Tue Aug 23 21:20:31 2005 @@ -26,7 +26,7 @@ cp -i "$3" $SPECDIR || exit 1 fi ( cd $SPECDIR - /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec if [ "$?" -ne 0 ]; then exit 2 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Tue Aug 23 21:26:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:26:18 Modified files: w32codec.spec Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.71 -r1.72 --- w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 +++ w32codec.spec 23 Aug 2005 19:26:18 -0000 1.72 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro From glen at pld-linux.org Tue Aug 23 21:26:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: w32codec.spec - use shared installer script from SOURCES - ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:26:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) ---- Files affected: SPECS: w32codec.spec (1.71 -> 1.72) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.71 SPECS/w32codec.spec:1.72 --- SPECS/w32codec.spec:1.71 Tue Aug 23 20:57:26 2005 +++ SPECS/w32codec.spec Tue Aug 23 21:26:18 2005 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.71&r2=1.72&f=u From arekm at pld-linux.org Tue Aug 23 21:27:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:05 2005 Subject: CVSROOT: logdiff.pl, loginfo -m option no longer required In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 19:27:06 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: -m option no longer required ---- Files affected: CVSROOT: logdiff.pl (1.41 -> 1.42) , loginfo (1.197 -> 1.198) ---- Diffs: ================================================================ Index: CVSROOT/logdiff.pl diff -u CVSROOT/logdiff.pl:1.41 CVSROOT/logdiff.pl:1.42 --- CVSROOT/logdiff.pl:1.41 Mon Jul 28 12:42:50 2003 +++ CVSROOT/logdiff.pl Tue Aug 23 21:27:01 2005 @@ -256,8 +256,6 @@ @ARGVX = $arg; } } -($mailto) || die("No -m mail recipient specified\n"); - ## for now, the first "file" is the repository directory being committed, ## relative to the $CVSROOT location @@ -295,7 +293,10 @@ &do_changes_file($commitlog, @text); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -323,7 +324,10 @@ push(@text, " ".$_); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -558,7 +562,10 @@ ## ## Mail out the notification. ## -&mail_notification(@plain_txt); +if ($mailto) +{ + &mail_notification(@plain_txt); +} exit 0; # vim: ts=4 sw=4 et noai nosi cin ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.197 CVSROOT/loginfo:1.198 --- CVSROOT/loginfo:1.197 Tue Aug 23 19:26:17 2005 +++ CVSROOT/loginfo Tue Aug 23 21:27:01 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/logdiff.pl?r1=1.41&r2=1.42&f=u http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.197&r2=1.198&f=u From glen at pld-linux.org Tue Aug 23 21:28:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: builder - CVS/Entries might not always present, hide errors In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:28:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - CVS/Entries might not always present, hide errors ---- Files affected: SPECS: builder (1.323 -> 1.324) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.323 SPECS/builder:1.324 --- SPECS/builder:1.323 Sun Aug 21 19:35:46 2005 +++ SPECS/builder Tue Aug 23 21:28:11 2005 @@ -512,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -974,7 +974,7 @@ # --- # * -selinux # samba -mysql -pgsql - # w32codec license_agreement + # w32codec-installer license_agreement # php +mysqli # --- if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.323&r2=1.324&f=u From glen at pld-linux.org Tue Aug 23 21:39:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SOURCES: builder - up from SPECS HEAD, rev 1.324 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:39:39 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up from SPECS HEAD, rev 1.324 ---- Files affected: SOURCES: builder (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/builder diff -u SOURCES/builder:1.11 SOURCES/builder:1.12 --- SOURCES/builder:1.11 Sat Aug 14 04:23:46 2004 +++ SOURCES/builder Tue Aug 23 21:39:34 2005 @@ -2,15 +2,18 @@ # ----------- # $Id$ # Exit codes: -# 0 - succesful -# 1 - help displayed -# 2 - no spec file name in cmdl parameters -# 3 - spec file not stored in repo -# 4 - some source, patch or icon files not stored in repo -# 5 - package build failed -# 6 - spec file with errors -# 7 - wrong source in /etc/poldek.conf -# 8 - Failed installing buildrequirements and subrequirements +# 0 - succesful +# 1 - help displayed +# 2 - no spec file name in cmdl parameters +# 3 - spec file not stored in repo +# 4 - some source, patch or icon files not stored in repo +# 5 - package build failed +# 6 - spec file with errors +# 7 - wrong source in /etc/poldek.conf +# 8 - Failed installing buildrequirements and subrequirements +# 9 - Requested tag already exist +# 10 - Refused to build fractional release +# 100 - Unknown error (should not happen) # Notes (todo): # - builder -u fetches current version first @@ -23,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.11 (C) 1999-2004 Free Penguins". +V 0.12 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" @@ -42,6 +45,7 @@ UPDATE5="" ADD5="" NO5="" +ADAPTERIZE="" ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"} CVSROOT="" @@ -64,6 +68,7 @@ RPMOPTS="" BCOND="" GROUP_BCONDS="no" +CVSIGNORE_DF="no" PATCHES="" SOURCES="" @@ -80,30 +85,18 @@ CVS_SERVER="cvs.pld-linux.org" DISTFILES_SERVER="://distfiles.pld-linux.org" +ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org" -DEF_NICE_LEVEL=0 +DEF_NICE_LEVEL=19 FAIL_IF_NO_SOURCES="yes" -wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" -wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - -GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETLOCAL="cp -a" - -if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then - RPM="rpm" - RPMBUILD="rpm" +if [ -x /usr/bin/rpm-getdeps ]; then + FETCH_BUILD_REQUIRES_RPMGETDEPS="yes" else - RPM="rpm" - RPMBUILD="rpmbuild" + FETCH_BUILD_REQUIRES_RPMGETDEPS="no" fi -POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" -POLDEK_SOURCE="cvs" -POLDEK_CMD="/usr/bin/poldek --noask" - # Here we load saved user environment used to # predefine options set above, or passed to builder # in command line. @@ -121,6 +114,7 @@ #GROUP_BCONDS="yes" #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE' # +SU_SUDO="" if [ -n "$HOME_ETC" ]; then USER_CFG="$HOME_ETC/.builderrc" else @@ -129,6 +123,36 @@ [ -f "$USER_CFG" ] && . "$USER_CFG" +if [ -n "$USE_PROZILLA" ]; then + GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-O" +elif [ -n "$USE_AXEL" ]; then + GETURI="axel -a $AXEL_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-o" +else + wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" + wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" + + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" + GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" + OUTFILEOPT="-O" +fi + +GETLOCAL="cp -a" + +if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then + RPM="rpm" + RPMBUILD="rpm" +else + RPM="rpm" + RPMBUILD="rpmbuild" +fi + +POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" +POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask" + run_poldek() { RES_FILE=~/tmp/poldek-exit-status.$RANDOM @@ -137,7 +161,7 @@ if [ -n "$LASTLOG_FILE" ]; then echo "LASTLOG=$LOG" > $LASTLOG_FILE fi - (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee $LOG + (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG return $exit_pldk else (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null @@ -146,17 +170,6 @@ fi } -# Example grep cvs /etc/poldek.conf: -# source = cvs /home/users/yoshi/rpm/RPMS/ -if [ "$UPDATE_POLDEK_INDEXES" = "yes" ]; then - run_poldek -l -n ${POLDEK_SOURCE} 1>&2 > /dev/null - if [ ! "$?" == "0" ]; then - echo "Using improper source '${POLDEK_SOURCE}' in /etc/poldek.conf" - echo "Fix it and try to continue" - exit 7 - fi -fi - #--------------------------------------------- # functions @@ -175,11 +188,13 @@ [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [-nu|--no-urls] [-v|--verbose] [--opts ] [--with/--without ] [--define ] [.spec] - + -5, --update-md5 - update md5 comments in spec, implies -nd -ncs +--adapter[ize] - run adapter.awk on SPECFILE -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd -ncs -n5, --no-md5 - ignore md5 comments in spec --D, --debug - enable script debugging mode, +-D, --debug - enable builder script debugging mode, +-debug - produce rpm debug package (same as --opts -debug) -V, --version - output builder version -a, --as_anon - get files via pserver as cvs@$CVS_SERVER, -b, -ba, --build - get all files from CVS repo or HTTP/FTP and build package @@ -192,7 +207,7 @@ -B, --branch - add branch -c, --clean - clean all temporarily created files (in BUILD, SOURCES, SPECS and \$RPM_BUILD_ROOT), --d , --cvsroot +-d , --cvsroot - setup \$CVSROOT, --define - define a macro with value , @@ -227,22 +242,30 @@ -FRB, --force-remove-build-requires - remove all you fetched with -R or --fetch-build-requires remember, this option works without confirmation, +-sf, --source-files - list sources - bare filenames (intended for offline + operations; does not work when Icon field is present + but icon file is absent), +-sp, --source-paths - list sources - filenames with full local paths (intended for + offline operations; does not work when Icon field is present + but icon file is absent), -T , --tag - add cvs tag for files, -Tvs, --tag-version-stable - - add cvs tags STABLE and NAME-VERSION-RELESE for files, + - add cvs tags STABLE and NAME-VERSION-RELEASE for files, -Tvn, --tag-version-nest - - add cvs tags NEST and NAME-VERSION-RELESE for files, + - add cvs tags NEST and NAME-VERSION-RELEASE for files, -Ts, --tag-stable - add cvs tag STABLE for files, -Tn, --tag-nest - add cvs tag NEST for files, -Tv, --tag-version - - add cvs tag NAME-VERSION-RELESE for files, + - add cvs tag NAME-VERSION-RELEASE for files, -Tp, --tag-prefix - add to NAME-VERSION-RELEASE tags, -tt, --test-tag - fail if tag is already present, +-ir, --integer-release-only + - allow only integer and snapshot releases -v, --verbose - be verbose, -u, --try-upgrade - check version, and try to upgrade package -un, --try-upgrade-with-float-version @@ -255,16 +278,20 @@ %_without_ macro switch. You may now use --with feat1 feat2 feat3 --without feat4 feat5 --with feat6 constructions. Set GROUP_BCONDS to yes to make use of it. ---target +--target , --target= - build for platform . " } cache_rpm_dump () { + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi rpm_dump_cache=` case "$RPMBUILD" in rpm ) - rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1 + rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1 ;; rpmbuild ) rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1 @@ -303,6 +330,13 @@ PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -n 1`" PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`" +# These variables may be unset after first cache_rpm_dump call +# (because of not-yet-retrieved icon file) +# +# if [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then +# Exit_error err_no_package_data; +# fi + if [ -n "$BE_VERBOSE" ]; then echo "- Sources : `nourl $SOURCES`" if [ -n "$PATCHES" ]; then @@ -347,7 +381,22 @@ remove_build_requires echo "Error: package build failed. (${2:-no more info})"; exit 5 ;; + "err_no_package_data" ) + remove_build_requires + echo "Error: couldn't get out package name/version/release from spec file." + exit 6 ;; + "err_tag_exists" ) + remove_build_requires + echo "Tag ${2} already exists (spec release: ${3})."; + exit 9 ;; + "err_fract_rel" ) + remove_build_requires + echo "Release ${2} not integer and not a snapshot."; + exit 10 ;; + esac + echo "Unknown error." + exit 100 } init_builder() @@ -423,7 +472,7 @@ chmod $CHMOD_MODE $SPECFILE fi unset OPTIONS - grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE + [ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE } find_mirror() @@ -463,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -473,7 +522,17 @@ sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \ grep -E '^[0-9a-f]{32}$') if [ X"$md5" = X"" ] ; then - grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs + source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$source_md5" ] ; then + echo $source_md5; + else + # we have empty SourceX-md5, but it is still possible + # that we have NoSourceX-md5 AND NoSource: X + nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" = X"" ] ; then + echo $nosource_md5; + fi; + fi; else if [ $(echo "$md5" | wc -l) != 1 ] ; then echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2 @@ -484,12 +543,12 @@ distfiles_url () { - echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$DISTFILES_SERVER/distfiles/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } distfiles_attic_url () { - echo "$PROTOCOL$DISTFILES_SERVER/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } good_md5 () @@ -499,6 +558,23 @@ [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ] } +good_size () +{ + size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)" + [ -n "$size" -a "$size" -gt 0 ] +} + +cvsignore_df () +{ + if [ "$CVSIGNORE_DF" != "yes" ]; then + return + fi + cvsignore=${SOURCE_DIR}/.cvsignore + if ! grep -q "^$1\$" $cvsignore 2> /dev/null; then + echo "$1" >> $cvsignore + fi +} + get_files() { GET_FILES="$@" @@ -547,7 +623,7 @@ fi if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i"; then echo "$(nourl "$i") having proper md5sum already exists" continue fi @@ -561,9 +637,9 @@ if [ -z "$NOMIRRORS" ]; then url="`find_mirror "$url"`" fi - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi fi if ! test -s "$target"; then @@ -574,13 +650,15 @@ if [ -z "$NOMIRRORS" ]; then url_attic="`find_mirror "$url_attic"`" fi - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi fi - if ! test -s "$target"; then + if test -s "$target"; then + cvsignore_df $target + else rm -f "$target" FROM_DISTFILES=0 fi @@ -613,7 +691,7 @@ ${GETURI} "$im" || \ if [ `echo $im | grep -E 'ftp://'` ]; then ${GETURI2} "$im" - fi + fi fi fi @@ -634,8 +712,8 @@ ' \ $SPECS_DIR/$SPECFILE fi - - if good_md5 "$i"; then + + if good_md5 "$i" && good_size "$i"; then : elif [ "$FROM_DISTFILES" = 1 ]; then # wrong md5 from distfiles: remove the file and try again @@ -643,24 +721,24 @@ echo "MD5 sum mismatch. Trying full fetch." FROM_DISTFILES=2 rm -f $target - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi if ! test -s "$target"; then rm -f "$target" - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi test -s "$target" || rm -f "$target" fi - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i" ; then : else - echo "MD5 sum mismatch. Use -U to refetch sources," + echo "MD5 sum mismatch or 0 size. Use -U to refetch sources," echo "or -5 to update md5 sums, if you're sure files are correct." Exit_error err_no_source_in_repo $i fi @@ -677,6 +755,12 @@ } make_tagver() { + + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi + # Check whether first character of PACKAGE_NAME is legal for tag name if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then TAG_PREFIX=tag_ @@ -807,16 +891,16 @@ eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE" eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE" parse_spec; + if [ -n "$ICONS" ]; then + get_files $ICONS; + parse_spec; + fi get_files "$SOURCES $PATCHES"; unset TOLDVER TNEWVER TNOTIFY fi fi cd "$SPECS_DIR" - - if [ -n "$TARGET" ]; then - TARGET_SWITCH="--target $TARGET" - fi - + case "$COMMAND" in build ) BUILD_SWITCH="-ba" ;; @@ -838,7 +922,7 @@ echo "LASTLOG=$LOG" > $LASTLOG_FILE fi RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM - (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG + (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG RETVAL=`cat $RES_FILE` rm $RES_FILE if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then @@ -849,7 +933,7 @@ fi fi else - eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE + eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE RETVAL=$? fi if [ "$RETVAL" -ne "0" ]; then @@ -860,7 +944,6 @@ Exit_error err_build_fail; fi unset BUILD_SWITCH - unset TARGET_SWITCH } nourl() @@ -868,7 +951,6 @@ echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g' } - install_required_packages() { run_poldek -vi $1 @@ -881,16 +963,56 @@ AVAIL_BCONDS_WITH="" if `grep -q ^%bcond ${SPECFILE}`; then BCOND_VERSION="NEW" - elif `grep -q bcond ${SPECFILE}`; then + elif `egrep -q ^#\ *_with ${SPECFILE}`; then BCOND_VERSION="OLD" else BCOND_VERSION="NONE" fi + + # expand bconds from ~/.bcondrc + # The file structure is like gentoo's package.use: + # --- + # * -selinux + # samba -mysql -pgsql + # w32codec-installer license_agreement + # php +mysqli + # --- + if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then + # This takes package name, first defined in spec. + # so consider that when defining flags for package. + PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1` + AVAIL=`$RPMBUILD --bcond $SPECFILE` + + BCONDRC=$HOME/.bcondrc + [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && BCONDRC=$HOME_ETC/.bcondrc + + while read pkg flags; do + # ignore comments + [[ "$pkg" == \#* ]] && continue + + # any package or current package? + if [ "$pkg" = "*" ] || [ "$pkg" = "$PN" ]; then + for flag in $flags; do + opt=${flag#[+-]} + + # use only flags which are in this package. + if [[ $AVAIL = *${opt}* ]]; then + if [[ $flag = -* ]]; then + BCOND="$BCOND --without $opt" + else + BCOND="$BCOND --with $opt" + fi + fi + done + fi + done < $BCONDRC + fi + case "${BCOND_VERSION}" in NONE) - : + : ;; - OLD) + OLD) echo "Warning: This spec has old style bconds. Fix it || die." for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_without_` do @@ -901,7 +1023,7 @@ AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT" fi done - + for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_with_` do AVAIL_BCOND_WITH=`echo $opt|sed -e "s/^_with_//g"` @@ -923,6 +1045,22 @@ _with) cond_type="with" ;; + _without_*) + AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`" + if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/builder?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Tue Aug 23 21:41:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: builder - v0.13 :) In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:41:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - v0.13 :) ---- Files affected: SPECS: builder (1.324 -> 1.325) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.324 SPECS/builder:1.325 --- SPECS/builder:1.324 Tue Aug 23 21:28:11 2005 +++ SPECS/builder Tue Aug 23 21:41:39 2005 @@ -26,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.12 (C) 1999-2005 Free Penguins". +V 0.13 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.324&r2=1.325&f=u From pluto at pld-linux.org Tue Aug 23 21:59:36 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: gcc.spec - %files updated, rebuild. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 19:59:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %files updated, rebuild. ---- Files affected: SPECS: gcc.spec (1.358 -> 1.359) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.358 SPECS/gcc.spec:1.359 --- SPECS/gcc.spec:1.358 Tue Aug 23 15:21:59 2005 +++ SPECS/gcc.spec Tue Aug 23 21:59:29 2005 @@ -41,7 +41,7 @@ Name: gcc Version: 4.1.0 %define _snap 20050823T1409UTC -Release: 0.%{_snap}.1 +Release: 0.%{_snap}.2 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1173,8 +1173,6 @@ %attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain %{_infodir}/fastjar* %{_infodir}/gcj* -%{_infodir}/hacking* -%{_infodir}/vmintegration* %{_mandir}/man1/fastjar* %{_mandir}/man1/gcj* %{_mandir}/man1/gjnih* @@ -1280,6 +1278,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.359 2005/08/23 19:59:29 pluto +- %files updated, rebuild. + Revision 1.358 2005/08/23 13:21:59 pluto - updated to 4.1.0-20050823T1409UTC. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.358&r2=1.359&f=u From glen at pld-linux.org Tue Aug 23 22:00:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: macromedia-flash.spec - update URL In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:00:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update URL ---- Files affected: SPECS: macromedia-flash.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.33 SPECS/macromedia-flash.spec:1.34 --- SPECS/macromedia-flash.spec:1.33 Tue Aug 23 21:17:50 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:00:05 2005 @@ -21,7 +21,7 @@ %else Source0: license-installer.sh %endif -URL: http://www.macromedia.com/software/flash/ +URL: http://www.macromedia.com/software/flashplayer/ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/23 20:00:05 glen +- update URL + Revision 1.33 2005/08/23 19:17:50 glen - unzip unneccessary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.33&r2=1.34&f=u From twittner at pld-linux.org Tue Aug 23 22:11:04 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: man.spec - force make -j1 - simultaneous builds fail (repor... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 20:11:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ---- Files affected: SPECS: man.spec (1.104 -> 1.105) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.104 SPECS/man.spec:1.105 --- SPECS/man.spec:1.104 Tue Aug 23 21:18:09 2005 +++ SPECS/man.spec Tue Aug 23 22:10:58 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - %{__make} \ +%{__make} -j1 \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.105 2005/08/23 20:10:58 twittner +- force make -j1 - simultaneous builds fail (reported by paszczus, + confirmed by me) + Revision 1.104 2005/08/23 19:18:09 paszczus - backing to %{__make} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.104&r2=1.105&f=u From glen at pld-linux.org Tue Aug 23 22:16:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SOURCES: horde-path.patch - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:16:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SOURCES: horde-path.patch (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SOURCES/horde-path.patch diff -u SOURCES/horde-path.patch:1.9 SOURCES/horde-path.patch:1.10 --- SOURCES/horde-path.patch:1.9 Mon May 9 19:57:40 2005 +++ SOURCES/horde-path.patch Tue Aug 23 22:16:24 2005 @@ -1,433 +1,14 @@ --- horde-3.0-rc3/config/registry.php.dist 2004-11-01 11:39:39.000000000 +0000 -+++ horde-3.0-rc3.new/config/registry.php.dist 2004-12-12 23:00:36.489047024 +0000 -@@ -45,7 +45,7 @@ - // variable uses forward slashes. If it does not, you'll have to tweak ++++ ./config/registry.php.dist 2005-08-23 23:15:12.000000000 +0300 +@@ -46,7 +46,7 @@ // this. if (isset($_SERVER['PHP_SELF'])) { -- $webroot = strstr(dirname(__FILE__), '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); -+ $webroot = strstr("/usr/share/horde", '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); + $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY); +- $webroot = strstr(dirname(__FILE__), '/' . array_shift($webroot)); ++ $webroot = strstr("/usr/share/horde", '/' . array_shift($webroot)); if ($webroot !== false) { $webroot = preg_replace(';/config$;', '', $webroot); } else { -@@ -56,17 +56,17 @@ - } - - $this->applications['horde'] = array( -- 'fileroot' => dirname(__FILE__) . '/..', -+ 'fileroot' => '/usr/share/horde', - 'webroot' => $webroot, - 'initial_page' => 'login.php', - 'name' => _("Horde"), - 'status' => 'active', -- 'templates' => dirname(__FILE__) . '/../templates', -+ 'templates' => '/usr/share/horde/templates', - 'provides' => 'horde' - ); - - $this->applications['imp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../imp', -+ 'fileroot' => '/usr/share/horde/imp', - 'webroot' => $this->applications['horde']['webroot'] . '/imp', - 'name' => _("Mail"), - 'status' => 'active', -@@ -81,7 +81,7 @@ - ); - - $this->applications['ingo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ingo', -+ 'fileroot' => '/usr/share/horde/ingo', - 'webroot' => $this->applications['horde']['webroot'] . '/ingo', - 'name' => _("Filters"), - 'status' => 'active', -@@ -129,7 +129,7 @@ - ); - - $this->applications['turba'] = array( -- 'fileroot' => dirname(__FILE__) . '/../turba', -+ 'fileroot' => '/usr/share/horde/turba', - 'webroot' => $this->applications['horde']['webroot'] . '/turba', - 'name' => _("Address Book"), - 'status' => 'active', -@@ -138,7 +138,7 @@ - ); - - $this->applications['kronolith'] = array( -- 'fileroot' => dirname(__FILE__) . '/../kronolith', -+ 'fileroot' => '/usr/share/horde/kronolith', - 'webroot' => $this->applications['horde']['webroot'] . '/kronolith', - 'name' => _("Calendar"), - 'status' => 'active', -@@ -154,7 +154,7 @@ - ); - - $this->applications['mnemo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mnemo', -+ 'fileroot' => '/usr/share/horde/mnemo', - 'webroot' => $this->applications['horde']['webroot'] . '/mnemo', - 'name' => _("Notes"), - 'status' => 'active', -@@ -163,7 +163,7 @@ - ); - - $this->applications['nag'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nag', -+ 'fileroot' => '/usr/share/horde/nag', - 'webroot' => $this->applications['horde']['webroot'] . '/nag', - 'name' => _("Tasks"), - 'status' => 'active', -@@ -195,7 +195,7 @@ - ); - - $this->applications['chora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../chora', -+ 'fileroot' => '/usr/share/horde/chora', - 'webroot' => $this->applications['horde']['webroot'] . '/chora', - 'name' => _("Version Control"), - 'status' => 'active', -@@ -284,7 +284,7 @@ - ); - - $this->applications['klutz'] = array( -- 'fileroot' => dirname(__FILE__) . '/../klutz', -+ 'fileroot' => '/usr/share/horde/klutz', - 'webroot' => $this->applications['horde']['webroot'] . '/klutz', - 'name' => _("Comics"), - 'status' => 'inactive', ---- ./config/registry.php.dist~ 2005-03-04 20:59:19.000000000 +0200 -+++ ./config/registry.php.dist 2005-03-04 21:00:57.000000000 +0200 -@@ -90,7 +90,7 @@ - ); - - $this->applications['sam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sam', -+ 'fileroot' => '/usr/share/horde/sam', - 'webroot' => $this->applications['horde']['webroot'] . '/sam', - 'name' => _("Spam"), - 'status' => 'inactive', -@@ -101,7 +101,7 @@ - ); - - $this->applications['troll'] = array( -- 'fileroot' => dirname(__FILE__) . '/../troll', -+ 'fileroot' => '/usr/share/horde/troll', - 'webroot' => $this->applications['horde']['webroot'] . '/troll', - 'name' => _("Newsgroups"), - 'status' => 'inactive', -@@ -109,7 +109,7 @@ - ); - - $this->applications['vilma'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vilma', -+ 'fileroot' => '/usr/share/horde/vilma', - 'webroot' => $this->applications['horde']['webroot'] . '/vilma', - 'name' => _("Mail Admin"), - 'status' => 'inactive', -@@ -117,7 +117,7 @@ - ); - - $this->applications['mimp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mimp', -+ 'fileroot' => '/usr/share/horde/mimp', - 'webroot' => $this->applications['horde']['webroot'] . '/mimp', - 'name' => _("Mobile Mail"), - 'status' => 'inactive' -@@ -172,7 +172,7 @@ - ); - - $this->applications['genie'] = array( -- 'fileroot' => dirname(__FILE__) . '/../genie', -+ 'fileroot' => '/usr/share/horde/genie', - 'webroot' => $this->applications['horde']['webroot'] . '/genie', - 'name' => _("Wishlists"), - 'status' => 'inactive', -@@ -181,7 +181,7 @@ - ); - - $this->applications['trean'] = array( -- 'fileroot' => dirname(__FILE__) . '/../trean', -+ 'fileroot' => '/usr/share/horde/trean', - 'webroot' => $this->applications['horde']['webroot'] . '/trean', - 'name' => _("Bookmarks"), - 'status' => 'inactive', -@@ -203,7 +203,7 @@ - ); - - $this->applications['babel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../babel', -+ 'fileroot' => '/usr/share/horde/babel', - 'webroot' => $this->applications['horde']['webroot'] . '/babel', - 'name' => _("i18n"), - 'status' => 'inactive', -@@ -211,7 +211,7 @@ - ); - - $this->applications['thor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../thor', -+ 'fileroot' => '/usr/share/horde/thor', - 'webroot' => $this->applications['horde']['webroot'] . '/thor', - 'name' => _("Projects"), - 'status' => 'inactive', -@@ -220,7 +220,7 @@ - ); - - $this->applications['whups'] = array( -- 'fileroot' => dirname(__FILE__) . '/../whups', -+ 'fileroot' => '/usr/share/horde/whups', - 'webroot' => $this->applications['horde']['webroot'] . '/whups', - 'name' => _("Tickets"), - 'status' => 'inactive', -@@ -229,7 +229,7 @@ - ); - - $this->applications['luxor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../luxor', -+ 'fileroot' => '/usr/share/horde/luxor', - 'webroot' => $this->applications['horde']['webroot'] . '/luxor', - 'name' => _("X-Ref"), - 'status' => 'inactive', -@@ -237,7 +237,7 @@ - ); - - $this->applications['nic'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nic', -+ 'fileroot' => '/usr/share/horde/nic', - 'webroot' => $this->applications['horde']['webroot'] . '/nic', - 'name' => _("Network"), - 'status' => 'inactive', -@@ -251,7 +251,7 @@ - ); - - $this->applications['mottle'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mottle', -+ 'fileroot' => '/usr/share/horde/mottle', - 'webroot' => $this->applications['horde']['webroot'] . '/mottle', - 'name' => _("MOTD"), - 'status' => 'inactive', -@@ -259,7 +259,7 @@ - ); - - $this->applications['jonah'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jonah', -+ 'fileroot' => '/usr/share/horde/jonah', - 'webroot' => $this->applications['horde']['webroot'] . '/jonah', - 'name' => _("News"), - 'status' => 'inactive', -@@ -268,7 +268,7 @@ - ); - - $this->applications['occam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../occam', -+ 'fileroot' => '/usr/share/horde/occam', - 'webroot' => $this->applications['horde']['webroot'] . '/occam', - 'name' => _("Courses"), - 'status' => 'inactive', -@@ -276,7 +276,7 @@ - ); - - $this->applications['goops'] = array( -- 'fileroot' => dirname(__FILE__) . '/../goops', -+ 'fileroot' => '/usr/share/horde/goops', - 'webroot' => $this->applications['horde']['webroot'] . '/goops', - 'name' => _("Search Engines"), - 'status' => 'inactive', -@@ -293,7 +293,7 @@ - ); - - $this->applications['orator'] = array( -- 'fileroot' => dirname(__FILE__) . '/../orator', -+ 'fileroot' => '/usr/share/horde/orator', - 'webroot' => $this->applications['horde']['webroot'] . '/orator', - 'name' => _("Presentations"), - 'status' => 'inactive', -@@ -306,7 +306,7 @@ - ); - - $this->applications['hermes'] = array( -- 'fileroot' => dirname(__FILE__) . '/../hermes', -+ 'fileroot' => '/usr/share/horde/hermes', - 'webroot' => $this->applications['horde']['webroot'] . '/hermes', - 'name' => _("Time Tracking"), - 'status' => 'inactive', -@@ -315,7 +315,7 @@ - ); - - $this->applications['juno'] = array( -- 'fileroot' => dirname(__FILE__) . '/../juno', -+ 'fileroot' => '/usr/share/horde/juno', - 'webroot' => $this->applications['horde']['webroot'] . '/juno', - 'name' => _("Accounting"), - 'status' => 'inactive', -@@ -323,7 +323,7 @@ - ); - - $this->applications['sesha'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sesha', -+ 'fileroot' => '/usr/share/horde/sesha', - 'webroot' => $this->applications['horde']['webroot'] . '/sesha', - 'name' => _("Inventory"), - 'status' => 'inactive', -@@ -336,7 +336,7 @@ - ); - - $this->applications['accounts'] = array( -- 'fileroot' => dirname(__FILE__) . '/../accounts', -+ 'fileroot' => '/usr/share/horde/accounts', - 'webroot' => $this->applications['horde']['webroot'] . '/accounts', - 'name' => _("My Account"), - 'status' => 'inactive', -@@ -344,7 +344,7 @@ - ); - - $this->applications['gollem'] = array( -- 'fileroot' => dirname(__FILE__) . '/../gollem', -+ 'fileroot' => '/usr/share/horde/gollem', - 'webroot' => $this->applications['horde']['webroot'] . '/gollem', - 'name' => _("File Manager"), - 'status' => 'inactive', -@@ -353,7 +353,7 @@ - ); - - $this->applications['forwards'] = array( -- 'fileroot' => dirname(__FILE__) . '/../forwards', -+ 'fileroot' => '/usr/share/horde/forwards', - 'webroot' => $this->applications['horde']['webroot'] . '/forwards', - 'name' => _("Forwards"), - 'status' => 'inactive', -@@ -362,7 +362,7 @@ - ); - - $this->applications['passwd'] = array( -- 'fileroot' => dirname(__FILE__) . '/../passwd', -+ 'fileroot' => '/usr/share/horde/passwd', - 'webroot' => $this->applications['horde']['webroot'] . '/passwd', - 'name' => _("Password"), - 'status' => 'inactive', -@@ -370,7 +370,7 @@ - ); - - $this->applications['jeta'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jeta', -+ 'fileroot' => '/usr/share/horde/jeta', - 'webroot' => $this->applications['horde']['webroot'] . '/jeta', - 'name' => _("SSH"), - 'status' => 'inactive', -@@ -378,7 +378,7 @@ - ); - - $this->applications['vacation'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vacation', -+ 'fileroot' => '/usr/share/horde/vacation', - 'webroot' => $this->applications['horde']['webroot'] . '/vacation', - 'name' => _("Vacation"), - 'status' => 'inactive', -@@ -392,7 +392,7 @@ - ); - - $this->applications['giapeto'] = array( -- 'fileroot' => dirname(__FILE__) . '/../giapeto', -+ 'fileroot' => '/usr/share/horde/giapeto', - 'webroot' => $this->applications['horde']['webroot'] . '/giapeto', - 'name' => _("CMS"), - 'status' => 'inactive', -@@ -401,7 +401,7 @@ - ); - - $this->applications['midas'] = array( -- 'fileroot' => dirname(__FILE__) . '/../midas', -+ 'fileroot' => '/usr/share/horde/midas', - 'webroot' => $this->applications['horde']['webroot'] . '/midas', - 'name' => _("Ads"), - 'status' => 'inactive', -@@ -409,7 +409,7 @@ - ); - - $this->applications['agora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../agora', -+ 'fileroot' => '/usr/share/horde/agora', - 'webroot' => $this->applications['horde']['webroot'] . '/agora', - 'name' => _("Forums"), - 'status' => 'inactive', -@@ -418,7 +418,7 @@ - ); - - $this->applications['odin'] = array( -- 'fileroot' => dirname(__FILE__) . '/../odin', -+ 'fileroot' => '/usr/share/horde/odin', - 'webroot' => $this->applications['horde']['webroot'] . '/odin', - 'name' => _("Data"), - 'status' => 'inactive', -@@ -426,7 +426,7 @@ - ); - - $this->applications['ulaform'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ulaform', -+ 'fileroot' => '/usr/share/horde/ulaform', - 'webroot' => $this->applications['horde']['webroot'] . '/ulaform', - 'name' => _("Forms"), - 'status' => 'inactive', -@@ -434,7 +434,7 @@ - ); - - $this->applications['volos'] = array( -- 'fileroot' => dirname(__FILE__) . '/../volos', -+ 'fileroot' => '/usr/share/horde/volos', - 'webroot' => $this->applications['horde']['webroot'] . '/volos', - 'name' => _("Guestbook"), - 'status' => 'inactive', -@@ -442,7 +442,7 @@ - ); - - $this->applications['ansel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ansel', -+ 'fileroot' => '/usr/share/horde/ansel', - 'webroot' => $this->applications['horde']['webroot'] . '/ansel', - 'name' => _("Photos"), - 'status' => 'inactive', -@@ -451,7 +451,7 @@ - ); - - $this->applications['scry'] = array( -- 'fileroot' => dirname(__FILE__) . '/../scry', -+ 'fileroot' => '/usr/share/horde/scry', - 'webroot' => $this->applications['horde']['webroot'] . '/scry', - 'name' => _("Polls"), - 'status' => 'inactive', -@@ -460,7 +460,7 @@ - ); - - $this->applications['rakim'] = array( -- 'fileroot' => dirname(__FILE__) . '/../rakim', -+ 'fileroot' => '/usr/share/horde/rakim', - 'webroot' => $this->applications['horde']['webroot'] . '/rakim', - 'name' => _("Support"), - 'status' => 'inactive', -@@ -468,7 +468,7 @@ - ); - - $this->applications['merk'] = array( -- 'fileroot' => dirname(__FILE__) . '/../merk', -+ 'fileroot' => '/usr/share/horde/merk', - 'webroot' => $this->applications['horde']['webroot'] . '/merk', - 'name' => _("Shopping"), - 'status' => 'inactive', -@@ -476,7 +476,7 @@ - ); - - $this->applications['swoosh'] = array( -- 'fileroot' => dirname(__FILE__) . '/../swoosh', -+ 'fileroot' => '/usr/share/horde/swoosh', - 'webroot' => $this->applications['horde']['webroot'] . '/swoosh', - 'name' => _("SMS Messaging"), - 'status' => 'inactive', -@@ -485,7 +485,7 @@ - ); - - $this->applications['wicked'] = array( -- 'fileroot' => dirname(__FILE__) . '/../wicked', -+ 'fileroot' => '/usr/share/horde/wicked', - 'webroot' => $this->applications['horde']['webroot'] . '/wicked', - 'name' => _("Wiki"), - 'status' => 'inactive', --- ./config/registry.php.dist~ 2005-03-04 21:02:58.000000000 +0200 +++ ./config/registry.php.dist 2005-03-04 21:12:11.517027935 +0200 @@ -223,7 +223,7 @@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-path.patch?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 22:24:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde.spec - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:24:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SPECS: horde.spec (1.95 -> 1.96) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.95 SPECS/horde.spec:1.96 --- SPECS/horde.spec:1.95 Sun May 22 22:15:19 2005 +++ SPECS/horde.spec Tue Aug 23 22:23:55 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ # TODO: # - support for Oracle and Sybase +# - Support SQLite and Oracle in all SQL configurations. +# - LDAP and memcached session handlers. # - remove config/ (and others in apache.conf) from document root, so # apache deny from all not needed. # - put docs/CREDITS to package, rather in doc (so installations with @@ -12,40 +14,40 @@ Summary(pl): Wsp?lny szkielet Horde do wszystkich modu??w Horde Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde -Version: 3.0.4 -Release: 6 +Version: 3.0.5 +Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz -# Source0-md5: e2221d409ba1c8841ce4ecee981d7b61 +# Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch Patch3: %{name}-blank-admins.patch -Patch4: %{name}-fix-config-blanks.patch +Patch4: %{name}-config-xml.patch URL: http://www.horde.org/ -BuildRequires: rpmbuild(macros) >= 1.177 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 Requires(triggerpostun): grep Requires(triggerpostun): sed >= 4.0 Requires: apache >= 1.3.33-3 -Requires: apache(mod_dir) >= 1.3.22 Requires: apache(mod_access) Requires: apache(mod_alias) +Requires: apache(mod_dir) >= 1.3.22 Requires: php >= 4.1.0 +Requires: php-domxml Requires: php-gettext >= 4.1.0 Requires: php-imap >= 4.1.0 Requires: php-mcrypt >= 4.1.0 -Requires: php-pear-PEAR -Requires: php-pear-Log Requires: php-pcre >= 4.1.0 +Requires: php-pear-Log +Requires: php-pear-PEAR Requires: php-posix >= 4.1.0 Requires: php-session >= 4.1.0 Requires: php-xml >= 4.1.0 Requires: php-zlib >= 4.1.0 -Requires: php-domxml Obsoletes: horde-mysql Obsoletes: horde-pgsql BuildArch: noarch @@ -58,11 +60,8 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org %define _appdir %{hordedir} -%define _apache1dir /etc/apache -%define _apache2dir /etc/httpd %define schemadir /usr/share/openldap/schema - %description The Horde Framework provides a common structure and interface for Horde modules (such as IMP, a web-based mail program). This RPM is @@ -106,13 +105,17 @@ Ten pakiet zawiera horde.schema dla pakietu openldap. %prep -%setup -q +%setup -q %{?_rc:-n %{name}-%{version}-%{_rc}} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 +sed -i -e " +s#dirname(__FILE__) . '/..#'%{hordedir}#g +" config/registry.php.dist + # Described in documentation as dangerous file... rm test.php @@ -121,16 +124,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_appdir}/{admin,js,services} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \ - $RPM_BUILD_ROOT/var/log/%{name} \ + $RPM_BUILD_ROOT/var/{lib,log}/%{name} \ $RPM_BUILD_ROOT%{schemadir} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.php.dist; do cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) done -sed -e ' - s,/tmp/horde.log,/var/log/%{name}/%{name}.log, -'< config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml + +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak cp -pR admin/* $RPM_BUILD_ROOT%{_appdir}/admin @@ -159,21 +161,6 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak fi -# apache1 -if [ -d %{_apache1dir}/conf.d ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache1dir}/conf.d/99_%{name}.conf - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi -fi -# apache2 -if [ -d %{_apache2dir}/httpd.conf ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi -fi - if [ "$1" = 1 ]; then %banner %{name} -e <&2 - fi - fi - # apache2 - if [ -d %{_apache2dir}/httpd.conf ]; then - rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi - fi -fi - %post -n openldap-schema-horde if ! grep -q %{schemadir}/horde.schema /etc/openldap/slapd.conf; then sed -i -e ' @@ -244,6 +213,18 @@ fi fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %triggerpostun -- horde <= 2.2.7-2 for i in horde.php html.php lang.php mime_drivers.php mime_mapping.php motd.php prefs.php registry.php; do if [ -f /home/services/httpd/html/horde/config/$i.rpmsave ]; then @@ -267,14 +248,14 @@ fi fi -if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then +if [ -f /etc/apache/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache1dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/apache/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi -if [ -f %{_apache2dir}/horde.conf.rpmsave ]; then +if [ -f /etc/httpd/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi # unified location @@ -284,11 +265,11 @@ fi if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 + /etc/rc.d/init.d/apache reload 1>&2 fi if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi %files @@ -317,6 +298,7 @@ %{_appdir}/themes %dir %attr(770,root,http) /var/log/%{name} +%dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log %files -n openldap-schema-horde @@ -329,6 +311,36 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96 2005/08/23 20:23:55 glen +- merged from DEVEL, updated to 3.0.5 + +Revision 1.95.2.9 2005/08/15 21:49:37 glen +- sorter BR/R with adapter + +Revision 1.95.2.8 2005/08/15 21:31:19 glen +- adapter "friendly" + +Revision 1.95.2.7 2005/07/31 10:52:01 glen +- include /var/lib/horde to package (one can store vfs tmp data there) + +Revision 1.95.2.6 2005/07/31 10:40:45 glen +- use apache config triggers + +Revision 1.95.2.5 2005/07/31 10:29:13 glen +- patch conf.xml, rather sed-ing + +Revision 1.95.2.4 2005/07/16 14:22:34 glen +- 3.0.5-RC2 + +Revision 1.95.2.3 2005/07/13 07:00:23 glen +- TODO updated + +Revision 1.95.2.2 2005/07/12 20:34:29 glen +- make df happy + +Revision 1.95.2.1 2005/07/12 20:19:57 glen +- 3.0.5-rc1 + Revision 1.95 2005/05/22 20:15:19 glen - fix for Ticket #2013. rel 6; STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.95&r2=1.96&f=u From glen at pld-linux.org Tue Aug 23 22:24:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: horde-3.0.5.tar.gz Message-ID: <14271.1124828668@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz Size: 3549687 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: ocaml-findlib.spec - updated to 1.0.4 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:25:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.4 ; STBR ---- Files affected: SPECS: ocaml-findlib.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.15 SPECS/ocaml-findlib.spec:1.16 --- SPECS/ocaml-findlib.spec:1.15 Mon Jun 6 16:24:03 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:25:31 2005 @@ -2,14 +2,14 @@ Summary: OCaml module manager Summary(pl): Zarz?dca modu??w OCamla Name: ocaml-findlib -Version: 0.8.1 -Release: 6 +Version: 1.0.4 +Release: 1 License: distributable Group: Development/Tools Vendor: Gerd Stolpmann URL: http://www.ocaml-programming.de/packages/ -# Source0-md5: b4643888d1a6626981113e23a92b9154 Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz +# Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -69,7 +69,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install PREFIX=$RPM_BUILD_ROOT +%{__make} install prefix=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli @@ -92,7 +92,7 @@ %files %defattr(644,root,root,755) -%doc README LICENSE doc/html +%doc README LICENSE doc/*-html %attr(755,root,root) %{_bindir}/* %config %{_sysconfdir}/ocamlfind.conf %{_libdir}/ocaml/site-lib @@ -105,7 +105,6 @@ %{_libdir}/ocaml/findlib/*.a %{_libdir}/ocaml/ocamlfind %{_libdir}/ocaml/topfind -%{_mandir}/man3/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -113,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/23 20:25:31 paszczus +- updated to 1.0.4 ; STBR + Revision 1.15 2005/06/06 14:24:03 zbyniu - BR: ncurses-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.15&r2=1.16&f=u From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: findlib-1.0.4.tar.gz Message-ID: <15253.1124828736@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ocaml-programming.de/packages/findlib-1.0.4.tar.gz dbfabe1b3677a03bcf238ecccb36d84f findlib-1.0.4.tar.gz Size: 148287 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:26:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SOURCES: horde-fix-config-blanks.patch (REMOVED) - outdated in 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:26:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated in 3.0.5 ---- Files affected: SOURCES: horde-fix-config-blanks.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paszczus at pld-linux.org Tue Aug 23 22:32:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: gollem.spec - updated to FINAL 1.0 In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:32:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to FINAL 1.0 ---- Files affected: SPECS: gollem.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.9 SPECS/gollem.spec:1.10 --- SPECS/gollem.spec:1.9 Tue Aug 2 22:29:34 2005 +++ SPECS/gollem.spec Tue Aug 23 22:32:23 2005 @@ -1,18 +1,15 @@ # $Revision$, $Date$ -%define _rc rc2 -%define _rel 1 - %include /usr/lib/rpm/macros.php Summary: Gollem - the Horde File Manager Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.%{_rc}.%{_rel} +Release: 0.1 License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/gollem/%{name}-%{version}-%{_rc}.tar.gz -# Source0-md5: c5270fd6603ddf21682e7dcbb41b195c +Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz +# Source0-md5: 29f668de08c0672169cbe52a80dc1771 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/gollem/ @@ -54,7 +51,7 @@ Gollema) mo?na znale?? na stronie . %prep -%setup -q -n %{name}-%{version}-%{_rc} +%setup -q -n %{name}-h3-%{version} tar zxf %{SOURCE0} --strip-components=1 %patch0 -p1 @@ -132,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 20:32:23 paszczus +- updated to FINAL 1.0 + Revision 1.9 2005/08/02 20:29:34 qboosh - typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.9&r2=1.10&f=u From paszczus at pld-linux.org Tue Aug 23 22:32:38 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: gollem-h3-1.0.tar.gz Message-ID: <18933.1124829158@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/gollem/gollem-h3-1.0.tar.gz 29f668de08c0672169cbe52a80dc1771 gollem-h3-1.0.tar.gz Size: 680558 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:34:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): adapter.spec - tests updated In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - tests updated ---- Files affected: SPECS: adapter.spec (1.26.2.6 -> 1.26.2.7) ---- Diffs: ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.6 SPECS/adapter.spec:1.26.2.7 --- SPECS/adapter.spec:1.26.2.6 Fri Jul 15 09:01:45 2005 +++ SPECS/adapter.spec Tue Aug 23 22:33:58 2005 @@ -35,13 +35,21 @@ %{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8} PreReq: sh-utils Requires(pre): /bin/id -Requires(pre): /usr/sbin/useradd Requires(post): /bin/hostname +Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/userdel Requires: pam >= 0.77.3 +Requires: ll +Requires: c +# this is comment to R: aaaa +Requires: aaaa Requires: daemontools >= 0.76-1.4 BuildRequires: rpm-pythonprov %{?with_home_etc:Requires: home-etc >= 1.0.8} +%{!?with_home_etc:Requires: home-etc <= 1} +Requires: poop +Conflicts: qmail-client1 +Requires: afterwards Conflicts: qmail-client Provides: group(nofiles) Obsoletes: zmailer @@ -134,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.7 2005/08/23 20:33:58 glen +- tests updated + Revision 1.26.2.6 2005/07/15 07:01:45 glen - fix fix-info-dir misuse in %post ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.6&r2=1.26.2.7&f=u From glen at pld-linux.org Tue Aug 23 22:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): adapter.awk, adapter.spec - replace name and versio... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - replace name and version with macros in %setup. req by PaSzCzUs ---- Files affected: SPECS: adapter.awk (1.171 -> 1.172) , adapter.spec (1.26.2.7 -> 1.26.2.8) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.171 SPECS/adapter.awk:1.172 --- SPECS/adapter.awk:1.171 Tue Aug 16 00:06:39 2005 +++ SPECS/adapter.awk Tue Aug 23 22:34:51 2005 @@ -206,6 +206,11 @@ sub(/^%setup/, "%setup -q") } + if (/^%setup/) { + gsub(name, "%{name}"); + gsub(version, "%{version}"); + } + if (/^%setup/ && /-n %{name}-%{version}( |$)/) { sub(/ -n %{name}-%{version}/, "") } ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.7 SPECS/adapter.spec:1.26.2.8 --- SPECS/adapter.spec:1.26.2.7 Tue Aug 23 22:33:58 2005 +++ SPECS/adapter.spec Tue Aug 23 22:34:51 2005 @@ -64,6 +64,7 @@ - this one gets wrapped, but logically it shouldn't due bcond %prep +%setup -q -n adapter-0.666 %setup -q -n %{name}-%{version} %setup -q -c -n %{name}-%{version} %setup -q -n %{name}-%{version}.orig -a 1 @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.8 2005/08/23 20:34:51 glen +- replace name and version with macros in %setup. req by PaSzCzUs + Revision 1.26.2.7 2005/08/23 20:33:58 glen - tests updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.171&r2=1.172&f=u http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.7&r2=1.26.2.8&f=u From paszczus at pld-linux.org Tue Aug 23 22:38:49 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: pcre-ocaml-5.10.1.tar.bz2 Message-ID: <23014.1124829529@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-5.10.1.tar.bz2 d53864f6a0436e40c3cdedcdc8352aba pcre-ocaml-5.10.1.tar.bz2 Size: 46328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:38:42 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: ocaml-pcre.spec - updated to 5.10.1 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:38:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 5.10.1 ; STBR ---- Files affected: SPECS: ocaml-pcre.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/ocaml-pcre.spec diff -u SPECS/ocaml-pcre.spec:1.8 SPECS/ocaml-pcre.spec:1.9 --- SPECS/ocaml-pcre.spec:1.8 Thu Mar 17 10:02:37 2005 +++ SPECS/ocaml-pcre.spec Tue Aug 23 22:38:35 2005 @@ -2,13 +2,13 @@ Summary: PCRE binding for OCaml Summary(pl): Wi?zania PCRE dla OCamla Name: ocaml-pcre -Version: 5.09.0 +Version: 5.10.1 Release: 1 License: LGPL Group: Libraries Vendor: Markus Mottl Source0: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-%{version}.tar.bz2 -# Source0-md5: 070e556348e050c4d3d75e8917e7e322 +# Source0-md5: d53864f6a0436e40c3cdedcdc8352aba URL: http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html BuildRequires: pcre-devel BuildRequires: ocaml-findlib @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 20:38:35 paszczus +- updated to 5.10.1 ; STBR + Revision 1.8 2005/03/17 09:02:37 paszczus - updated to 5.09.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-pcre.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Tue Aug 23 22:39:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: ocaml-findlib.spec - unified, pl cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:39:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified, pl cosmetics ---- Files affected: SPECS: ocaml-findlib.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.16 SPECS/ocaml-findlib.spec:1.17 --- SPECS/ocaml-findlib.spec:1.16 Tue Aug 23 22:25:31 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:39:40 2005 @@ -7,9 +7,9 @@ License: distributable Group: Development/Tools Vendor: Gerd Stolpmann -URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz # Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f +URL: http://www.ocaml-programming.de/packages/ BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -26,9 +26,9 @@ %description -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. %package devel Summary: OCaml module manager @@ -46,9 +46,9 @@ %description devel -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba. @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 20:39:40 qboosh +- unified, pl cosmetics + Revision 1.16 2005/08/23 20:25:31 paszczus - updated to 1.0.4 ; STBR @@ -164,4 +167,3 @@ Revision 1.1 2002/05/10 11:32:51 malekith - initial; from scratch - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Tue Aug 23 22:41:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: macromedia-flash.spec - updated pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:41:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl desc ---- Files affected: SPECS: macromedia-flash.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.34 SPECS/macromedia-flash.spec:1.35 --- SPECS/macromedia-flash.spec:1.34 Tue Aug 23 22:00:05 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:41:27 2005 @@ -50,7 +50,7 @@ %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -Supported browsers: %{browsers}. +Obs?ugiwane przegl?darki: %{browsers}. %prep %if %{with license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/23 20:41:27 qboosh +- updated pl desc + Revision 1.34 2005/08/23 20:00:05 glen - update URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Tue Aug 23 22:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: web-cyradm.spec - pl fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fixes ---- Files affected: SPECS: web-cyradm.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.1 SPECS/web-cyradm.spec:1.2 --- SPECS/web-cyradm.spec:1.1 Tue Aug 23 16:02:14 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 22:48:55 2005 @@ -8,8 +8,8 @@ %define version_major 0.5.4 %define version_minor 1 # -Summary: Cyrus-IMAP based mail accounts managment system. -Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Summary: Cyrus-IMAP based mail accounts managment system +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP Name: web-cyradm Version: %{version_major}.%{version_minor} Release: 0.1 @@ -21,9 +21,9 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ Requires: mysql -Requires: webserver Requires: php Requires: php-gettext +Requires: webserver BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,25 +44,28 @@ and superusers - Sieve functions like forwarding single e-mail adresses and out-of-office replies - - Enable/Disable different services like imap, pop, sieve and stmp + - Enable/Disable different services like imap, pop, sieve and smtp for particular users - Support for MySQL and PostgreSQL databases - Storing passwords in crypt, md5 or MySQL passwd compatible format %description -l pl -Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Web-cyradm jest oprogramowaniem sklejaj?cym wiele technologii Open Source w jeden du?y system pocztowy. Mo?liwo?ci: - - Administracja wieloma wirtualnymu domenami - - Zarz?dzanie kontami urzytkownik?w - - Mapowanie kont urzytkownik?w na adresy e-mail + - Administrowanie wieloma wirtualnymi domenami + - Zarz?dzanie kontami u?ytkownik?w + - Mapowanie kont u?ytkownik?w na adresy e-mail - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Ustawianie limit?w dla u?ytkownik?w i domen - Delegacja zada? do administrator?w domen - Resetowanie hase? u?ytkownikom przez administrator?w domen - - Filtry poczty Sieve - - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w - - Wsparcie dla MySQL'a i PostgreSQL'a + - Funkcje Sieve, takie jak przekazywanie pojedynczych adres?w e-mail + czy automatyczne odpowiedzi o nieobecno?ci + - W??czanie i wy??czanie us?ug (imap, pop, sieve, smtp) dla + poszczeg?lnych u?ytkownik?w + - Obsluga baz MySQL i PostgreSQL - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() %prep @@ -131,6 +134,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/23 20:48:55 qboosh +- pl fixes + Revision 1.1 2005/08/23 14:02:14 kosmo - initial release. - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 22:56:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: rlocate.spec - don't link scripts (causes EPERM) In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:56:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't link scripts (causes EPERM) ---- Files affected: SPECS: rlocate.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.31 SPECS/rlocate.spec:1.32 --- SPECS/rlocate.spec:1.31 Mon Aug 22 22:56:51 2005 +++ SPECS/rlocate.spec Tue Aug 23 22:56:04 2005 @@ -137,7 +137,6 @@ ln -sf %{_kernelsrcdir}/config-$cfg .config ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm - ln -sf %{_kernelsrcdir}/scripts scripts touch include/config/MARKER echo "EXTRA_CFLAGS:= -DRL_VERSION=\\\"%{version}\\\" -DRLOCATE_UPDATES" > Makefile @@ -253,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 20:56:04 qboosh +- don't link scripts (causes EPERM) + Revision 1.31 2005/08/22 20:56:51 paszczus - fixed %files, cron and init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 23:03:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde-nag.spec - 2.0.2 final In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:03:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 final ---- Files affected: SPECS: horde-nag.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.3 SPECS/horde-nag.spec:1.4 --- SPECS/horde-nag.spec:1.3 Tue Aug 2 22:28:41 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:03:03 2005 @@ -3,20 +3,20 @@ # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec -%define _rc rc1 -%define _rel 5 +#define _rc rc1 +%define _rel 0.1 %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? Name: nag Version: 2.0.2 -Release: %{_rc}.%{_rel} +Release: %{?_rc:%{_rc}.}%{_rel} License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}-%{_rc}.tar.gz -# Source0-md5: c6f572411894f706df19f8b649a11b2e +Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +# Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/nag/ @@ -55,7 +55,7 @@ Naga) mo?na znale?? na stronie . %prep -%setup -q -n nag-h3-%{version}-%{_rc} +%setup -q -n %{?_snap:nag}%{!?_snap:nag-h3-%{version}%{?_rc:-%{_rc}}} %install rm -rf $RPM_BUILD_ROOT @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 21:03:03 glen +- 2.0.2 final + Revision 1.3 2005/08/02 20:28:41 qboosh - pl, copy-pasto ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 23:03:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: nag-h3-2.0.2.tar.gz Message-ID: <8202.1124831003@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/nag/nag-h3-2.0.2.tar.gz 7aa928522dadda94f02dfcbc5fb90058 nag-h3-2.0.2.tar.gz Size: 1050906 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 23:06:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: rlocate.spec - rel 0.2, so still not finished... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:06:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2, so still not finished... ---- Files affected: SPECS: rlocate.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.32 SPECS/rlocate.spec:1.33 --- SPECS/rlocate.spec:1.32 Tue Aug 23 22:56:04 2005 +++ SPECS/rlocate.spec Tue Aug 23 23:05:58 2005 @@ -20,7 +20,7 @@ Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate Version: 0.3.2 -%define _rel 0.1 +%define _rel 0.2 Release: %{_rel} License: GPL Group: Base @@ -252,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 21:05:58 paszczus +- rel 0.2, so still not finished... + Revision 1.32 2005/08/23 20:56:04 qboosh - don't link scripts (causes EPERM) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.32&r2=1.33&f=u From glen at pld-linux.org Tue Aug 23 23:08:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde-nag.spec - unify with horde-passwd.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:08:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unify with horde-passwd.spec ---- Files affected: SPECS: horde-nag.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.4 SPECS/horde-nag.spec:1.5 --- SPECS/horde-nag.spec:1.4 Tue Aug 23 23:03:03 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:08:02 2005 @@ -2,10 +2,12 @@ # TODO # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec +# - or forget it and rename all horde packages to horde-*.spec #define _rc rc1 -%define _rel 0.1 +%define _rel 0.3 +%define _hordeapp nag %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? @@ -15,7 +17,7 @@ License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +Source0: ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}.tar.gz # Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch @@ -34,7 +36,7 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define _appdir %{hordedir}/%{_hordeapp} %description Nag is the Horde task list application. It stores todo items, things @@ -59,33 +61,33 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi if [ "$1" = 1 ]; then @@ -100,12 +102,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml %dir %{_appdir} %{_appdir}/*.php @@ -122,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 21:08:02 glen +- unify with horde-passwd.spec + Revision 1.4 2005/08/23 21:03:03 glen - 2.0.2 final ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 23:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde-passwd.spec - 2005-08-23 snap In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:20:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005-08-23 snap ---- Files affected: SPECS: horde-passwd.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.17 SPECS/horde-passwd.spec:1.18 --- SPECS/horde-passwd.spec:1.17 Tue Aug 23 10:00:47 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:20:29 2005 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +%define _snap 2005-08-23 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -6,14 +8,15 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.12 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 +#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,7 +49,7 @@ modu?. %prep -%setup -q -n passwd-h3-%{version}-beta +%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -72,7 +75,7 @@ cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf @@ -138,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/23 21:20:29 glen +- 2005-08-23 snap + Revision 1.17 2005/08/23 08:00:47 paszczus - little clean ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Tue Aug 23 23:20:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: passwd-HEAD-2005-08-23.tar.gz Message-ID: <17201.1124832048@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-23/passwd-HEAD-2005-08-23.tar.gz 15944d881c02ce24379d58a4bb613ab1 passwd-HEAD-2005-08-23.tar.gz Size: 903848 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 23:22:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde-passwd.spec - don't package .htaccess In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:22:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't package .htaccess ---- Files affected: SPECS: horde-passwd.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.18 SPECS/horde-passwd.spec:1.19 --- SPECS/horde-passwd.spec:1.18 Tue Aug 23 23:20:29 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:22:27 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-23 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -52,6 +52,7 @@ %setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 +rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 21:22:27 glen +- don't package .htaccess + Revision 1.18 2005/08/23 21:20:29 glen - 2005-08-23 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 23:23:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SOURCES (DEVEL): horde-passwd.conf, imp.conf - vim modeline In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:23:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - vim modeline ---- Files affected: SOURCES: horde-passwd.conf (1.2 -> 1.3) , imp.conf (1.3 -> 1.3.2.1) ---- Diffs: ================================================================ Index: SOURCES/horde-passwd.conf diff -u SOURCES/horde-passwd.conf:1.2 SOURCES/horde-passwd.conf:1.3 --- SOURCES/horde-passwd.conf:1.2 Tue Nov 9 11:46:43 2004 +++ SOURCES/horde-passwd.conf Tue Aug 23 23:23:39 2005 @@ -21,3 +21,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ Index: SOURCES/imp.conf diff -u SOURCES/imp.conf:1.3 SOURCES/imp.conf:1.3.2.1 --- SOURCES/imp.conf:1.3 Thu Oct 28 20:31:10 2004 +++ SOURCES/imp.conf Tue Aug 23 23:23:39 2005 @@ -22,3 +22,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-passwd.conf?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/imp.conf?r1=1.3&r2=1.3.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 23:51:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: horde-passwd.spec - added one more noautoreq - please do no... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:51:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added one more noautoreq - please do not remove it... ---- Files affected: SPECS: horde-passwd.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.19 SPECS/horde-passwd.spec:1.20 --- SPECS/horde-passwd.spec:1.19 Tue Aug 23 23:22:27 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:51:45 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' +%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/23 21:51:45 paszczus +- added one more noautoreq - please do not remove it... + Revision 1.19 2005/08/23 21:22:27 glen - don't package .htaccess ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.19&r2=1.20&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): gtksourceview.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:52:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gtksourceview.spec (1.26.4.2 -> 1.26.4.3) ---- Diffs: ================================================================ Index: SPECS/gtksourceview.spec diff -u SPECS/gtksourceview.spec:1.26.4.2 SPECS/gtksourceview.spec:1.26.4.3 --- SPECS/gtksourceview.spec:1.26.4.2 Sun Aug 21 10:22:59 2005 +++ SPECS/gtksourceview.spec Tue Aug 23 23:52:19 2005 @@ -2,12 +2,12 @@ Summary: Text widget that extends the standard GTK+ 2.x Summary(pl): Widget tekstowy rozszerzaj?cy standardowy z GTK+ 2.x Name: gtksourceview -Version: 1.3.91 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ce519c2eba2adaabe908f12f953916cc +# Source0-md5: 998b7ab6ffdc661943fa1d610d7d82b7 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.4.3 2005/08/23 21:52:19 aflinta +- 1.3.92 + Revision 1.26.4.2 2005/08/21 08:22:59 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtksourceview.spec?r1=1.26.4.2&r2=1.26.4.3&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: gtksourceview-1.3.92.tar.bz2 Message-ID: <3655.1124833949@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/gtksourceview-1.3.92.tar.bz2 998b7ab6ffdc661943fa1d610d7d82b7 gtksourceview-1.3.92.tar.bz2 Size: 698267 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: zenity-2.11.92.tar.bz2 Message-ID: <4479.1124834035@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/zenity-2.11.92.tar.bz2 b6ea8f5f1b46fd9409d11a2c31d6a5e3 zenity-2.11.92.tar.bz2 Size: 648483 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): zenity.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:53:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: zenity.spec (1.25.2.4 -> 1.25.2.5) ---- Diffs: ================================================================ Index: SPECS/zenity.spec diff -u SPECS/zenity.spec:1.25.2.4 SPECS/zenity.spec:1.25.2.5 --- SPECS/zenity.spec:1.25.2.4 Mon Aug 8 15:41:52 2005 +++ SPECS/zenity.spec Tue Aug 23 23:53:51 2005 @@ -2,12 +2,12 @@ Summary: The GNOME port of dialog Summary(pl): Port dialog dla GNOME Name: zenity -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a4bd15f652d5464cc77b562accd0d52c +# Source0-md5: b6ea8f5f1b46fd9409d11a2c31d6a5e3 URL: http://freshmeat.net/projects/zenity/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25.2.5 2005/08/23 21:53:51 aflinta +- 2.11.92 + Revision 1.25.2.4 2005/08/08 13:41:52 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/zenity.spec?r1=1.25.2.4&r2=1.25.2.5&f=u From glen at pld-linux.org Tue Aug 23 23:57:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: php-pear-Crypt_CHAP.spec - R php-mhash In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:57:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R php-mhash ---- Files affected: SPECS: php-pear-Crypt_CHAP.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/php-pear-Crypt_CHAP.spec diff -u SPECS/php-pear-Crypt_CHAP.spec:1.12 SPECS/php-pear-Crypt_CHAP.spec:1.13 --- SPECS/php-pear-Crypt_CHAP.spec:1.12 Fri Dec 3 22:57:03 2004 +++ SPECS/php-pear-Crypt_CHAP.spec Tue Aug 23 23:57:02 2005 @@ -17,6 +17,7 @@ URL: http://pear.php.net/package/Crypt_CHAP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear +Requires: php-mhash BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -63,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 21:57:02 glen +- R php-mhash + Revision 1.12 2004/12/03 21:57:03 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Crypt_CHAP.spec?r1=1.12&r2=1.13&f=u From kosmo at pld-linux.org Wed Aug 24 00:36:26 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (AC-branch): beecrypt.spec - fixed _without_java bcond In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 22:36:26 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - fixed _without_java bcond ---- Files affected: SPECS: beecrypt.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/beecrypt.spec diff -u SPECS/beecrypt.spec:1.36.2.4 SPECS/beecrypt.spec:1.36.2.5 --- SPECS/beecrypt.spec:1.36.2.4 Sun Jun 19 19:43:32 2005 +++ SPECS/beecrypt.spec Wed Aug 24 00:36:19 2005 @@ -220,9 +220,11 @@ $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.la > $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.la mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.a $RPM_BUILD_ROOT%{_libdir}/ +%if %{with java} mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt_java* $RPM_BUILD_ROOT%{_libdir}/ %{__sed} -i "s|libdir='%{_libaltdir}'|libdir='%{_libdir}'|" \ $RPM_BUILD_ROOT%{_libdir}/libbeecrypt_java.la +%endif rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} @@ -283,6 +285,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/23 22:36:19 kosmo +- fixed _without_java bcond + Revision 1.36.2.4 2005/06/19 17:43:32 baggins - release 4 - moved so lib to /lib ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/beecrypt.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From glen at pld-linux.org Wed Aug 24 00:42:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: php4-mcache.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:42:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-mcache.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.7 SPECS/php4-mcache.spec:1.8 --- SPECS/php4-mcache.spec:1.7 Tue Aug 23 14:42:29 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:42:47 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ %define _name mcache %define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: mcache PHP Extension Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.1 +Release: 0.beta%{_beta}.5 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -16,12 +17,13 @@ URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 +BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel Requires: php4-common = %{php_ver} +Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 %define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -78,21 +80,28 @@ %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_name} %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_name} %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README index.html %doc mcache.php +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/mcache.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -101,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 22:42:47 glen +- use .ini file in conf.d directory + Revision 1.7 2005/08/23 12:42:29 glen - up to 1.2.0-beta7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Wed Aug 24 00:46:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: php4-mcache.spec - use %requires_eq_to macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %requires_eq_to macro ---- Files affected: SPECS: php4-mcache.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.8 SPECS/php4-mcache.spec:1.9 --- SPECS/php4-mcache.spec:1.8 Wed Aug 24 00:42:47 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:46:45 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ %define _name mcache -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) %define _sysconfdir /etc/php4 Summary: mcache PHP Extension @@ -8,7 +7,7 @@ Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.5 +Release: 0.beta%{_beta}.7 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -19,7 +18,7 @@ BuildRequires: libmemcache-devel >= 1.3.0 BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel -Requires: php4-common = %{php_ver} +%requires_eq_to php4-common php4-devel Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 22:46:45 glen +- use %requires_eq_to macro + Revision 1.8 2005/08/23 22:42:47 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.8&r2=1.9&f=u From charles at pld-linux.org Wed Aug 24 01:26:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: libtheora.spec - updated to 1.0alpha5 - clear optflags, BR:... In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 23:26:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0alpha5 - clear optflags, BR: sed >= 4.0 ---- Files affected: SPECS: libtheora.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/libtheora.spec diff -u SPECS/libtheora.spec:1.7 SPECS/libtheora.spec:1.8 --- SPECS/libtheora.spec:1.7 Wed May 25 14:33:42 2005 +++ SPECS/libtheora.spec Wed Aug 24 01:26:47 2005 @@ -3,12 +3,12 @@ Summary(pl): Theora - kodek obrazu do u?ywania w systemie strumieni multimedialnych Ogg Name: libtheora Version: 1.0 -%define bver alpha4 -Release: 0.%{bver}.2 +%define bver alpha5 +Release: 0.%{bver}.1 License: BSD-like Group: Libraries -Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.gz -# Source0-md5: 75f436a980b80f8b8102ee182ddb8748 +Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.bz2 +# Source0-md5: 41940562932a8b7bf795d79e4190b21a URL: http://www.theora.org/ BuildRequires: SDL-devel BuildRequires: autoconf @@ -18,6 +18,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel >= 1:1.0.1 BuildRequires: pkgconfig +BuildRequires: sed >= 4.0 Requires: libogg >= 2:1.1 Requires: libvorbis >= 1:1.0.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -64,8 +65,10 @@ %setup -q -n %{name}-%{version}%{bver} %build +%{__sed} -i 's,CFLAGS="-g -O2 ,CFLAGS=",' configure.ac + %{__libtoolize} -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__automake} %configure @@ -108,6 +111,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 23:26:47 charles +- updated to 1.0alpha5 +- clear optflags, BR: sed >= 4.0 + Revision 1.7 2005/05/25 12:33:42 pluto - release .2 for Th. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libtheora.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 01:27:08 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: libtheora-1.0alpha5.tar.bz2 Message-ID: <636.1124839628@distfiles.pld-linux.org> Files fetched: 1 STORED: http://downloads.xiph.org/releases/theora/libtheora-1.0alpha5.tar.bz2 41940562932a8b7bf795d79e4190b21a libtheora-1.0alpha5.tar.bz2 Size: 1765512 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Wed Aug 24 01:27:39 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 09:14:05 2005 Subject: PLD-doc/queue/system.sec Message-ID: <6332@svn.pld-linux.org> Author: qwiat Date: Wed Aug 24 01:27:36 2005 New Revision: 6332 Added: PLD-doc/queue/system.sec Log: - prawie gotowy opis pliku /etc/sysconfig/system Added: PLD-doc/queue/system.sec ============================================================================== --- (empty file) +++ PLD-doc/queue/system.sec Wed Aug 24 01:27:36 2005 @@ -0,0 +1,89 @@ + +
+Podstawowe ustawienia systemu + + Plik /etc/sysconfig/system przechowuje + zaawansowan? konfiguracj? systemu, poni?ej przedstawiono opis + cz??ci z nich. + + +
+ Konfiguracja skrypt?w startowych + + Zmienna okre?la czy skrypty startowe maj? u?ywa? kolor?w: + COLOR_INIT=yes + + + Numer kolumny wy?wietlania statusu skryptu startowego: + INIT_COL=75 + + + Szybsze uruchomienie systemu z pomini?ciem niekt?rych skrypt?w, + startowych - m.in. skryptu od obs?ugi j?zyk?w. + FASTRC=no + + + Zezwolenie na interaktywny start rc-skrypt?w po wci?ni?ciu + klawisza "I": + PROMPT=yes + +
+ + +
+ Opcje zwi?zane z j?drem + + "Gadatliwo??" kernela dla komunikat?w wysy?anych na konsol? + tekstow?. Opcja jest jednoznaczna z wywo?aniem polecenia + dmesg -n {$nr} (domyslnie 1): + CONSOLE_LOGLEVEL=1 + + + Czas w sekundach, po kt?rym nast?pi restart maszyny je?li wyst?pi? + krytyczny b??d j?dra (kernel panic). Wa?na opcja w przypadku + komputer?w do kt?rych nie mamy fizycznego dost?pu + PANIC_REBOOT_TIME=60 + +
+ + +
+ Opcje uruchamiania systemu + + Uruchomienie programu sulogin (pytanie o has?o root-a) zamiast + pow?oki je?li wyst?pi? problemy w trakcie uruchomienia; + RUN_SULOGIN_ON_ERR=yes + + + Warto?? "yes" poni?szej zmiennej pozwala na zalogowanie + si? u?ytkownik?w dopiero po zako?czeniu procesu ?adowania + systemu. + DELAY_LOGIN=yes + + + Opcja okre?la czy pod czas startu ma by? usuwana zawarto?? + katalogu /tmp + CLEAN_TMP=yes + + + Wskazuje czy ma by? zamontowany system plik?w devfs + MOUNT_DEVFS=no + +
+ +
+ Us?ugi + + Domy?lny priorytet (liczba nice) dla us?ug o ile + ta warto?? nie zosta?a zdefiniowana w zmiennej SERVICE_RUN_NICE_LEVEL + umieszczonej w /etc/sysconfig/{$us?uga}: + DEFAULT_SERVICE_RUN_NICE_LEVEL=0 + + + Lista katalog?w przechowuj?cych systemy typu chroot. Warto?? + ta jest odczytywana przez skrypt + /etc/init.d/sys-chroots: + SYSTEM_CHROOTS=/jakis_katalog + +
+
From charles at pld-linux.org Wed Aug 24 02:00:19 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: mkvtoolnix.spec - updated to 1.5.5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 00:00:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5.5 ---- Files affected: SPECS: mkvtoolnix.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.5 SPECS/mkvtoolnix.spec:1.6 --- SPECS/mkvtoolnix.spec:1.5 Sun Jul 3 21:29:39 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 02:00:08 2005 @@ -5,12 +5,12 @@ Summary: Matroska video utilities Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix -Version: 1.5.0 +Version: 1.5.5 Release: 0.1 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 -# Source0-md5: 71c447f02ee306dbff53804c770b5ff3 +# Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 00:00:08 charles +- updated to 1.5.5 + Revision 1.5 2005/07/03 19:29:39 charles - updated to 1.5.0 (now build gui) - updated TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 02:00:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: mkvtoolnix-1.5.5.tar.bz2 Message-ID: <11871.1124841627@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-1.5.5.tar.bz2 f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 mkvtoolnix-1.5.5.tar.bz2 Size: 648667 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:54:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92.1 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:54:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92.1 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.7 -> 1.152.2.8) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.7 SPECS/gnome-applets.spec:1.152.2.8 --- SPECS/gnome-applets.spec:1.152.2.7 Tue Aug 23 14:04:08 2005 +++ SPECS/gnome-applets.spec Wed Aug 24 08:54:24 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.92 +Version: 2.11.92.1 Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e +# Source0-md5: 035684af82060eb19af881d70a822478 Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -34,7 +34,7 @@ BuildRequires: intltool >= 0.33 BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgtop-devel >= 1:2.10.0 +BuildRequires: libgtop-devel >= 1:2.11.92 BuildRequires: libtool BuildRequires: libwnck-devel >= 2.11.91 BuildRequires: libxml2-devel >= 1:2.6.19 @@ -748,6 +748,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.8 2005/08/24 06:54:24 paladine +- updated to 2.11.92.1 + Revision 1.152.2.7 2005/08/23 12:04:08 paladine - updated to 2.11.92 - updated %%files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.7&r2=1.152.2.8&f=u From paladine at pld-linux.org Wed Aug 24 08:54:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: gnome-applets-2.11.92.1.tar.bz2 Message-ID: <2520.1124866476@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.1.tar.bz2 035684af82060eb19af881d70a822478 gnome-applets-2.11.92.1.tar.bz2 Size: 3786672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: gnome-backgrounds-2.11.92.tar.bz2 Message-ID: <4125.1124866647@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/gnome-backgrounds-2.11.92.tar.bz2 580d2feea8f522ffaa77f71d53dcbcc9 gnome-backgrounds-2.11.92.tar.bz2 Size: 1767324 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:24 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS (DEVEL): gnome-backgrounds.spec - updated to 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:57:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 ---- Files affected: SPECS: gnome-backgrounds.spec (1.8 -> 1.8.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-backgrounds.spec diff -u SPECS/gnome-backgrounds.spec:1.8 SPECS/gnome-backgrounds.spec:1.8.2.1 --- SPECS/gnome-backgrounds.spec:1.8 Fri Jul 8 16:29:08 2005 +++ SPECS/gnome-backgrounds.spec Wed Aug 24 08:57:18 2005 @@ -2,12 +2,12 @@ Summary: Set of backgrounds for GNOME desktop Summary(pl): Zestaw tapet dla ?rodowiska GNOME Name: gnome-backgrounds -Version: 2.10.2 +Version: 2.11.92 Release: 1 License: GPL v2 Group: Themes -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b6cf2ed37c4b6ef4982dee0a5d9226 +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 580d2feea8f522ffaa77f71d53dcbcc9 URL: http://www.gnome.org/ BuildRequires: intltool >= 0.33 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8.2.1 2005/08/24 06:57:18 paladine +- updated to 2.11.92 + Revision 1.8 2005/07/08 14:29:08 freetz - 2.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-backgrounds.spec?r1=1.8&r2=1.8.2.1&f=u From glen at pld-linux.org Wed Aug 24 09:11:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SOURCES: qemu-ifup.patch (NEW) - patch to override qemu-ifup path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:11:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch to override qemu-ifup path ---- Files affected: SOURCES: qemu-ifup.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/qemu-ifup.patch diff -u /dev/null SOURCES/qemu-ifup.patch:1.1 --- /dev/null Wed Aug 24 09:11:48 2005 +++ SOURCES/qemu-ifup.patch Wed Aug 24 09:11:43 2005 @@ -0,0 +1,11 @@ +--- ./vl.c~ 2005-08-20 16:14:48.000000000 +0300 ++++ ./vl.c 2005-08-21 14:05:26.000000000 +0300 +@@ -85,7 +85,7 @@ + + //#define DO_TB_FLUSH + +-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" ++#define DEFAULT_NETWORK_SCRIPT "/sbin/qemu-ifup" + + //#define DEBUG_UNUSED_IOPORT + //#define DEBUG_IOPORT ================================================================ From glen at pld-linux.org Wed Aug 24 09:12:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: qemu.spec - supply /sbin/qemu-ifup script In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:12:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - supply /sbin/qemu-ifup script ---- Files affected: SPECS: qemu.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/qemu.spec diff -u SPECS/qemu.spec:1.33 SPECS/qemu.spec:1.34 --- SPECS/qemu.spec:1.33 Sat Aug 20 07:54:55 2005 +++ SPECS/qemu.spec Wed Aug 24 09:12:17 2005 @@ -16,7 +16,7 @@ Summary(pl): QEMU - emulator procesora Name: qemu Version: 0.7.1 -%define _rel 1 +%define _rel 1.4 Release: %{_rel}%{?with_kqemu:k} License: GPL Group: Applications/Emulators @@ -37,6 +37,7 @@ Patch6: %{name}-gcc4_ppc.patch Patch7: %{name}-parallel.patch Patch8: %{name}-nosdlgui.patch +Patch9: %{name}-ifup.patch URL: http://fabrice.bellard.free.fr/qemu/ BuildRequires: SDL-devel >= 1.2.1 %if %{with kqemu} && %{with dist_kernel} @@ -127,6 +128,7 @@ %patch6 -p1 %patch7 -p1 %{?with_nosdlgui:%patch8 -p1} +%patch9 -p1 %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure %{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile @@ -181,6 +183,16 @@ %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/sbin +cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup +#!/bin/sh +if [ -f /etc/sysconfig/qemu ]; then + . /etc/sysconfig/qemu +fi +# of course this will work only for one interface. a lot possible to involve +sudo /sbin/ifconfig $1 ${INTERFACE_ADDR:-172.20.0.1} +EOF %endif %if %{with kernel} @@ -217,11 +229,11 @@ %postun -n kernel-smp-misc-kqemu %depmod %{_kernel_ver}smp - %if %{with userspace} %files %defattr(644,root,root,755) %doc README qemu-doc.html qemu-tech.html +%attr(755,root,root) /sbin/qemu-ifup %attr(755,root,root) %{_bindir}/* %{_datadir}/qemu %{_mandir}/man1/qemu.1* @@ -250,6 +262,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/24 07:12:17 glen +- supply /sbin/qemu-ifup script + Revision 1.33 2005/08/20 05:54:55 charles - separated kernel modules + bconds - updated BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.33&r2=1.34&f=u From paladine at pld-linux.org Wed Aug 24 09:12:48 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: gtk-engines-2.6.5.tar.bz2 Message-ID: <12768.1124867568@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.5.tar.bz2 28469a797ba1e6aaa3f7eea4c9f5f9b7 gtk-engines-2.6.5.tar.bz2 Size: 477897 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:12:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: gtk2-engines.spec - updated to 2.6.5 - sorted and fixed %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:12:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.5 - sorted and fixed %%files ---- Files affected: SPECS: gtk2-engines.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/gtk2-engines.spec diff -u SPECS/gtk2-engines.spec:1.35 SPECS/gtk2-engines.spec:1.36 --- SPECS/gtk2-engines.spec:1.35 Wed Jul 27 21:42:55 2005 +++ SPECS/gtk2-engines.spec Wed Aug 24 09:12:40 2005 @@ -2,13 +2,13 @@ Summary: Default GTK+2 theme engines Summary(pl): Motywy do GTK+2 Name: gtk2-engines -Version: 2.6.4 +Version: 2.6.5 Release: 1 Epoch: 1 License: GPL Group: Themes/GTK+ Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-%{version}.tar.bz2 -# Source0-md5: 3389a92b62b9c8b916fbb52c4529f072 +# Source0-md5: 28469a797ba1e6aaa3f7eea4c9f5f9b7 URL: http://gtk.themes.org/ BuildRequires: autoconf BuildRequires: automake @@ -70,17 +70,17 @@ %files %defattr(644,root,root,755) %doc ChangeLog README -%dir %{_libdir}/gtk-2.0/*/engines -%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so -%{_pkgconfigdir}/* %{_datadir}/themes/Clearlooks %{_datadir}/themes/Crux -%{_datadir}/themes/Industrial +%{_datadir}/themes/Industrial/* %{_datadir}/themes/LighthouseBlue %{_datadir}/themes/Metal/* %{_datadir}/themes/Mist %{_datadir}/themes/Redmond %{_datadir}/themes/ThinIce/* +%dir %{_libdir}/gtk-2.0/*/engines +%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so +%{_pkgconfigdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -88,6 +88,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:12:40 paladine +- updated to 2.6.5 +- sorted and fixed %%files + Revision 1.35 2005/07/27 19:42:55 freetz - 2.6.4, makefile path already included ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk2-engines.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: conary.spec - updated to 0.61.10 In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:23:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.61.10 ---- Files affected: SPECS: conary.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.35 SPECS/conary.spec:1.36 --- SPECS/conary.spec:1.35 Wed Aug 3 09:12:37 2005 +++ SPECS/conary.spec Wed Aug 24 09:23:12 2005 @@ -2,13 +2,14 @@ Summary: Distributed software management system for Linux distributions Summary(pl): Rozproszony system zarz?dzania oprogramowaniem dla dystrybucji Linuksa Name: conary -Version: 0.61.6 +Version: 0.61.10 Release: 0.1 License: CPL 1.0 Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 -# Source0-md5: 6d81530fe8561537a9b1d743cf207cd7 +# Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb URL: http://wiki.specifixinc.com/ +BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 Requires: python-devel-tools @@ -84,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:23:12 paszczus +- updated to 0.61.10 + Revision 1.35 2005/08/03 07:12:37 paszczus - updated to 0.61.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: DISTFILES: conary-0.61.10.tar.bz2 Message-ID: <18443.1124868207@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://download.rpath.com/pub/conary/conary-0.61.10.tar.bz2 2779696b7c6b24d5dc07c348e7743dfb conary-0.61.10.tar.bz2 Size: 384469 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Wed Aug 24 09:27:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: conary.spec - updated URL (thx glen) In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:27:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL (thx glen) ---- Files affected: SPECS: conary.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.36 SPECS/conary.spec:1.37 --- SPECS/conary.spec:1.36 Wed Aug 24 09:23:12 2005 +++ SPECS/conary.spec Wed Aug 24 09:27:21 2005 @@ -8,7 +8,7 @@ Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 # Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb -URL: http://wiki.specifixinc.com/ +URL: http://wiki.conary.com/ BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 @@ -85,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/24 07:27:21 paszczus +- updated URL (thx glen) + Revision 1.36 2005/08/24 07:23:12 paszczus - updated to 0.61.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.36&r2=1.37&f=u From jareq at pld-linux.org Wed Aug 24 09:34:35 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 09:14:05 2005 Subject: SPECS: monotone.spec - updated to 0.22 - rel 1 In-Reply-To: References: Message-ID: Author: jareq Date: Wed Aug 24 07:34:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.22 - rel 1 ---- Files affected: SPECS: monotone.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/monotone.spec diff -u SPECS/monotone.spec:1.13 SPECS/monotone.spec:1.14 --- SPECS/monotone.spec:1.13 Mon Jul 25 23:18:15 2005 +++ SPECS/monotone.spec Wed Aug 24 09:34:30 2005 @@ -6,12 +6,12 @@ Summary: A free distributed version control system Summary(pl): Wolnodost?pny rozproszony system kontroli wersji Name: monotone -Version: 0.21 -Release: 3 +Version: 0.22 +Release: 1 License: GPL v2 Group: Development/Version Control Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz -# Source0-md5: c30c96b97ae56268cac567bd8837b991 +# Source0-md5: ee0f25577b8a640df3015113e67bb718 URL: http://www.venge.net/monotone/ BuildRequires: boost-date_time-devel BuildRequires: boost-devel >= 1.32.0-3 @@ -83,6 +83,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/24 07:34:30 jareq +- updated to 0.22 +- rel 1 + Revision 1.13 2005/07/25 21:18:15 arekm - add BR boost-mem_fn-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monotone.spec?r1=1.13&r2=1.14&f=u From jareq at pld-linux.org Wed Aug 24 09:35:16 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: monotone-0.22.tar.gz Message-ID: <25417.1124868916@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.venge.net/monotone/downloads/monotone-0.22.tar.gz ee0f25577b8a640df3015113e67bb718 monotone-0.22.tar.gz Size: 5038069 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gconf-editor.spec - updated to 2.11.92 - sorted %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:40:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: gconf-editor.spec (1.30 -> 1.30.2.1) ---- Diffs: ================================================================ Index: SPECS/gconf-editor.spec diff -u SPECS/gconf-editor.spec:1.30 SPECS/gconf-editor.spec:1.30.2.1 --- SPECS/gconf-editor.spec:1.30 Fri Apr 8 12:48:53 2005 +++ SPECS/gconf-editor.spec Wed Aug 24 09:40:33 2005 @@ -2,12 +2,12 @@ Summary: An editor for the GConf configuration system Summary(pl): Edytor do systemu konfiguracji GConf Name: gconf-editor -Version: 2.10.0 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 651a18f7eb5af91761521aa4f04ccc07 +Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: afbc07a3d861e1b43a5c2592419cc47d Patch0: %{name}-desktop.patch BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -69,12 +69,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_desktopdir}/* -%{_pixmapsdir}/* +%{_iconsdir}/*/*/apps/*.png %{_mandir}/man1/* %{_omf_dest_dir}/%{name} -%{_iconsdir}/*/*/apps/*.png +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/gconf-editor.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -82,6 +82,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30.2.1 2005/08/24 07:40:33 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.30 2005/04/08 10:48:53 paladine - new style macros - rel. 3, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gconf-editor.spec?r1=1.30&r2=1.30.2.1&f=u From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gconf-editor-2.11.92.tar.bz2 Message-ID: <29238.1124869240@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/gconf-editor-2.11.92.tar.bz2 afbc07a3d861e1b43a5c2592419cc47d gconf-editor-2.11.92.tar.bz2 Size: 477844 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: bug-buddy-2.11.92.tar.bz2 Message-ID: <31679.1124869523@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/bug-buddy-2.11.92.tar.bz2 fd6affcdb1a205b2acfc866eb4844c4a bug-buddy-2.11.92.tar.bz2 Size: 561719 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): bug-buddy.spec - updated to 2.11.92 - sorted %%file... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:45:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: bug-buddy.spec (1.37.2.3 -> 1.37.2.4) ---- Diffs: ================================================================ Index: SPECS/bug-buddy.spec diff -u SPECS/bug-buddy.spec:1.37.2.3 SPECS/bug-buddy.spec:1.37.2.4 --- SPECS/bug-buddy.spec:1.37.2.3 Thu Aug 18 07:52:41 2005 +++ SPECS/bug-buddy.spec Wed Aug 24 09:45:20 2005 @@ -2,12 +2,12 @@ Summary: Utility to ease the reporting of bugs within the GNOME Summary(pl): Narz?dzie u?atwiaj?ce zg?aszanie b??d?w w ?rodowisku GNOME Name: bug-buddy -Version: 2.11.1 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 490f9b8f63119bafd19a37a0f0719b65 +# Source0-md5: fd6affcdb1a205b2acfc866eb4844c4a Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -92,12 +92,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO docs/multiple_bts.txt %attr(755,root,root) %{_bindir}/* -%{_mandir}/man1/* %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* +%{_mandir}/man1/* %{_omf_dest_dir}/* -%{_sysconfdir}/gconf/schemas/* +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/bug-buddy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -105,6 +105,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.4 2005/08/24 07:45:20 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.37.2.3 2005/08/18 05:52:41 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bug-buddy.spec?r1=1.37.2.3&r2=1.37.2.4&f=u From paladine at pld-linux.org Wed Aug 24 09:48:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gnome-themes-2.11.92.tar.bz2 Message-ID: <1446.1124869702@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/gnome-themes-2.11.92.tar.bz2 89be15b82ac0561553356f537bb3686b gnome-themes-2.11.92.tar.bz2 Size: 2574494 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:48:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-themes.spec - updated to 2.11.92 - small fix ... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:48:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - small fix in Clearlooks subpackage %%files - require new gtk2-engines - removed redundant R: gtk2-engines from subpackages ---- Files affected: SPECS: gnome-themes.spec (1.46.4.3 -> 1.46.4.4) ---- Diffs: ================================================================ Index: SPECS/gnome-themes.spec diff -u SPECS/gnome-themes.spec:1.46.4.3 SPECS/gnome-themes.spec:1.46.4.4 --- SPECS/gnome-themes.spec:1.46.4.3 Mon Aug 8 16:47:36 2005 +++ SPECS/gnome-themes.spec Wed Aug 24 09:48:18 2005 @@ -2,20 +2,20 @@ Summary: Default themes for GNOME2 enviroment Summary(pl): Domy?lne motywy dla ?rodowiska GNOME2 Name: gnome-themes -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: c040ffaf01d644bfba22e0835fdac7b0 +# Source0-md5: 89be15b82ac0561553356f537bb3686b URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: gtk2-engines >= 1:2.6.2-1 +BuildRequires: gtk2-engines >= 1:2.6.5 BuildRequires: libtool BuildRequires: intltool >= 0.28 BuildRequires: rpmbuild(macros) >= 1.197 -Requires: gtk2-engines >= 1:2.6.2-1 +Requires: gtk2-engines >= 1:2.6.5 Conflicts: crux-engine Conflicts: crux-theme BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +71,6 @@ Group: Themes Requires: %{name} = %{version}-%{release} Requires: gnome-icon-theme >= 2.10.0 -Requires: gtk2-engines >= 2.6.2 %description Glider Glider theme for GNOME 2 enviroment. @@ -208,7 +207,6 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-Sandwish = %{version}-%{release} Requires: %{name}-Sandy = %{version}-%{release} -Requires: gtk2-engines >= 2.6.2 %description Ocean-Dream Ocean-Dream theme for GNOME 2 enviroment. @@ -344,7 +342,7 @@ %files Clearlooks %defattr(644,root,root,755) -%{_datadir}/themes/Clearlooks +%{_datadir}/themes/Clearlooks/* %files Crux %defattr(644,root,root,755) @@ -442,6 +440,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.4.4 2005/08/24 07:48:18 paladine +- updated to 2.11.92 +- small fix in Clearlooks subpackage %%files +- require new gtk2-engines +- removed redundant R: gtk2-engines from subpackages + Revision 1.46.4.3 2005/08/08 14:47:36 paladine - updated to 2.11.91 - new Clearlooks theme subpackage :) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-themes.spec?r1=1.46.4.3&r2=1.46.4.4&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:16 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:00:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.1 ---- Files affected: SPECS: gtk+2.spec (1.179.2.8 -> 1.179.2.9) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.8 SPECS/gtk+2.spec:1.179.2.9 --- SPECS/gtk+2.spec:1.179.2.8 Wed Aug 17 22:18:52 2005 +++ SPECS/gtk+2.spec Wed Aug 24 10:00:08 2005 @@ -14,17 +14,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: e169d35239bf9d23bdd84c473e3c4917 +# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version -Patch2: %{name}-colormap.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -35,7 +34,7 @@ BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.8.0 +BuildRequires: glib2-devel >= 1:2.8.1 %{?with_doc:BuildRequires: gtk-doc >= 1.0} %{?with_xlibs:BuildRequires: libXfixes-devel} %{?with_xlibs:BuildRequires: libXi-devel} @@ -145,7 +144,6 @@ %setup -q -n gtk+-%{version} %patch0 -p1 %{?with_xlibs:%patch1 -p1} -%patch2 -p0 %build %{__gtkdocize} @@ -277,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.9 2005/08/24 08:00:08 aflinta +- 2.8.1 + Revision 1.179.2.8 2005/08/17 20:18:52 aflinta - require official releases ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.8&r2=1.179.2.9&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gtk+-2.8.1.tar.bz2 Message-ID: <8359.1124870455@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.1.tar.bz2 62ffb0e555dcc4eee3eba5e3214897e3 gtk+-2.8.1.tar.bz2 Size: 11802868 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gnome-nettool-1.3.92.tar.bz2 Message-ID: <21586.1124871734@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/gnome-nettool-1.3.92.tar.bz2 fae4671363b0a10608e07c2b02601000 gnome-nettool-1.3.92.tar.bz2 Size: 472700 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:22:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gnome-nettool.spec (1.9 -> 1.9.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9 SPECS/gnome-nettool.spec:1.9.2.1 --- SPECS/gnome-nettool.spec:1.9 Tue Jun 14 21:25:31 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:21:57 2005 @@ -2,12 +2,12 @@ Summary: GNOME interface for networking tools Summary(pl): Interfejs dla narz?dzi sieciowych dla GNOME Name: gnome-nettool -Version: 1.2.0 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 277338cf5d54ae9941260dd993a14f7a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/%{name}-%{version}.tar.bz2 +# Source0-md5: fae4671363b0a10608e07c2b02601000 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel @@ -18,7 +18,6 @@ BuildRequires: gtk+2-devel >= 2:2.6.3 BuildRequires: intltool >= 0.11 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libtool BuildRequires: pkgconfig Requires: gtk+2 >= 2:2.6.3 @@ -57,6 +56,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +%banner %{name} -e << EOF +For full functionality, you need to install various networking command-line +tools, like ping, netstat, ifconfig, whois, traceroute, finger +EOF + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO @@ -71,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.1 2005/08/24 08:21:57 aflinta +- 1.3.92 + Revision 1.9 2005/06/14 19:25:31 zbyniu - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9&r2=1.9.2.1&f=u From aflinta at pld-linux.org Wed Aug 24 10:24:44 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - missing dot i banner In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:24:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dot i banner ---- Files affected: SPECS: gnome-nettool.spec (1.9.2.1 -> 1.9.2.2) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9.2.1 SPECS/gnome-nettool.spec:1.9.2.2 --- SPECS/gnome-nettool.spec:1.9.2.1 Wed Aug 24 10:21:57 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:24:39 2005 @@ -59,7 +59,7 @@ %post %banner %{name} -e << EOF For full functionality, you need to install various networking command-line -tools, like ping, netstat, ifconfig, whois, traceroute, finger +tools, like ping, netstat, ifconfig, whois, traceroute, finger. EOF %files -f %{name}.lang @@ -76,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.2 2005/08/24 08:24:39 aflinta +- missing dot i banner + Revision 1.9.2.1 2005/08/24 08:21:57 aflinta - 1.3.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9.2.1&r2=1.9.2.2&f=u From aflinta at pld-linux.org Wed Aug 24 10:26:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - fixed schema name in post In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:26:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed schema name in post ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.5 -> 1.46.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.5 SPECS/gnome-system-tools.spec:1.46.2.6 --- SPECS/gnome-system-tools.spec:1.46.2.5 Tue Aug 23 16:50:22 2005 +++ SPECS/gnome-system-tools.spec Wed Aug 24 10:26:29 2005 @@ -5,7 +5,7 @@ Summary(pl): GNOME System Tools - narz?dzia systemowe GNOME Name: gnome-system-tools Version: 1.3.92 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/System Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/%{name}-%{version}.tar.bz2 @@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install gnome-system-tools-schemas +%gconf_schema_install gnome-system-tools.schemas %scrollkeeper_update_post %preun @@ -114,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.6 2005/08/24 08:26:29 aflinta +- fixed schema name in post + Revision 1.46.2.5 2005/08/23 14:50:22 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.5&r2=1.46.2.6&f=u From glen at pld-linux.org Wed Aug 24 10:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: eventum-hl-quot-fix.patch (NEW) - fix quote code (bryan a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:28:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix quote code (bryan also sent patch to upstream) ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u /dev/null SOURCES/eventum-hl-quot-fix.patch:1.1 --- /dev/null Wed Aug 24 10:28:30 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:28:25 2005 @@ -0,0 +1,120 @@ +Only in /tmp/: .channels +Only in /tmp/: .config +Only in /tmp/: .depdb +Only in /tmp/: .depdblock +Only in /tmp/: .filemap +Only in /tmp/: .lock +Only in /tmp/: .registry +Only in /tmp/: .siegerc +Only in /tmp/: .ssh-auth +Only in /tmp/: StartSession.php +Only in /tmp/: a +Only in /tmp/: apache-tinymce.conf +Only in /tmp/: audio +Only in .: block.textformat.php +Only in /tmp/: browser-plugins.spec +Only in .: compiler.assign.php +Only in /tmp/: configure.in +Only in .: function.assign_debug_info.php +Only in .: function.calendar.php +Only in .: function.config_load.php +Only in .: function.counter.php +Only in .: function.cycle.php +Only in .: function.debug.php +Only in .: function.eval.php +Only in .: function.fetch.php +Only in .: function.get_display_style.php +Only in .: function.get_innerhtml.php +Only in .: function.get_textarea_size.php +Only in .: function.html_checkboxes.php +Only in .: function.html_image.php +Only in .: function.html_options.php +Only in .: function.html_radios.php +Only in .: function.html_select_date.php +Only in .: function.html_select_time.php +Only in .: function.html_table.php +Only in .: function.mailto.php +Only in .: function.math.php +Only in .: function.popup.php +Only in .: function.popup_init.php +Only in /tmp/: glibc-2.3.5-2.i686.rpm +Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm +Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm +Only in /tmp/: gollem.spec +Only in /tmp/: horde-passwd-hook-misconf.patch +Only in /tmp/: hsperfdata_builder +Only in /tmp/: iconv-2.3.5-3.1.i686.rpm +Only in /tmp/: issue +Only in /tmp/: jama +Only in /tmp/: jserv +Only in /tmp/: jserv.conf +Only in /tmp/: junk +Only in /tmp/: l +Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm +Only in /tmp/: m.patch +Only in /tmp/: macromedia-flash.install +Only in /tmp/: main.php +Only in .: modifier.capitalize.php +Only in .: modifier.cat.php +Only in .: modifier.count_characters.php +Only in .: modifier.count_paragraphs.php +Only in .: modifier.count_sentences.php +Only in .: modifier.count_words.php +Only in .: modifier.date_format.php +Only in .: modifier.debug_print_var.php +Only in .: modifier.default.php +Only in .: modifier.escape.php +diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php +--- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +@@ -56,18 +56,19 @@ + if ($escape) { + $match[2] = htmlspecialchars($match[2]); + } +- if(trim($match[2]) != "") { ++ $line = trim($match[2]); ++ if ($line) { + $indent = strlen(preg_replace('/[\s]*/','',$match[1])); + $color = $indent % count($colors); + + $ret .= ''; + $ret .= htmlspecialchars($match[1])." "; +- $ret .= $match[2]; +- $ret .= ""; ++ $ret .= $line; ++ $ret .= "\n"; + } else { +- $ret .= $match[2]; ++ $ret .= "\n"; + } + } + return $ret; + } +-?> +\ No newline at end of file ++?> +Only in .: modifier.indent.php +Only in .: modifier.lower.php +Only in .: modifier.nl2br.php +Only in .: modifier.regex_replace.php +Only in .: modifier.replace.php +Only in .: modifier.spacify.php +Only in .: modifier.string_format.php +Only in .: modifier.strip.php +Only in .: modifier.strip_tags.php +Only in .: modifier.truncate.php +Only in .: modifier.upper.php +Only in .: modifier.wordwrap.php +Only in .: outputfilter.trimwhitespace.php +Only in /tmp/: poldek.conf.rpmnew +Only in /tmp/: poldek.conf.rpmsave +Only in /tmp/: posttrans +Only in /tmp/: pretrans +Only in /tmp/: rc-script +Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm +Only in /tmp/: rpm.groups +Only in /tmp/: rpm.patch +Only in /tmp/: rpm.spec +Only in /tmp/: settings.php +Only in .: shared.escape_special_chars.php +Only in .: shared.make_timestamp.php ================================================================ From glen at pld-linux.org Wed Aug 24 10:29:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - remove junk In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:29:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove junk ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.1 SOURCES/eventum-hl-quot-fix.patch:1.2 --- SOURCES/eventum-hl-quot-fix.patch:1.1 Wed Aug 24 10:28:25 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:29:00 2005 @@ -1,69 +1,3 @@ -Only in /tmp/: .channels -Only in /tmp/: .config -Only in /tmp/: .depdb -Only in /tmp/: .depdblock -Only in /tmp/: .filemap -Only in /tmp/: .lock -Only in /tmp/: .registry -Only in /tmp/: .siegerc -Only in /tmp/: .ssh-auth -Only in /tmp/: StartSession.php -Only in /tmp/: a -Only in /tmp/: apache-tinymce.conf -Only in /tmp/: audio -Only in .: block.textformat.php -Only in /tmp/: browser-plugins.spec -Only in .: compiler.assign.php -Only in /tmp/: configure.in -Only in .: function.assign_debug_info.php -Only in .: function.calendar.php -Only in .: function.config_load.php -Only in .: function.counter.php -Only in .: function.cycle.php -Only in .: function.debug.php -Only in .: function.eval.php -Only in .: function.fetch.php -Only in .: function.get_display_style.php -Only in .: function.get_innerhtml.php -Only in .: function.get_textarea_size.php -Only in .: function.html_checkboxes.php -Only in .: function.html_image.php -Only in .: function.html_options.php -Only in .: function.html_radios.php -Only in .: function.html_select_date.php -Only in .: function.html_select_time.php -Only in .: function.html_table.php -Only in .: function.mailto.php -Only in .: function.math.php -Only in .: function.popup.php -Only in .: function.popup_init.php -Only in /tmp/: glibc-2.3.5-2.i686.rpm -Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm -Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm -Only in /tmp/: gollem.spec -Only in /tmp/: horde-passwd-hook-misconf.patch -Only in /tmp/: hsperfdata_builder -Only in /tmp/: iconv-2.3.5-3.1.i686.rpm -Only in /tmp/: issue -Only in /tmp/: jama -Only in /tmp/: jserv -Only in /tmp/: jserv.conf -Only in /tmp/: junk -Only in /tmp/: l -Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm -Only in /tmp/: m.patch -Only in /tmp/: macromedia-flash.install -Only in /tmp/: main.php -Only in .: modifier.capitalize.php -Only in .: modifier.cat.php -Only in .: modifier.count_characters.php -Only in .: modifier.count_paragraphs.php -Only in .: modifier.count_sentences.php -Only in .: modifier.count_words.php -Only in .: modifier.date_format.php -Only in .: modifier.debug_print_var.php -Only in .: modifier.default.php -Only in .: modifier.escape.php diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php --- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 +++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -93,28 +27,3 @@ -?> \ No newline at end of file +?> -Only in .: modifier.indent.php -Only in .: modifier.lower.php -Only in .: modifier.nl2br.php -Only in .: modifier.regex_replace.php -Only in .: modifier.replace.php -Only in .: modifier.spacify.php -Only in .: modifier.string_format.php -Only in .: modifier.strip.php -Only in .: modifier.strip_tags.php -Only in .: modifier.truncate.php -Only in .: modifier.upper.php -Only in .: modifier.wordwrap.php -Only in .: outputfilter.trimwhitespace.php -Only in /tmp/: poldek.conf.rpmnew -Only in /tmp/: poldek.conf.rpmsave -Only in /tmp/: posttrans -Only in /tmp/: pretrans -Only in /tmp/: rc-script -Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm -Only in /tmp/: rpm.groups -Only in /tmp/: rpm.patch -Only in /tmp/: rpm.spec -Only in /tmp/: settings.php -Only in .: shared.escape_special_chars.php -Only in .: shared.make_timestamp.php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 10:31:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - fix path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:31:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix path ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.2 SOURCES/eventum-hl-quot-fix.patch:1.3 --- SOURCES/eventum-hl-quot-fix.patch:1.2 Wed Aug 24 10:29:00 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:31:16 2005 @@ -1,6 +1,6 @@ diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php ---- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 -+++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +--- ./include/Smarty/plugins/modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ ./modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -56,18 +56,19 @@ if ($escape) { $match[2] = htmlspecialchars($match[2]); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Wed Aug 24 10:34:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: eventum.spec - fix hilite quoting for routed emails. rel 3 In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:34:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix hilite quoting for routed emails. rel 3 ---- Files affected: SPECS: eventum.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.113 SPECS/eventum.spec:1.114 --- SPECS/eventum.spec:1.113 Tue Aug 23 12:01:01 2005 +++ SPECS/eventum.spec Wed Aug 24 10:33:59 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 2 +%define _rel 3 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -64,6 +64,7 @@ Patch6: http://glen.alkohol.ee/pld/%{name}-maq-subject.patch Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch +Patch10: %{name}-hl-quot-fix.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -451,6 +452,7 @@ %patch6 -p1 %patch7 -p1 %patch9 -p1 +%patch10 -p1 %patch22 -p1 # replace in remaining scripts config.inc.php to system one @@ -855,6 +857,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/24 08:33:59 glen +- fix hilite quoting for routed emails. rel 3 + Revision 1.113 2005/08/23 10:01:01 glen - add missing smarty modifier, rel 2, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.113&r2=1.114&f=u From paszczus at pld-linux.org Wed Aug 24 10:37:57 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: horde-passwd.spec - ok, it is not a fake dep In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 08:37:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ok, it is not a fake dep ---- Files affected: SPECS: horde-passwd.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.20 SPECS/horde-passwd.spec:1.21 --- SPECS/horde-passwd.spec:1.20 Tue Aug 23 23:51:45 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 10:37:51 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +%define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 08:37:51 paszczus +- ok, it is not a fake dep + Revision 1.20 2005/08/23 21:51:45 paszczus - added one more noautoreq - please do not remove it... ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.20&r2=1.21&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:02 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: web-cyradm-locale.patch - fixed. In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed. ---- Files affected: SOURCES: web-cyradm-locale.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u SOURCES/web-cyradm-locale.patch:1.1 SOURCES/web-cyradm-locale.patch:1.2 --- SOURCES/web-cyradm-locale.patch:1.1 Tue Aug 23 16:01:43 2005 +++ SOURCES/web-cyradm-locale.patch Wed Aug 24 11:02:56 2005 @@ -1,13 +1,13 @@ diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php --- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 +++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 -@@ -70,9 +70,6 @@ +@@ -70,8 +70,8 @@ putenv("LANG=" . $LANG); putenv("LANGUAGE=" . $LANG); -- // Specify location of translation tables + // Specify location of translation tables - bindtextdomain("web-cyradm", "./locale"); -- ++ bindtextdomain("web-cyradm", "/usr/share/locale"); + // Choose domain textdomain("web-cyradm"); - require_once WC_BASE . "/session.php"; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/web-cyradm-locale.patch?r1=1.1&r2=1.2&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:30 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: web-cyradm-apache.conf (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-apache.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-apache.conf diff -u /dev/null SOURCES/web-cyradm-apache.conf:1.1 --- /dev/null Wed Aug 24 11:03:30 2005 +++ SOURCES/web-cyradm-apache.conf Wed Aug 24 11:03:25 2005 @@ -0,0 +1,22 @@ +Alias /web-cyradm /usr/share/web-cyradm + + + Options None + AllowOverride None + Order allow,deny + Allow from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + ================================================================ From kosmo at pld-linux.org Wed Aug 24 11:11:25 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: web-cyradm.spec - R & BR changes - better /etc/httpd/web-cy... In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:11:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R & BR changes - better /etc/httpd/web-cyradm.conf - added %ghost for logfile ---- Files affected: SPECS: web-cyradm.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.2 SPECS/web-cyradm.spec:1.3 --- SPECS/web-cyradm.spec:1.2 Tue Aug 23 22:48:55 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 11:11:20 2005 @@ -2,8 +2,6 @@ # # TODO: # - R: & BR: -# - better /etc/httpd/web-cyradm.conf -# - many more # %define version_major 0.5.4 %define version_minor 1 @@ -17,13 +15,14 @@ License: GPL Group: Applications Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Source1: %{name}-apache.conf Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ -Requires: mysql +Requires: apache Requires: php Requires: php-gettext -Requires: webserver +Requires: php-pear-DB BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -79,8 +78,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install config/conf.php.dist \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css @@ -94,6 +95,8 @@ install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES done +touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}/%{name}-login.log + %find_lang %{name} %clean @@ -104,7 +107,7 @@ ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi @@ -115,7 +118,7 @@ rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi fi @@ -126,6 +129,7 @@ %dir %{_sysconfdir}/%{name} %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%ghost %{_localstatedir}/log/%{name}/*.log %{_datadir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -134,6 +138,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 09:11:20 kosmo +- R & BR changes +- better /etc/httpd/web-cyradm.conf +- added %ghost for logfile + Revision 1.2 2005/08/23 20:48:55 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Wed Aug 24 11:18:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:06 2005 Subject: test: plik cia test1 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:07 2005 GMT Module: test Tag: HEAD ---- Log message: cia test1 ---- Files affected: test: plik (1.20 -> 1.21) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.20 test/plik:1.21 --- test/plik:1.20 Tue Aug 23 19:27:15 2005 +++ test/plik Wed Aug 24 11:18:01 2005 @@ -4,6 +4,7 @@ test4 test5 test6 +cia-test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Wed Aug 24 11:18:48 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:06 2005 Subject: test: plik cia test2 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:48 2005 GMT Module: test Tag: HEAD ---- Log message: cia test2 ---- Files affected: test: plik (1.21 -> 1.22) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.21 test/plik:1.22 --- test/plik:1.21 Wed Aug 24 11:18:01 2005 +++ test/plik Wed Aug 24 11:18:42 2005 @@ -4,7 +4,7 @@ test4 test5 test6 -cia-test1 +cia-test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 11:31:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: eventum.spec - htmloptions truncate patch In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 09:31:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - htmloptions truncate patch ---- Files affected: SPECS: eventum.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.114 SPECS/eventum.spec:1.115 --- SPECS/eventum.spec:1.114 Wed Aug 24 10:33:59 2005 +++ SPECS/eventum.spec Wed Aug 24 11:31:29 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 3 +%define _rel 3.2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -65,6 +65,7 @@ Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch Patch10: %{name}-hl-quot-fix.patch +Patch11: http://glen.alkohol.ee/pld/eventum-htmloptions-truncate.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -857,6 +858,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/24 09:31:29 glen +- htmloptions truncate patch + Revision 1.114 2005/08/24 08:33:59 glen - fix hilite quoting for routed emails. rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.114&r2=1.115&f=u From kosmo at pld-linux.org Wed Aug 24 12:04:29 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: cyrus-sasl-md5sum-passwords.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: cyrus-sasl-md5sum-passwords.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cyrus-sasl-md5sum-passwords.patch diff -u /dev/null SOURCES/cyrus-sasl-md5sum-passwords.patch:1.1 --- /dev/null Wed Aug 24 12:04:29 2005 +++ SOURCES/cyrus-sasl-md5sum-passwords.patch Wed Aug 24 12:04:23 2005 @@ -0,0 +1,73 @@ +diff -urN cyrus-sasl-2.1.21.orig/lib/checkpw.c cyrus-sasl-2.1.21/lib/checkpw.c +--- cyrus-sasl-2.1.21.orig/lib/checkpw.c 2005-08-24 11:36:23.000000000 +0200 ++++ cyrus-sasl-2.1.21/lib/checkpw.c 2005-08-24 11:36:07.000000000 +0200 +@@ -103,10 +103,12 @@ + #define PASSWORD_FORMAT_CLEARTEXT 1 + #define PASSWORD_FORMAT_CRYPT 2 + #define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_FORMAT_MD5 4 + #define PASSWORD_SALT_BUF_LEN 22 + + /* weeds out crypt(3) password's salt */ + int _sasl_get_salt (char *dest, char *src, int format); ++const char *_sasl_md5sum(const char *src); + + /****************************** + * crypt(3) patch stop * +@@ -192,6 +194,9 @@ + /* traditional crypt(3) */ + else if (strncmp(p, "crypt_trad", 11) == 0) + password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* md5sum like hash */ ++ else if (strncmp(p, "md5", 11) == 0) ++ password_format = PASSWORD_FORMAT_MD5; + /* cleartext password */ + else + password_format = PASSWORD_FORMAT_CLEARTEXT; +@@ -250,13 +255,20 @@ + _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); + + /* crypt(3)-ed password? */ +- if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ if (password_format == PASSWORD_FORMAT_CRYPT || password_format == PASSWORD_FORMAT_CRYPTTRAD) { + /* compare password */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) + return SASL_OK; + else + ret = SASL_BADAUTH; + } ++ /* md5 hash password */ ++ else if (password_format == PASSWORD_FORMAT_MD5) { ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcasecmp(auxprop_values[0].values[0], _sasl_md5sum(passwd)) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } + else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { + /* compare passwords */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) +@@ -1087,3 +1099,24 @@ + return 1; + } + ++ ++const char *_sasl_md5sum(const char *src) { ++ static char md5sum[33]; ++ const char hex[] = "0123456789abcdef"; ++ char md5[16]; ++ MD5_CTX ctx; ++ int i = 0; ++ int j = 0; ++ ++ _sasl_MD5Init(&ctx); ++ _sasl_MD5Update(&ctx, src, strlen(src)); ++ _sasl_MD5Final(&md5, &ctx); ++ ++ for(i=0; i<16; i++) { ++ md5sum[j++] = hex[md5[i] >> 4]; ++ md5sum[j++] = hex[md5[i] & 0x0F]; ++ } ++ ++ md5sum[j] = 0; ++ return(md5sum); ++} ================================================================ From kosmo at pld-linux.org Wed Aug 24 12:04:57 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: cyrus-sasl.spec - added cyrus-sasl-md5sum-passwords.patch In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added cyrus-sasl-md5sum-passwords.patch ---- Files affected: SPECS: cyrus-sasl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/cyrus-sasl.spec diff -u SPECS/cyrus-sasl.spec:1.140 SPECS/cyrus-sasl.spec:1.141 --- SPECS/cyrus-sasl.spec:1.140 Thu Jul 21 00:35:47 2005 +++ SPECS/cyrus-sasl.spec Wed Aug 24 12:04:51 2005 @@ -42,6 +42,7 @@ Patch5: %{name}-gcc4.patch # Adapted from http://frost.ath.cx/software/cyrus-sasl-patches/dist/2.1.19/cyrus-sasl-2.1.19-checkpw.c+sql.c.patch Patch6: %{name}-cryptedpw.patch +Patch7: %{name}-md5sum-passwords.patch URL: http://asg.web.cmu.edu/sasl/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -424,6 +425,7 @@ %patch5 -p1 %if %{with cryptedpw} %patch6 -p1 +%patch7 -p1 %endif cd doc @@ -649,6 +651,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/24 10:04:51 kosmo +- added cyrus-sasl-md5sum-passwords.patch + Revision 1.140 2005/07/20 22:35:47 romke - added bcond cryptedpw allowing storing crypted passwd in database (mysql or pgsql) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.140&r2=1.141&f=u From glen at pld-linux.org Wed Aug 24 12:25:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: php4-eaccelerator.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-eaccelerator.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.6 SPECS/php4-eaccelerator.spec:1.7 --- SPECS/php4-eaccelerator.spec:1.6 Mon Jun 13 08:54:58 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 12:25:10 2005 @@ -1,13 +1,13 @@ # $Revision$, $Date$ %define _name eaccelerator %define _pkgname eaccelerator -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: eAccelerator module for PHP Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1 +Release: 1.1 Epoch: 0 License: GPL Vendor: Turck Software @@ -17,15 +17,14 @@ URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool -BuildRequires: php4-devel >= 4.1 -Requires: php4 = %{php_ver} +BuildRequires: php4-devel >= 3:4.1 +%requires_eq_to php4 php4-devel Requires: php4-zlib -Requires(post,preun): php4-common >= 4.1 +Requires: %{_sysconfdir}/conf.d Conflicts: php-mmcache BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description eAccelerator is a further development from mmcache PHP Accelerator & @@ -52,26 +51,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install eaccelerator %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove eaccelerator %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so %attr(755,root,root) %{_bindir}/encoder.php @@ -81,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 10:25:10 glen +- use .ini file in conf.d directory + Revision 1.6 2005/06/13 06:54:58 prism - up to 0.9.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 12:28:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: php4-eaccelerator.ini (NEW) - original from eaccelerator-... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:28:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - original from eaccelerator-0.9.3 sources ---- Files affected: SOURCES: php4-eaccelerator.ini (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u /dev/null SOURCES/php4-eaccelerator.ini:1.1 --- /dev/null Wed Aug 24 12:28:29 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:28:24 2005 @@ -0,0 +1,114 @@ +[eaccelerator] + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; +; eAccelerator is compatible with Zend Optimizer's loader. Zend Optimizer +; must be installed after eAccelerator in php.ini. If you don't use scripts +; encoded with Zend Encoder then we do not recommend you install Zend Optimizer +; with eAccelerator. + + +; You must uncomment one (and only one) line from the following to load +; eAccelerator extension. +;extension="eaccelerator.so" +zend_extension="/usr/lib/php4/eaccelerator.so" +;zend_extension_ts="/usr/lib/php4/eaccelerator.so" +;extension="eaccelerator.dll" +;zend_extension_ts="c:\php4\eaccelerator.dll" +;zend_extension="c:\php4\eaccelerator.dll" + +; The amount of shared memory (in megabytes) that eAccelerator will use. +; "0" means OS default. Default value is "0". +eaccelerator.shm_size = "64" + +; The directory that is used for disk cache. eAccelerator stores precompiled +; code, session data, content and user entries here. The same data can be +; stored in shared memory also (for more quick access). Default value is +; "/tmp/eaccelerator". +eaccelerator.cache_dir = "/tmp/eaccelerator" + +; Enables or disables eAccelerator. Should be "1" for enabling or +; "0" for disabling. Default value is "1". +eaccelerator.enable = "1" + +; Enables or disables internal peephole optimizer which may speed up code +; execution. Should be "1" for enabling or "0" for disabling. +; Default value is "1". +eaccelerator.optimizer = "1" + +; Enables or disables debug logging. Should be "1" for enabling or +; "0" for disabling. Default value is "0". +eaccelerator.debug = "0" + +; Enables or disables PHP file modification checking. Should be "1" +; for enabling or "0" for disabling. You should set it to "1" if you want +; to recompile PHP files after modification. Default value is "1". +eaccelerator.check_mtime = "1" + +; Determine which PHP files must be cached. You may specify the number of +; patterns (for example "*.php *.phtml") which specifies to cache or +; not to cache. If pattern starts with the character "!", it means to ignore +; files which are matched by the following pattern. Default value is "" that +; means - all PHP scripts will be cached. +eaccelerator.filter = "" + +; Disables putting large values into shared memory by "eaccelerator_put()" +; function. +; It indicates the largest allowed size in bytes (10240, 10K, 1M). The "0" +; disables the limit. Default value is "0". +eaccelerator.shm_max = "0" + +; When eAccelerator fails to get shared memory for new script it removes +; all scripts which were not accessed at last "shm_ttl" seconds from shared +; memory. Default value is "0" that means - don't remove any files from +; shared memory. +eaccelerator.shm_ttl = "0" + +; When eAccelerator fails to get shared memory for new script it tryes to +; remove old script if the previous try was made more then "shm_prune_period" +; seconds ago. Default value is "0" that means - don't try to remove any +; files from shared memory. +eaccelerator.shm_prune_period = "0" + +; Enables or disables caching of compiled scripts on disk. It has no effect +; on session data and content caching. +; Default value is "0" that means - use disk and shared memory for caching. +eaccelerator.shm_only = "0" + +; Enables or disables cached content compression. Default value is "1" that +; means enable compression. +eaccelerator.compress = "1" + +; Compression level used for content caching. Default value is "9" which i +; is the maximum compression level +eaccelerator.compress_level = "9" + +; Determine where keys, session data and content will be cached. The possible +; values are: +; "shm_and_disk" - cache data in shared memory and on disk (default value) +; "shm" - cache data in shared memory or on disk if shared memory +; is full or data size greater then "eaccelerator.shm_max" +; "shm_only" - cache data in shared memory +; "disk_only" - cache data on disk +; "none" - don't cache data +eaccelerator.keys = "shm_and_disk" +eaccelerator.sessions = "shm_and_disk" +eaccelerator.content = "shm_and_disk" + +; eAccelerator can be managed through web interface script eaccelerator.php. So +; you need to put this file on your web site. For security reasons it is +; recommended to restrict the usage of this script by your local IP. +; +; To create the eAccelerator password type +; +; php -q eaccelerator_password.php +; Changing password for eAccelerator Web Interface (eaccelerator.php) +; +; Enter admin name: admin +; New admin password: eaccelerator +; Retype new admin password: eaccelerator + +eaccelerator.admin.name="yourusername" +eaccelerator.admin.password="yourpassword" ================================================================ From glen at pld-linux.org Wed Aug 24 12:32:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: php4-eaccelerator.ini - configured. NOTE: compression dis... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:32:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - configured. NOTE: compression disabled, as it will take more cpu, but what this accelerator is then about than accelerating? ---- Files affected: SOURCES: php4-eaccelerator.ini (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.1 SOURCES/php4-eaccelerator.ini:1.2 --- SOURCES/php4-eaccelerator.ini:1.1 Wed Aug 24 12:28:24 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:32:22 2005 @@ -12,12 +12,9 @@ ; You must uncomment one (and only one) line from the following to load ; eAccelerator extension. -;extension="eaccelerator.so" -zend_extension="/usr/lib/php4/eaccelerator.so" +extension="eaccelerator.so" +;zend_extension="/usr/lib/php4/eaccelerator.so" ;zend_extension_ts="/usr/lib/php4/eaccelerator.so" -;extension="eaccelerator.dll" -;zend_extension_ts="c:\php4\eaccelerator.dll" -;zend_extension="c:\php4\eaccelerator.dll" ; The amount of shared memory (in megabytes) that eAccelerator will use. ; "0" means OS default. Default value is "0". @@ -27,7 +24,7 @@ ; code, session data, content and user entries here. The same data can be ; stored in shared memory also (for more quick access). Default value is ; "/tmp/eaccelerator". -eaccelerator.cache_dir = "/tmp/eaccelerator" +eaccelerator.cache_dir = "/var/cache/eaccelerator" ; Enables or disables eAccelerator. Should be "1" for enabling or ; "0" for disabling. Default value is "1". @@ -79,7 +76,7 @@ ; Enables or disables cached content compression. Default value is "1" that ; means enable compression. -eaccelerator.compress = "1" +eaccelerator.compress = "0" ; Compression level used for content caching. Default value is "9" which i ; is the maximum compression level @@ -103,7 +100,7 @@ ; ; To create the eAccelerator password type ; -; php -q eaccelerator_password.php +; php4 -q eaccelerator_password.php ; Changing password for eAccelerator Web Interface (eaccelerator.php) ; ; Enter admin name: admin ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.1&r2=1.2&f=u From agaran at pld-linux.org Wed Aug 24 12:40:03 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec (NEW) - initial, for me ... In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, for me works rel 0.1 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u /dev/null SPECS/perl-POE-Component-DebugShell.spec:1.1 --- /dev/null Wed Aug 24 12:40:03 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:39:57 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DebugShell +Summary: POE::Component::DebugShell +Name: perl-POE-Component-DebugShell +Version: 1.0411 +Release: 0.1 +License: other, see LICENSE +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +perl-POE-Component-DebugShell module, see poe.perl.org + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc LICENSE +%{perl_vendorlib}/POE/Component/DebugShell.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:39:57 agaran +- initial, for me works rel 0.1 + ================================================================ From agaran at pld-linux.org Wed Aug 24 12:48:01 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - missing buildreq In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing buildreq ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.1 SPECS/perl-POE-Component-DebugShell.spec:1.2 --- SPECS/perl-POE-Component-DebugShell.spec:1.1 Wed Aug 24 12:39:57 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:47:55 2005 @@ -17,6 +17,7 @@ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: perl-POE +BuildRequires: perl-POE-API-Peek BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 10:47:55 agaran +- missing buildreq + Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 12:51:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: php4-eaccelerator.ini - use shm and fallback to disk for ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:51:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use shm and fallback to disk for speed ---- Files affected: SOURCES: php4-eaccelerator.ini (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.2 SOURCES/php4-eaccelerator.ini:1.3 --- SOURCES/php4-eaccelerator.ini:1.2 Wed Aug 24 12:32:22 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:51:43 2005 @@ -90,9 +90,9 @@ ; "shm_only" - cache data in shared memory ; "disk_only" - cache data on disk ; "none" - don't cache data -eaccelerator.keys = "shm_and_disk" -eaccelerator.sessions = "shm_and_disk" -eaccelerator.content = "shm_and_disk" +eaccelerator.keys = "shm" +eaccelerator.sessions = "shm" +eaccelerator.content = "shm" ; eAccelerator can be managed through web interface script eaccelerator.php. So ; you need to put this file on your web site. For security reasons it is ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.2&r2=1.3&f=u From agaran at pld-linux.org Wed Aug 24 12:53:35 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:53:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u /dev/null SPECS/perl-POE-Component-DirWatch.spec:1.1 --- /dev/null Wed Aug 24 12:53:35 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Wed Aug 24 12:53:29 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DirWatch +Summary: POE::Component::DirWatch +Name: perl-POE-Component-DirWatch +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +#BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback +as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as +an FTP upload directory. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/DirWatch.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:53:29 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 12:58:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: php4-eaccelerator.ini - kill trailing spaces In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:58:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - kill trailing spaces ---- Files affected: SOURCES: php4-eaccelerator.ini (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.3 SOURCES/php4-eaccelerator.ini:1.4 --- SOURCES/php4-eaccelerator.ini:1.3 Wed Aug 24 12:51:43 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:58:19 2005 @@ -57,13 +57,13 @@ ; disables the limit. Default value is "0". eaccelerator.shm_max = "0" -; When eAccelerator fails to get shared memory for new script it removes +; When eAccelerator fails to get shared memory for new script it removes ; all scripts which were not accessed at last "shm_ttl" seconds from shared ; memory. Default value is "0" that means - don't remove any files from ; shared memory. eaccelerator.shm_ttl = "0" -; When eAccelerator fails to get shared memory for new script it tryes to +; When eAccelerator fails to get shared memory for new script it tryes to ; remove old script if the previous try was made more then "shm_prune_period" ; seconds ago. Default value is "0" that means - don't try to remove any ; files from shared memory. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.3&r2=1.4&f=u From agaran at pld-linux.org Wed Aug 24 12:58:37 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: perl-POE-Component-Logger.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:58:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-Logger.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u /dev/null SPECS/perl-POE-Component-Logger.spec:1.1 --- /dev/null Wed Aug 24 12:58:37 2005 +++ SPECS/perl-POE-Component-Logger.spec Wed Aug 24 12:58:32 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-Logger +Summary: perl(POE::Component::Logger) +Name: perl-POE-Component-Logger +Version: 1.00 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-Log-Dispatch-Config +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _noautoreq 'perl(anything_fake_or_conditional)' + +%description +POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/Logger.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:58:32 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 13:00:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: php4-eaccelerator.spec - add eaccelerator.ini - add cachedi... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add eaccelerator.ini - add cachedir - add more utility scripts ---- Files affected: SPECS: php4-eaccelerator.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.7 SPECS/php4-eaccelerator.spec:1.8 --- SPECS/php4-eaccelerator.spec:1.7 Wed Aug 24 12:25:10 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 13:00:24 2005 @@ -7,13 +7,14 @@ Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1.1 +Release: 1.5 Epoch: 0 License: GPL Vendor: Turck Software Group: Libraries Source0: http://dl.sourceforge.net/eaccelerator/%{_pkgname}-%{version}.tar.gz # Source0-md5: b17ddf953f18ee6df5c2c24ffccb37d9 +Source1: %{name}.ini URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool @@ -51,15 +52,13 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d,/var/cache/%{_name}} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} - -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini -; Enable %{_name} extension module -extension=%{_name}.so -EOF +install ./eaccelerator_password.php $RPM_BUILD_ROOT%{_bindir} +install ./eaccelerator.php $RPM_BUILD_ROOT%{_bindir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini %clean rm -rf $RPM_BUILD_ROOT @@ -69,15 +68,24 @@ [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %postun -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +fi + +%preun +if [ "$1" = 0 ]; then + # remove last pieces of cache + rm -f /var/cache/%{_name}/* +fi %files %defattr(644,root,root,755) %doc README %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so -%attr(755,root,root) %{_bindir}/encoder.php +%attr(755,root,root) %{_bindir}/* +%attr(770,root,http) /var/cache/%{_name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -85,6 +93,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 11:00:24 glen +- add eaccelerator.ini +- add cachedir +- add more utility scripts + Revision 1.7 2005/08/24 10:25:10 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.7&r2=1.8&f=u From agaran at pld-linux.org Wed Aug 24 13:00:53 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: perl-POE-Component-TSTP.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 11:00:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u /dev/null SPECS/perl-POE-Component-TSTP.spec:1.1 --- /dev/null Wed Aug 24 13:00:53 2005 +++ SPECS/perl-POE-Component-TSTP.spec Wed Aug 24 13:00:47 2005 @@ -0,0 +1,63 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-TSTP +Summary: POE::Component::TSTP - perl module +Name: perl-POE-Component-TSTP +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE component handling SIGTSTP, ctrl-z usually. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/TSTP.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 11:00:47 agaran +- initial, works for me + ================================================================ From paladine at pld-linux.org Wed Aug 24 13:02:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: hal.spec - changed pid file - commentedout pld_policy patch In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:02:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed pid file - commentedout pld_policy patch ---- Files affected: SPECS: hal.spec (1.81 -> 1.82) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.81 SPECS/hal.spec:1.82 --- SPECS/hal.spec:1.81 Tue Aug 23 16:58:25 2005 +++ SPECS/hal.spec Wed Aug 24 13:02:29 2005 @@ -114,7 +114,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build %{__libtoolize} @@ -129,7 +129,8 @@ --enable-selinux \ --with-hwdata=%{_sysconfdir} \ --enable-fstab-sync \ - --enable-verbose-mode + --enable-verbose-mode \ + --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install @@ -230,6 +231,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.82 2005/08/24 11:02:29 paladine +- changed pid file +- commentedout pld_policy patch + Revision 1.81 2005/08/23 14:58:25 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.81&r2=1.82&f=u From glen at pld-linux.org Wed Aug 24 13:16:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: web-cyradm.spec - %service requires rpmbuild(macros) >= 1.2... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:16:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ---- Files affected: SPECS: web-cyradm.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.3 SPECS/web-cyradm.spec:1.4 --- SPECS/web-cyradm.spec:1.3 Wed Aug 24 11:11:20 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:16:17 2005 @@ -19,6 +19,7 @@ Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ +BuildRequires: rpmbuild(macros) >= 1.228 Requires: apache Requires: php Requires: php-gettext @@ -106,9 +107,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi %preun @@ -117,9 +116,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi fi @@ -138,6 +135,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 11:16:17 glen +- %service requires rpmbuild(macros) >= 1.228 +- %service already includes check for sybsys lock + Revision 1.3 2005/08/24 09:11:20 kosmo - R & BR changes - better /etc/httpd/web-cyradm.conf ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Wed Aug 24 13:17:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: web-cyradm.spec - use %service reload, as it's only config ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:17:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service reload, as it's only config change (ie not modules update) ---- Files affected: SPECS: web-cyradm.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.4 SPECS/web-cyradm.spec:1.5 --- SPECS/web-cyradm.spec:1.4 Wed Aug 24 13:16:17 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:17:03 2005 @@ -135,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 11:17:03 glen +- use %service reload, as it's only config change (ie not modules update) + Revision 1.4 2005/08/24 11:16:17 glen - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 13:17:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: gnome-volume-manager-nonmountable_media.patch (NEW), gnom... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patches from ubuntu ---- Files affected: SOURCES: gnome-volume-manager-nonmountable_media.patch (NONE -> 1.1) (NEW), gnome-volume-manager-reconnect.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-volume-manager-nonmountable_media.patch diff -u /dev/null SOURCES/gnome-volume-manager-nonmountable_media.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-nonmountable_media.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:26:10.095406344 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:27:02.929374360 +0200 +@@ -1204,7 +1204,7 @@ + * Does this device support removable media? Note that we + * check storage_device and not our own UDI + */ +- if (mountable && libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { ++ if (libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { + /* we handle media change events separately */ + dbg ("Changed: %s\n", device); + gvm_media_changed (udi, storage_device, device); ================================================================ Index: SOURCES/gnome-volume-manager-reconnect.patch diff -u /dev/null SOURCES/gnome-volume-manager-reconnect.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-reconnect.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,118 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:27:33.904665400 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:34:21.984627816 +0200 +@@ -72,7 +72,8 @@ + #define NAUTILUS_COMMAND BIN_NAUTILUS" -n --no-desktop %m" + + static struct gvm_configuration config; +-static LibHalContext *hal_ctx; ++static LibHalContext *hal_ctx = NULL; ++static DBusConnection *dbus_connection = NULL; + + #ifndef ASSUME_SUBMOUNT + /** List of UDI's for volumes mounted by g-v-m that we need to apply policy to*/ +@@ -1356,6 +1357,75 @@ + { + } + ++static LibHalContext * gvm_do_hal_init (); ++ ++/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event. ++ * ++ * @param data Context pointer ++ * @return true if it should be tried again, false if success or failure. ++ */ ++static gboolean ++gvm_reconnect_to_hal (gpointer data __attribute__((__unused__))) ++{ ++ static unsigned int retries = 0; ++ DBusError error; ++ ++ dbg ("Trying a reconnect ...\n"); ++ hal_ctx = gvm_do_hal_init (); ++ if (hal_ctx != NULL) { ++ dbg ("Reconnected OK.\n"); ++ retries = 0; ++ return FALSE; ++ } else if (dbus_connection){ ++ /* shut down dbus connection to try it again */ ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ } ++ ++ /* Retry later if it failed. */ ++ if (retries++ < 6000) ++ return TRUE; ++ ++ /* Too many retries; clean up and bail. */ ++ warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n"); ++ if (hal_ctx) { ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ } ++ gtk_main_quit (); ++ return FALSE; ++} ++ ++/** Invoked by D-BUS to filter messages. ++ * ++ * @param connection D-BUS connection ++ * @param message D-BUS message ++ * @param user_data Context pointer ++ */ ++static DBusHandlerResult ++gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)), ++ DBusMessage *message, ++ void *user_data __attribute__((__unused__))) ++{ ++ DBusError error; ++ ++ if (dbus_message_is_signal (message, ++ DBUS_INTERFACE_LOCAL, ++ "Disconnected")) { ++ dbg("gvm_do_filter_dbus_msg: received Disconnected message\n"); ++ g_timeout_add(1000, gvm_reconnect_to_hal, NULL); ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ else ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} ++ + /** Integrate a dbus mainloop. + * + * @param ctx LibHal context +@@ -1366,14 +1436,15 @@ + static dbus_bool_t + hal_mainloop_integration (LibHalContext *ctx, DBusError *error) + { +- DBusConnection *dbus_connection; +- + dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error); + + if (dbus_error_is_set (error)) + return FALSE; ++ ++ dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE); + + dbus_connection_setup_with_g_main (dbus_connection, NULL); ++ dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL); + + libhal_ctx_set_dbus_connection (ctx, dbus_connection); + +@@ -1516,6 +1587,10 @@ + DBusError error; + GSList *l; + ++ if (ctx == NULL) { ++ warn("unmount_all: No hal connection! can't unmount volumes\n"); ++ return; ++ } + dbg ("unmounting all volumes that we saw mounted in our life\n"); + dbus_error_init (&error); + for (l = all_mounted_volumes; l != NULL; l = g_slist_next (l)) { ================================================================ From paladine at pld-linux.org Wed Aug 24 13:17:54 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: gnome-volume-manager.spec - added 2 patches from ubuntu - r... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added 2 patches from ubuntu - rel. 2 ---- Files affected: SPECS: gnome-volume-manager.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.30 SPECS/gnome-volume-manager.spec:1.31 --- SPECS/gnome-volume-manager.spec:1.30 Tue Aug 23 16:55:56 2005 +++ SPECS/gnome-volume-manager.spec Wed Aug 24 13:17:47 2005 @@ -3,13 +3,15 @@ Summary(pl): Zarz?dca wolumin?w dla GNOME Name: gnome-volume-manager Version: 1.3.2 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-volume-manager/1.3/%{name}-%{version}.tar.gz # Source0-md5: 85582b7bae862cffc72fa69098d5053c Patch0: %{name}-desktop.patch Patch1: %{name}-less_verbose.patch +Patch2: %{name}-nonmountable_media.patch +Patch3: %{name}-reconnect_on_dbus_exit.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 @@ -49,6 +51,8 @@ %patch0 -p1 # patch1 disabled until stable release #%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__glib_gettextize} @@ -59,7 +63,7 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ + --disable-schemas-install %{__make} %install @@ -96,6 +100,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/24 11:17:47 paladine +- added 2 patches from ubuntu +- rel. 2 + Revision 1.30 2005/08/23 14:55:56 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Wed Aug 24 13:18:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: web-cyradm.spec - use %apache_config triggers for linking a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %apache_config triggers for linking apache config ---- Files affected: SPECS: web-cyradm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.5 SPECS/web-cyradm.spec:1.6 --- SPECS/web-cyradm.spec:1.5 Wed Aug 24 13:17:03 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:18:46 2005 @@ -103,22 +103,11 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/httpd/%{name}.conf - %service -q httpd reload -fi - -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - - %service -q httpd reload - fi -fi +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %files -f %{name}.lang %defattr(644,root,root,755) @@ -135,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 11:18:46 glen +- use %apache_config triggers for linking apache config + Revision 1.5 2005/08/24 11:17:03 glen - use %service reload, as it's only config change (ie not modules update) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 13:19:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: web-cyradm.spec - require apache2 as the .spec doesn't supp... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:19:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require apache2 as the .spec doesn't support more ---- Files affected: SPECS: web-cyradm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.6 SPECS/web-cyradm.spec:1.7 --- SPECS/web-cyradm.spec:1.6 Wed Aug 24 13:18:46 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:19:49 2005 @@ -20,7 +20,7 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ BuildRequires: rpmbuild(macros) >= 1.228 -Requires: apache +Requires: apache >= 2.0 Requires: php Requires: php-gettext Requires: php-pear-DB @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 11:19:49 glen +- require apache2 as the .spec doesn't support more + Revision 1.6 2005/08/24 11:18:46 glen - use %apache_config triggers for linking apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 13:26:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (AC-branch): rpm.spec, rpm-macros.spec, rpm.spec - rpm_macro... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:26:47 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - rpm_macros_rev 1.235 ---- Files affected: SPECS: rpm.spec (1.555.2.97 -> 1.555.2.98) SPECS: rpm-macros.spec (1.19 -> 1.20) , rpm.spec (1.684 -> 1.685) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.97 SPECS/rpm.spec:1.555.2.98 --- SPECS/rpm.spec:1.555.2.97 Sat Aug 20 21:03:55 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:41 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.2.52-10 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1113,6 +1113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.555.2.98 2005/08/24 11:26:41 glen +- rpm_macros_rev 1.235 + Revision 1.555.2.97 2005/08/20 19:03:55 glen - remove arch dependant %install macros from noarch macros file @@ -1613,7 +1616,7 @@ - current macros rev is 1.153 Revision 1.551 2004/05/27 20:30:13 pluto -- %%{_target_base_arch} macro added. +- %{_target_base_arch} macro added. - release 0.snap.23. Revision 1.550 2004/05/23 14:50:52 qboosh ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.19 SPECS/rpm-macros.spec:1.20 --- SPECS/rpm-macros.spec:1.19 Tue Aug 23 20:19:49 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:26:42 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.233 +%define rpm_macros_rev 1.235 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.19 2005/08/23 18:19:49 glen - rpm macros 1.233 ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.684 SPECS/rpm.spec:1.685 --- SPECS/rpm.spec:1.684 Tue Aug 16 01:26:22 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:42 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.3.27-1 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1104,6 +1104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.685 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.684 2005/08/15 23:26:22 glen - add posttrans debug patch, rel 2 (to be greater than ac) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.97&r2=1.555.2.98&f=u http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.19&r2=1.20&f=u http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.684&r2=1.685&f=u From glen at pld-linux.org Wed Aug 24 13:27:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: rpm-macros.spec - add builder help how to build for Ac In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:27:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add builder help how to build for Ac ---- Files affected: SPECS: rpm-macros.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.20 SPECS/rpm-macros.spec:1.21 --- SPECS/rpm-macros.spec:1.20 Wed Aug 24 13:26:42 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:27:11 2005 @@ -2,6 +2,7 @@ # NOTE # - AC-branch is TAG. please move the tag if rebuild needed: # $ cvs tag -F AC-branch rpm-macros.spec +# $ ./builder -r AC-branch -bb rpm-macros.spec # TODO # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. @@ -60,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 11:27:11 glen +- add builder help how to build for Ac + Revision 1.20 2005/08/24 11:26:42 glen - rpm_macros_rev 1.235 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Wed Aug 24 13:35:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: macromedia-flash.spec - split version to major and minor ve... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:35:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - split version to major and minor vers - macros not needed for installer package ---- Files affected: SPECS: macromedia-flash.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.35 SPECS/macromedia-flash.spec:1.36 --- SPECS/macromedia-flash.spec:1.35 Tue Aug 23 22:41:27 2005 +++ SPECS/macromedia-flash.spec Wed Aug 24 13:35:04 2005 @@ -1,8 +1,10 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package -# + +%define _ver_major 7 +%define _ver_minor 0 +%define _ver_patch 25 Summary: Flash plugin for Netscape-compatible WWW browsers Summary(pl): Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape %define base_name macromedia-flash @@ -11,18 +13,20 @@ %else Name: %{base_name}-installer %endif -Version: 7.0r25 -Release: 2.26%{?with_license_agreement:wla} +Version: %{_ver_major}.%{_ver_minor}.%{_ver_patch} +Release: 2.29%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} -Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz +Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{_ver_major}.%{_ver_minor}r%{_ver_patch}/install_flash_player_%{_ver_major}_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %else Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flashplayer/ +%if %{with license_agreement} BuildRequires: rpmbuild(macros) >= 1.235 +%endif Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: cpio @@ -146,6 +150,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 11:35:04 glen +- split version to major and minor vers +- macros not needed for installer package + Revision 1.35 2005/08/23 20:41:27 qboosh - updated pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.35&r2=1.36&f=u From aflinta at pld-linux.org Wed Aug 24 14:56:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gnome-vfs-2.11.92.tar.bz2 Message-ID: <5472.1124888174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-2.11.92.tar.bz2 18c8c5127d1eebfd51c8b6d631f3c949 gnome-vfs-2.11.92.tar.bz2 Size: 1705543 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 14:56:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 12:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.12 -> 1.157.2.13) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.12 SPECS/gnome-vfs2.spec:1.157.2.13 --- SPECS/gnome-vfs2.spec:1.157.2.12 Tue Aug 23 16:51:55 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 14:56:00 2005 @@ -2,12 +2,12 @@ Summary: GNOME2 - virtual file system Summary(pl): GNOME2 - wirtualny system plik?w Name: gnome-vfs2 -Version: 2.11.90 -Release: 4 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: e6c55660c8190eb3c58c90c1a6988044 +# Source0-md5: 18c8c5127d1eebfd51c8b6d631f3c949 Source1: %{name}-defaults.list Patch0: %{name}-defaults-path.patch Patch1: %{name}-no_g_mime.patch @@ -98,7 +98,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p0 +#%patch4 -p0 %build # force rebuild @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.13 2005/08/24 12:56:00 aflinta +- 2.11.92 + Revision 1.157.2.12 2005/08/23 14:51:55 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.12&r2=1.157.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:22 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): totem.spec - 1.1.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 13:22:22 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.1.5 ---- Files affected: SPECS: totem.spec (1.46.2.12 -> 1.46.2.13) ---- Diffs: ================================================================ Index: SPECS/totem.spec diff -u SPECS/totem.spec:1.46.2.12 SPECS/totem.spec:1.46.2.13 --- SPECS/totem.spec:1.46.2.12 Thu Aug 18 14:03:46 2005 +++ SPECS/totem.spec Wed Aug 24 15:22:15 2005 @@ -10,12 +10,12 @@ Summary: Movie player for GNOME 2 based on the gstreamer engine Summary(pl): Odtwarzacz film?w dla GNOME 2 oparty na silniku gstreamer Name: totem -Version: 1.1.4 -Release: 2 +Version: 1.1.5 +Release: 1 License: GPL Group: Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/%{name}-%{version}.tar.bz2 -# Source0-md5: 5b4e5216c2dc1fe06c8b7d83bae89a13 +# Source0-md5: cc203683cc2cf7e3585cd0b25de55c7f Patch0: %{name}-desktop.patch URL: http://www.hadess.net/totem.php3 BuildRequires: GConf2-devel @@ -204,6 +204,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.13 2005/08/24 13:22:15 aflinta +- 1.1.5 + Revision 1.46.2.12 2005/08/18 12:03:46 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/totem.spec?r1=1.46.2.12&r2=1.46.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: totem-1.1.5.tar.bz2 Message-ID: <22535.1124889749@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/totem-1.1.5.tar.bz2 cc203683cc2cf7e3585cd0b25de55c7f totem-1.1.5.tar.bz2 Size: 1623055 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 16:52:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES (DEVEL): gnome-vfs2-defaults-path.patch - up for 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 14:52:34 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 2.11.92 ---- Files affected: SOURCES: gnome-vfs2-defaults-path.patch (1.2 -> 1.2.2.1) ---- Diffs: ================================================================ Index: SOURCES/gnome-vfs2-defaults-path.patch diff -u SOURCES/gnome-vfs2-defaults-path.patch:1.2 SOURCES/gnome-vfs2-defaults-path.patch:1.2.2.1 --- SOURCES/gnome-vfs2-defaults-path.patch:1.2 Mon Mar 7 23:21:11 2005 +++ SOURCES/gnome-vfs2-defaults-path.patch Wed Aug 24 16:52:29 2005 @@ -1,19 +1,7 @@ -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2004-12-14 16:30:29.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2005-02-06 22:33:14.677240592 +0100 -@@ -150,7 +150,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c gnome-vfs-2.9.90/libgnomevfs/xdgmime.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2004-12-14 16:30:30.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2005-02-06 22:33:25.327621488 +0100 -@@ -207,7 +207,7 @@ +diff -urN gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c gnome-vfs-2.11.92/libgnomevfs/xdgmime.c +--- gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c 2005-08-24 14:42:16.910606480 +0200 ++++ gnome-vfs-2.11.92/libgnomevfs/xdgmime.c 2005-08-24 14:42:50.795455200 +0200 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-vfs2-defaults-path.patch?r1=1.2&r2=1.2.2.1&f=u From paladine at pld-linux.org Wed Aug 24 17:00:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES (DEVEL): gnome-vfs2-handle-drives-without-media-detection.... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:27 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed in sources ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:00:59 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - removed handle-drives-without-med... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - removed handle-drives-without-media-detection ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.13 -> 1.157.2.14) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.13 SPECS/gnome-vfs2.spec:1.157.2.14 --- SPECS/gnome-vfs2.spec:1.157.2.13 Wed Aug 24 14:56:00 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 17:00:54 2005 @@ -13,7 +13,6 @@ Patch1: %{name}-no_g_mime.patch Patch2: %{name}-fstab_edit_crash.patch Patch3: %{name}-disable_cdda.patch -Patch4: %{name}-handle-drives-without-media-detection.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -98,7 +97,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p0 %build # force rebuild @@ -195,6 +193,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.14 2005/08/24 15:00:54 paladine +- removed handle-drives-without-media-detection + Revision 1.157.2.13 2005/08/24 12:56:00 aflinta - 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.13&r2=1.157.2.14&f=u From paladine at pld-linux.org Wed Aug 24 17:02:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (R... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:02:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove it! ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: dbus-python_types.patch (REMOVED) - fixed in sources In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed in sources ---- Files affected: SOURCES: dbus-python_types.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: dbus.spec - updated to 0.36 - removed python_types patch (a... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36 - removed python_types patch (already in sources) ---- Files affected: SPECS: dbus.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.92 SPECS/dbus.spec:1.93 --- SPECS/dbus.spec:1.92 Tue Aug 23 16:39:33 2005 +++ SPECS/dbus.spec Wed Aug 24 17:08:15 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.35.2 -Release: 0.2 +Version: 0.36 +Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: 414680dddd3dec84cc3b0c45cdfaafbc +# Source0-md5: c969d0a11599e5950fb28eeed8b353ba Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -37,7 +37,6 @@ Patch2: %{name}-config.patch Patch3: %{name}-mint.patch Patch4: %{name}-python_fixes.patch -Patch5: %{name}-python_types.patch URL: http://www.freedesktop.org/Software/dbus BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.52 @@ -316,7 +315,6 @@ %patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in} %build @@ -537,6 +535,7 @@ %defattr(644,root,root,755) %dir %{py_sitedir}/%{name}/ %attr(755,root,root) %{py_sitedir}/%{name}/*.so +%{py_sitedir}/dbus.pth %{py_sitedir}/%{name}/*.py[co] %endif @@ -546,6 +545,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/24 15:08:15 paladine +- updated to 0.36 +- removed python_types patch (already in sources) + Revision 1.92 2005/08/23 14:39:33 paladine - added missing commit log - added BR: libselinux-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.92&r2=1.93&f=u From paladine at pld-linux.org Wed Aug 24 17:08:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: dbus-0.36.tar.gz Message-ID: <2655.1124896105@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.tar.gz c969d0a11599e5950fb28eeed8b353ba dbus-0.36.tar.gz Size: 1600854 bytes -- Virtually Yours: distfiles. From pascalek at pld-linux.org Wed Aug 24 17:17:25 2005 From: pascalek at pld-linux.org (pascalek) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: qt4.spec - typo In-Reply-To: References: Message-ID: Author: pascalek Date: Wed Aug 24 15:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: qt4.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.38 SPECS/qt4.spec:1.39 --- SPECS/qt4.spec:1.38 Tue Aug 23 12:46:45 2005 +++ SPECS/qt4.spec Wed Aug 24 17:17:17 2005 @@ -753,7 +753,7 @@ sub-examples-all-ordered %{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} -#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_mysql: %{__make} -C src/plugins/sqldrivers/mysql} %{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} %{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} %{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} @@ -1131,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/24 15:17:17 pascalek +- typo + Revision 1.38 2005/08/23 10:46:45 pluto - missed %dir %{_libdir}/qt4 added. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.38&r2=1.39&f=u From paladine at pld-linux.org Wed Aug 24 18:15:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NEW) - change c... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change cosmos theme dir ---- Files affected: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-screensaver-cosmos_theme_dir.patch diff -u /dev/null SOURCES/gnome-screensaver-cosmos_theme_dir.patch:1.1 --- /dev/null Wed Aug 24 18:15:34 2005 +++ SOURCES/gnome-screensaver-cosmos_theme_dir.patch Wed Aug 24 18:15:28 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-screensaver-0.0.9.orig/configure.ac gnome-screensaver-0.0.9/configure.ac +--- gnome-screensaver-0.0.9.orig/configure.ac 2005-08-24 17:44:41.294062536 +0200 ++++ gnome-screensaver-0.0.9/configure.ac 2005-08-24 17:44:55.933836952 +0200 +@@ -1372,7 +1372,7 @@ + AC_SUBST(LDFLAGS) + + # Saver engine stuff +-SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/pixmaps/backgrounds/cosmos" ++SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/gnome-screensaver/themes/cosmos" + + AC_SUBST(SLIDESHOW_COSMOS_DIR) + ================================================================ From paladine at pld-linux.org Wed Aug 24 18:15:46 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: gnome-screensaver.spec - updated to 0.0.9 (new themes) - ad... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.9 (new themes) - added cosmos_theme_dir patch - sorted %%files - itemize schemas ---- Files affected: SPECS: gnome-screensaver.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/gnome-screensaver.spec diff -u SPECS/gnome-screensaver.spec:1.4 SPECS/gnome-screensaver.spec:1.5 --- SPECS/gnome-screensaver.spec:1.4 Wed Jul 27 22:04:54 2005 +++ SPECS/gnome-screensaver.spec Wed Aug 24 18:15:41 2005 @@ -2,14 +2,15 @@ Summary: GNOME screensaver Summary(pl): Wygaszacz ekranu GNOME Name: gnome-screensaver -Version: 0.0.8 +Version: 0.0.9 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/%{name}-%{version}.tar.gz -# Source0-md5: 7f5b63f61aa7019dfd411054cf53916a +# Source0-md5: 3cd0458bfb1ae1bc96820157560042cc Source1: %{name}.pamd Patch0: %{name}-desktop.patch +Patch1: %{name}-cosmos_theme_dir.patch BuildRequires: GConf2-devel >= 2.6.1 BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -82,11 +84,11 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gnome-screensaver -%{_sysconfdir}/gconf/schemas/* %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/* %{_datadir}/%{name} %{_desktopdir}/*.desktop +%attr(755,root,root) %{_libdir}/* +%{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -94,6 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 16:15:41 paladine +- updated to 0.0.9 (new themes) +- added cosmos_theme_dir patch +- sorted %%files +- itemize schemas + Revision 1.4 2005/07/27 20:04:54 qboosh - sorted verify() flags, no need for default attr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 18:15:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:06 2005 Subject: DISTFILES: gnome-screensaver-0.0.9.tar.gz Message-ID: <3170.1124900147@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/gnome-screensaver-0.0.9.tar.gz 3cd0458bfb1ae1bc96820157560042cc gnome-screensaver-0.0.9.tar.gz Size: 1878783 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:19:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:06 2005 Subject: SPECS: lkcp.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 16:19:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: lkcp.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u /dev/null SPECS/lkcp.spec:1.1 --- /dev/null Wed Aug 24 18:19:03 2005 +++ SPECS/lkcp.spec Wed Aug 24 18:18:58 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +Summary: Live Kernel Configuration Panel +Name: lkcp +Version: 0.5.3 +Release: 1 +License: GPL v2 +Group: Applications +Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +# Source0-md5: 020f788b8c9ac52636b357e8929f7e30 +URL: http://webspace.utexas.edu/~hyoussef/ +BuildRequires: glib-devel +BuildRequires: ncurses-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Live Kernel Configuration Panel (LKCP) is an ncurses interface to the +run-time Linux kernel configuration data that can be accessed through +the /proc filesystem. It also generates a bash script of your recently +committed changes to the /proc/sys filesystem. + +%description -l pl +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do +konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy +ostatnie zmiany dokonane w systemie plik?w /proc/sys. + +%prep +%setup -q + +%build +%{__make} -C src \ + CC="%{__cc}" \ + FLAGS="%{rpmcflags} -I/usr/include/ncurses" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_bindir} +install src/lkcp $RPM_BUILD_ROOT%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc AUTHORS CREDITS Changelog README TODO Documentation/ +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 16:18:58 adamg +- new + + ================================================================ From adamg at pld-linux.org Wed Aug 24 18:19:00 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <5161.1124900340@distfiles.pld-linux.org> wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:23:32 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <7632.1124900612@distfiles.pld-linux.org> wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-24 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 snap ---- Files affected: SPECS: horde-passwd.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.21 SPECS/horde-passwd.spec:1.22 --- SPECS/horde-passwd.spec:1.21 Wed Aug 24 10:37:51 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:12 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-23 -%define _rel 2 +%define _snap 2005-08-24 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -9,14 +9,13 @@ Name: horde-passwd Version: 3.0 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: LGPL +License: ASL Vendor: The Horde Project Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz -# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 +# Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -49,8 +48,8 @@ modu?. %prep -%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} -%patch0 -p1 +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 16:58:12 glen +- updated to 2005-08-24 snap + Revision 1.21 2005/08/24 08:37:51 paszczus - ok, it is not a fake dep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 18:58:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: passwd-HEAD-2005-08-24.tar.gz Message-ID: <28419.1124902700@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-24/passwd-HEAD-2005-08-24.tar.gz 6638fad5170d5421bacf7e44868a7964 passwd-HEAD-2005-08-24.tar.gz Size: 903605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: horde-passwd.spec - license ASL In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license ASL ---- Files affected: SPECS: horde-passwd.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.22 SPECS/horde-passwd.spec:1.23 --- SPECS/horde-passwd.spec:1.22 Wed Aug 24 18:58:12 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:53 2005 @@ -141,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 16:58:53 glen +- license ASL + Revision 1.22 2005/08/24 16:58:12 glen - updated to 2005-08-24 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.22&r2=1.23&f=u From glen at pld-linux.org Wed Aug 24 19:04:37 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: horde-passwd.spec - cosmetics In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:04:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: horde-passwd.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.23 SPECS/horde-passwd.spec:1.24 --- SPECS/horde-passwd.spec:1.23 Wed Aug 24 18:58:53 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 19:04:32 2005 @@ -12,13 +12,14 @@ License: ASL Vendor: The Horde Project Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf URL: http://www.horde.org/passwd/ -BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) @@ -124,7 +125,7 @@ %attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php %attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/24 17:04:32 glen +- cosmetics + Revision 1.23 2005/08/24 16:58:53 glen - license ASL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Wed Aug 24 19:05:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: template-horde.spec - %{_hordeapp} macro, unify In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:05:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %{_hordeapp} macro, unify ---- Files affected: SPECS: template-horde.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/template-horde.spec diff -u SPECS/template-horde.spec:1.3 SPECS/template-horde.spec:1.4 --- SPECS/template-horde.spec:1.3 Wed Aug 3 19:49:12 2005 +++ SPECS/template-horde.spec Wed Aug 24 19:05:14 2005 @@ -8,23 +8,27 @@ # FIND .htaccess FILES AND MAKE SURE APACHE CONF DISABLES ACCESS TO # THOSE DIRS: find -name '.??*' IS EASY TO LOCATE. +%define _hordeapp skeleton %include /usr/lib/rpm/macros.php Summary: Template for horde projects Name: skeleton Version: 0.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL v2 (CHECK IT FIRST) +License: GPL v2 (CHECK IT FIRST, could be ASL) Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}.tar.gz +#Source0: ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}.tar.gz #Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}-%{_rc}.tar.gz -#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: - # COPY IN SOURCES ../SOURCES/ingo.conf AS SOURCE1 HERE: # cp ../SOURCES/{ingo,skeleton}.conf # DON'T FORGET TO :%s#ingo#skeleton#g in that file Source1: %{name}.conf +Patch0: %{name}-prefs.patch URL: http://www.horde.org/skeleton/ +BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -35,9 +39,9 @@ %define _noautocompressdoc CREDITS %define _noautoreq 'pear(Horde.*)' -%define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define hordedir /usr/share/horde +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} # GET DESCRIPTION FROM PROJECT URL %description @@ -55,40 +59,41 @@ Skeleton) mo?na znale?? na stronie . %prep -%setup -q -n %{?_snap:%{name}}%{!?_snap:%{name}-h3-%{version}%{?_rc:-%{_rc}}} +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 # considered harmful (horde/docs/SECURITY) rm -f test.php %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi # CHECK FIRST DOES IT HAVE SQL AND FILE THERE. @@ -102,13 +107,13 @@ fi %triggerin -- apache1 >= 1.3.33-2 -%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache1 >= 1.3.33-2 %apache_config_uninstall -v 1 %triggerin -- apache >= 2.0.0 -%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache >= 2.0.0 %apache_config_uninstall -v 2 @@ -116,12 +121,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -138,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 17:05:14 glen +- %{_hordeapp} macro, unify + Revision 1.3 2005/08/03 17:49:12 qboosh - pl desc skeleton ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.3&r2=1.4&f=u From adamg at pld-linux.org Wed Aug 24 19:07:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: Mail-1.1.8.tgz Message-ID: <1667.1124903225@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.8.tgz 69b1941019b686227123a879090241ab Mail-1.1.8.tgz Size: 16196 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:07 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.8 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.8 ---- Files affected: SPECS: php-pear-Mail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.22 SPECS/php-pear-Mail.spec:1.23 --- SPECS/php-pear-Mail.spec:1.22 Mon Aug 22 06:29:44 2005 +++ SPECS/php-pear-Mail.spec Wed Aug 24 19:07:02 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.7 +Version: 1.1.8 Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: f6307041810d18da6c6d04acdcc9b72a +# Source0-md5: 69b1941019b686227123a879090241ab URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 17:07:02 adamg +- updated to 1.1.8 + Revision 1.22 2005/08/22 04:29:44 adamg - updated to 1.1.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.22&r2=1.23&f=u From adamg at pld-linux.org Wed Aug 24 19:07:56 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: DB_DataObject_FormBuilder-0.18.1.tgz Message-ID: <2104.1124903276@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/DB_DataObject_FormBuilder-0.18.1.tgz 865fc02c5d596192e117e39a946719ca DB_DataObject_FormBuilder-0.18.1.tgz Size: 58383 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: php-pear-DB_DataObject_FormBuilder.spec - updated to 0.18.1 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.18.1 ---- Files affected: SPECS: php-pear-DB_DataObject_FormBuilder.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-DB_DataObject_FormBuilder.spec diff -u SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.17 --- SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 Wed May 4 22:52:35 2005 +++ SPECS/php-pear-DB_DataObject_FormBuilder.spec Wed Aug 24 19:07:49 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - automatically build HTML_QuickForm object from a DB_DataObject derived class Summary(pl): %{_pearname} - automatyczne budowanie obiektu HTML_QuickForm pochodz?cego z DB_DataObject Name: php-pear-%{_pearname} -Version: 0.14.0 +Version: 0.18.1 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 830d1ef268f3e84f608be61ac12f194e +# Source0-md5: 865fc02c5d596192e117e39a946719ca URL: http://pear.php.net/package/DB_DataObject_FormBuilder/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/24 17:07:49 adamg +- updated to 0.18.1 + Revision 1.16 2005/05/04 20:52:35 adamg - updated to 0.14.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-DB_DataObject_FormBuilder.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Wed Aug 24 19:09:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: php-pear-Net_Curl.spec - updated to 1.2.2 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:09:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.2 ---- Files affected: SPECS: php-pear-Net_Curl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_Curl.spec diff -u SPECS/php-pear-Net_Curl.spec:1.19 SPECS/php-pear-Net_Curl.spec:1.20 --- SPECS/php-pear-Net_Curl.spec:1.19 Sun Aug 21 20:10:26 2005 +++ SPECS/php-pear-Net_Curl.spec Wed Aug 24 19:09:44 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - an OO interface to the cURL extension Summary(pl): %{_pearname} - obiektowy interfejs do rozszerzenia cURL Name: php-pear-%{_pearname} -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 184d23b7054483dcb61fee5d1d6cc692 +# Source0-md5: 8b207ccf47795495b788034ef1049140 URL: http://pear.php.net/package/Net_Curl/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 17:09:44 adamg +- updated to 1.2.2 + Revision 1.19 2005/08/21 18:10:26 adamg - updated to 1.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_Curl.spec?r1=1.19&r2=1.20&f=u From adamg at pld-linux.org Wed Aug 24 19:09:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: Net_Curl-1.2.2.tgz Message-ID: <2977.1124903387@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_Curl-1.2.2.tgz 8b207ccf47795495b788034ef1049140 Net_Curl-1.2.2.tgz Size: 6729 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: PHPUnit-1.3.0.tgz Message-ID: <4469.1124903537@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/PHPUnit-1.3.0.tgz cd72efac3afe64c2499e643d53f3aba9 PHPUnit-1.3.0.tgz Size: 20898 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: php-pear-PHPUnit.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:12:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: php-pear-PHPUnit.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/php-pear-PHPUnit.spec diff -u SPECS/php-pear-PHPUnit.spec:1.24 SPECS/php-pear-PHPUnit.spec:1.25 --- SPECS/php-pear-PHPUnit.spec:1.24 Sat May 14 15:42:57 2005 +++ SPECS/php-pear-PHPUnit.spec Wed Aug 24 19:12:14 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - regression testing framework for unit tests Summary(pl): %{_pearname} - zestaw test?w regresyjnych Name: php-pear-%{_pearname} -Version: 1.2.3 +Version: 1.3.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 774238a3865f2c348c7450fa2df98ebb +# Source0-md5: cd72efac3afe64c2499e643d53f3aba9 URL: http://pear.php.net/package/PHPUnit/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 17:12:14 adamg +- updated to 1.3.0 + Revision 1.24 2005/05/14 13:42:57 adamg - updated to 1.2.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PHPUnit.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Wed Aug 24 19:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: ApacheJServ.spec - pl updates and fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:27:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl updates and fixes ---- Files affected: SPECS: ApacheJServ.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.39 SPECS/ApacheJServ.spec:1.40 --- SPECS/ApacheJServ.spec:1.39 Tue Aug 23 11:28:28 2005 +++ SPECS/ApacheJServ.spec Wed Aug 24 19:27:15 2005 @@ -53,8 +53,8 @@ in 100pc Java application, and listens for servlet requests using the Apache Java protocol (AJp). Typically, these requests will originate from the mod_jserv Apache module (DSO included). This package contains -a LGPL'ed implementation of sun's java servlet api version 2.0 by Paul -Siegmann +a LGPL'ed implementation of Sun's Java Servlet API version 2.0 by Paul +Siegmann . %description -l pl Apache JServ jest silnikiem serwletowym, rozwijanym przez Java Apache @@ -62,15 +62,15 @@ zosta? napisany od pocz?tku do ko?ca w Javie; nas?uchuje wywo?a? serwletu wykorzystuj?c protok?? Apache Java (AJp). Zazwyczaj wywo?ania te pochodz? z modu?u Apache mod_jservmodule (??cznie z DSO). Pakiet -ten zawiera sunowsk? implementacj? api serlet?w w javie w wersji 2.0 -(na licencji LGPL) napisana przez Paula Siegmanna - +ten zawiera implementacj? Java Servlet API Suna w wersji 2.0 napisan? +przez Paula Siegmanna (na licencji LGPL) +. %package init Summary: ApacheJServ initscript +Summary(pl): Skrypt startowy ApacheJServ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -BuildRequires: rpmbuild(macros) >= 1.202 Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/useradd @@ -79,13 +79,20 @@ %description init JServ initscript for standalone mode. +%description init -l pl +Skrypt startowy JServ dla trybu samodzielnego. + %package doc Summary: ApacheJServ documentation +Summary(pl): Dokumentacja do ApacheJServ Group: Development/Languages/Java %description doc ApacheJserv documentation. +%description doc -l pl +Dokumentacja do ApacheJServ. + %prep %setup -q -a1 %patch0 -p0 @@ -254,6 +261,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/24 17:27:15 qboosh +- pl updates and fixes + Revision 1.39 2005/08/23 09:28:28 glen - user/groupadd to init package - secret.key fill simplified ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.39&r2=1.40&f=u From adamg at pld-linux.org Wed Aug 24 19:37:31 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: cgdb-0.5.3.tar.gz Message-ID: <22441.1124905051@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/cgdb/cgdb-0.5.3.tar.gz 51adf1db0307adaba24336ef3a18e0c3 cgdb-0.5.3.tar.gz Size: 527341 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:37:29 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: cgdb.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:37:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: cgdb.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.11 SPECS/cgdb.spec:1.12 --- SPECS/cgdb.spec:1.11 Sat Jul 23 16:52:22 2005 +++ SPECS/cgdb.spec Wed Aug 24 19:37:24 2005 @@ -2,12 +2,12 @@ Summary: A lightweight, but fully functional curses frontend to gdb Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb -Version: 0.5.2 +Version: 0.5.3 Release: 1 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz -# Source0-md5: 275be939017a3e2f24442dbe498c1de7 +# Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch URL: http://cgdb.sourceforge.net/ BuildRequires: automake @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/24 17:37:24 adamg +- updated to 0.5.3 + Revision 1.11 2005/07/23 14:52:22 jareq - updated to 0.5.2 - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Wed Aug 24 19:39:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: initng.spec - initng-0.1.9 codenamed "Hopefully Rebooting" In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:39:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initng-0.1.9 codenamed "Hopefully Rebooting" ---- Files affected: SPECS: initng.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/initng.spec diff -u SPECS/initng.spec:1.21 SPECS/initng.spec:1.22 --- SPECS/initng.spec:1.21 Sat Aug 13 12:11:17 2005 +++ SPECS/initng.spec Wed Aug 24 19:39:02 2005 @@ -1,19 +1,16 @@ # $Revision$, $Date$ -# TODO -# - plugins build doesn't pass CFLAGS Summary: A next generation init replacement Summary(pl): Zamiennik inita nast?pnej generacji Name: initng -Version: 0.1.8 +Version: 0.1.9 Release: 0.1 Epoch: 0 License: GPL v2 Group: Base Source0: http://initng.thinktux.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: c4a18ebc8d31875abffac3b5552c242e -Patch0: %{name}-PLD.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-utmpx.patch +# Source0-md5: b8c2117da50a1417deb3f3d4a3a1ab7f +Patch0: %{name}-lib64.patch +#Patch2: %{name}-utmpx.patch URL: http://jw.dyndns.org/initng/ BuildRequires: sed >= 4.0 BuildRequires: /etc/pld-release @@ -78,11 +75,11 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 #%patch2 -p1 %build %configure \ + --%{?debug:en}%{!?debug:dis}able-debug \ --sysconfdir=/etc \ --libdir=/%{_lib} \ @@ -121,18 +118,18 @@ %doc doc/empty.conf doc/hard.conf %doc doc/gentoo-chart.png doc/initng-chart.png %dir %{_sysconfdir} -%dir %{_sysconfdir}/conf +#%dir %{_sysconfdir}/conf %dir %{_sysconfdir}/daemon %dir %{_sysconfdir}/debug %dir %{_sysconfdir}/net %dir %{_sysconfdir}/system -%dir %{_sysconfdir}/plugin +#%dir %{_sysconfdir}/plugin %dir %{_libdir} %dir %{_libdir}/scripts %dir %{_libdir}/scripts/net -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i %attr(755,root,root) /%{_lib}/libinitng.so.*.*.* -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/lib*.so %attr(755,root,root) %{_sbindir}/install_service %attr(755,root,root) %{_sbindir}/initng %attr(755,root,root) %{_sbindir}/ng-update @@ -166,9 +163,11 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/net/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.runlevel -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml %attr(755,root,root) %{_sbindir}/gen_system_runlevel +%attr(755,root,root) %{_sbindir}/shutdown_script +%attr(755,root,root) %{_sbindir}/test_pidfile %attr(755,root,root) %{_libdir}/scripts/net/dhclient-wrapper %attr(755,root,root) %{_libdir}/scripts/net/dhcp %attr(755,root,root) %{_libdir}/scripts/net/dhcpcd-backgrounder @@ -189,6 +188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 17:39:02 glen +- initng-0.1.9 codenamed "Hopefully Rebooting" + Revision 1.21 2005/08/13 10:11:17 glen - updated to 0.1.8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 19:39:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: initng-0.1.9.tar.bz2 Message-ID: <23480.1124905152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://initng.thinktux.net/download/initng-0.1.9.tar.bz2 b8c2117da50a1417deb3f3d4a3a1ab7f initng-0.1.9.tar.bz2 Size: 603927 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Wed Aug 24 19:50:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: Sman.spec - pl, missing dir In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing dir ---- Files affected: SPECS: Sman.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.1 SPECS/Sman.spec:1.2 --- SPECS/Sman.spec:1.1 Sun Aug 21 13:00:10 2005 +++ SPECS/Sman.spec Wed Aug 24 19:50:07 2005 @@ -5,6 +5,7 @@ # %include /usr/lib/rpm/macros.perl Summary: Searcher for Man pages +Summary(pl): Wyszukiwarka stron Man Name: Sman Version: 0.95 Release: 0.1 @@ -14,19 +15,15 @@ Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz # Source0-md5: b786338eba068a4a110bf2bbda51e695 URL: http://joshr.com/src/sman/ -BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib BuildRequires: perl-FreezeThaw +BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: swish-e-perl -%if %{with tests} -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -#%%define _noautoreq 'perl(anything_fake_or_conditional)' - %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -52,6 +49,30 @@ - Performs 'stemming' so that a search for "searches" will match a document with the word "searching" +%description -l pl +Sman to wyszukiwarka stron Man. Jest to rozszerzona wersja 'apropos' i +'man -k' oparta na przyk?adzie o tej samej nazwie z artyku?u Josha +Rabinowitza "How To Index Anything" ("Jak indeksowa? cokolwiek") w +numerze Linux Journal z czerwca 2003 +. Sman dodaje kilka +kluczowych mo?liwo?ci, kt?rych nie maj? poprzednicy: + +- obs?uguje z?o?one wyszukiwania tekstu w j?zyku naturalnym, takie jak + "(linux and kernel) or (mach and microkernel)" + +- pokazuje wyniki w kolejno?ci punktacji i opcjonalnie wyci?g ze + strony (przy u?yciu -e) z pod?wietleniem wyszukiwanego tekstu + +- pozwala na wyszukiwanie po sekcji, tytule, ciele i nazwie pliku + strony (przy u?yciu 'nazwa-meta=szukane-s?owo') + +- indeksuje ca?? zawarto?? stron man, a nie tylko tytu? i opis + +- u?ywa wcze?niej zbudowanego indeksu w celu szybszego wyszukiwania + +- wykonuje "stemming", przez co np. wyszukiwanie s?owa "searches" + znajdzie dokument ze s?owem "searching" + %prep %setup -q @@ -83,6 +104,7 @@ %{perl_vendorlib}/Sman/Config.pm %dir %{perl_vendorlib}/Sman/Man %{perl_vendorlib}/Sman/Man/Cache.pm +%dir %{perl_vendorlib}/Sman/Man/Cache %{perl_vendorlib}/Sman/Man/Cache/DB_File.pm %{perl_vendorlib}/Sman/Man/Cache/FileCache.pm %{perl_vendorlib}/Sman/Man/Convert.pm @@ -99,6 +121,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 17:50:07 qboosh +- pl, missing dir + Revision 1.1 2005/08/21 11:00:10 twittner - added, not tested - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Wed Aug 24 20:04:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: X11-driver-evdev.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 18:04:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: X11-driver-evdev.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/X11-driver-evdev.spec diff -u SPECS/X11-driver-evdev.spec:1.1 SPECS/X11-driver-evdev.spec:1.2 --- SPECS/X11-driver-evdev.spec:1.1 Sun Aug 21 16:32:08 2005 +++ SPECS/X11-driver-evdev.spec Wed Aug 24 20:04:06 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: An input device driver for X +Summary(pl): Sterownik urz?dze? wej?ciowych dla X Name: X11-driver-evdev Version: 0.2 Release: 1 @@ -22,10 +23,16 @@ %define _prefix /usr/X11R6 %description -This driver uses the linux input layer directly and can handle both +This driver uses the Linux input layer directly and can handle both mice and keyboards. Please read and comment at: https://bugs.freedesktop.org/show_bug.cgi?id=968 +%description -l pl +Ten sterownik u?ywa bezpo?rednio warstwy wej?ciowej Linuksa i mo?e +obs?u?y? zar?wno myszy jak i klawiatury. Mo?na o nim przeczyta? i +napisa? komentarz pod adresem: +https://bugs.freedesktop.org/show_bug.cgi?id=968 + %prep %setup -q -n evdev-driver-%{version} %patch0 @@ -54,7 +61,7 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog README -%attr(644,root,root) %{_libdir}/modules/input/evdev_drv.o +%{_libdir}/modules/input/evdev_drv.o %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -62,5 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:04:06 qboosh +- pl + Revision 1.1 2005/08/21 14:32:08 pluto - evdev driver for input devices. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-evdev.spec?r1=1.1&r2=1.2&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: phpPgAdmin.spec - updated to 3.5.5 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.5.5 ---- Files affected: SPECS: phpPgAdmin.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/phpPgAdmin.spec diff -u SPECS/phpPgAdmin.spec:1.45 SPECS/phpPgAdmin.spec:1.46 --- SPECS/phpPgAdmin.spec:1.45 Sat Apr 16 15:36:29 2005 +++ SPECS/phpPgAdmin.spec Wed Aug 24 20:17:13 2005 @@ -2,12 +2,12 @@ Summary: phpPgAdmin - web-based PostgreSQL administration Summary(pl): phpPgAdmin - administracja bazami PostgreSQL przez WWW Name: phpPgAdmin -Version: 3.5.3 +Version: 3.5.5 Release: 1 License: GPL v2+ Group: Applications/Databases/Interfaces Source0: http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2 -# Source0-md5: 91a9e6bce537422febedc5666ad296d6 +# Source0-md5: 26ff10b0bc1c4a313ddcf6e679cb4adf Source1: %{name}.conf URL: http://sourceforge.net/projects/phppgadmin/ Requires: php >= 4.1 @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/24 18:17:13 adamg +- updated to 3.5.5 + Revision 1.45 2005/04/16 13:36:29 charles - updated to 3.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/phpPgAdmin.spec?r1=1.45&r2=1.46&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: phpPgAdmin-3.5.5.tar.bz2 Message-ID: <15638.1124907439@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/phppgadmin/phpPgAdmin-3.5.5.tar.bz2 26ff10b0bc1c4a313ddcf6e679cb4adf phpPgAdmin-3.5.5.tar.bz2 Size: 457450 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:19:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS (DEVEL): edb.spec - updated to 1.0.5.004 - new Source0 ("off... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:19:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.0.5.004 - new Source0 ("official" snapshots) - updated -ac_fix.patch ---- Files affected: SPECS: edb.spec (1.21.2.2 -> 1.21.2.3) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.2 SPECS/edb.spec:1.21.2.3 --- SPECS/edb.spec:1.21.2.2 Sat Jul 9 15:03:42 2005 +++ SPECS/edb.spec Wed Aug 24 20:19:40 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Database Access Library Summary(pl): Biblioteka Enlightementa dost?pu do baz danych Name: edb -Version: 1.0.5.003 -%define _snap 20050701 -Release: 1.%{_snap}.0.1 +Version: 1.0.5.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 870592c7ef67ae31abfe5f37861a689e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch URL: http://www.enlightement.org/ BuildRequires: autoconf @@ -64,13 +62,13 @@ Edytor baz danych w GTK+. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"; export CFLAGS %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -122,6 +120,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.3 2005/08/24 18:19:40 charles +- updated to 1.0.5.004 +- new Source0 ("official" snapshots) +- updated -ac_fix.patch + Revision 1.21.2.2 2005/07/09 13:03:42 sparky - new snapshot - correct license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.2&r2=1.21.2.3&f=u From charles at pld-linux.org Wed Aug 24 20:19:48 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: edb-1.0.5.004.tar.gz Message-ID: <17162.1124907588@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edb-1.0.5.004.tar.gz 2565467041d770240f93969c6055e35f edb-1.0.5.004.tar.gz Size: 631960 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:48 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: lkcp-0.5.3.tar.bz2 Message-ID: <18052.1124907648@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://lkcp-0.5.3.tar.bz2 020f788b8c9ac52636b357e8929f7e30 lkcp-0.5.3.tar.bz2 Size: 104394 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: lkcp.spec - distfiles workaround In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:20:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - distfiles workaround ---- Files affected: SPECS: lkcp.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.1 SPECS/lkcp.spec:1.2 --- SPECS/lkcp.spec:1.1 Wed Aug 24 18:18:58 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:20:46 2005 @@ -5,7 +5,8 @@ Release: 1 License: GPL v2 Group: Applications -Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +#Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 # Source0-md5: 020f788b8c9ac52636b357e8929f7e30 URL: http://webspace.utexas.edu/~hyoussef/ BuildRequires: glib-devel @@ -19,8 +20,8 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do -konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -51,7 +52,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:20:46 adamg +- distfiles workaround + Revision 1.1 2005/08/24 16:18:58 adamg - new - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.1&r2=1.2&f=u From charles at pld-linux.org Wed Aug 24 20:22:29 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SOURCES (DEVEL): edb-ac_fix.patch - updated to 1.0.5.004 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:22:29 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated to 1.0.5.004 ---- Files affected: SOURCES: edb-ac_fix.patch (1.3.2.1 -> 1.3.2.2) ---- Diffs: ================================================================ Index: SOURCES/edb-ac_fix.patch diff -u SOURCES/edb-ac_fix.patch:1.3.2.1 SOURCES/edb-ac_fix.patch:1.3.2.2 --- SOURCES/edb-ac_fix.patch:1.3.2.1 Thu Mar 31 00:01:54 2005 +++ SOURCES/edb-ac_fix.patch Wed Aug 24 20:22:24 2005 @@ -1,6 +1,6 @@ ---- edb/configure.in~ 2005-03-04 01:11:17.000000000 +0100 -+++ edb/configure.in 2005-03-30 17:05:38.000000000 +0200 -@@ -25,55 +25,6 @@ +--- edb-1.0.5.004/configure.in.orig 2005-07-30 08:03:20.000000000 +0200 ++++ edb-1.0.5.004/configure.in 2005-08-24 13:54:09.000000000 +0200 +@@ -24,55 +24,6 @@ dnl AC_PROG_INSTALL() dnl AC_ARG_PROGRAM() @@ -56,7 +56,16 @@ dnl There are additional libraries we need for some compiler/architecture dnl combinations. AC_SUBST(LIBS) -@@ -457,7 +408,6 @@ +@@ -404,7 +355,7 @@ + ncurses_ok=no + gtk_ok=no + +-GTK_CONFIG=`which gtk-config` ++GTK_CONFIG=/usr/bin/gtk-config + if test -x "$GTK_CONFIG"; then + AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) + fi +@@ -456,7 +407,6 @@ edb-native.oe edb.bb edbXnative.bb ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/edb-ac_fix.patch?r1=1.3.2.1&r2=1.3.2.2&f=u From charles at pld-linux.org Wed Aug 24 20:25:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: ERRORS: eet-0.9.10.013.tar.gz Message-ID: <21647.1124907927@distfiles.pld-linux.org> FATAL: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz md5 mismatch, needed 82a7680c4eedf3c4a073fcdf7134cc91, got 875802e243e37e2eb954d3580cb19678 Files fetched: 0 -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:25:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: eet.spec - updated to 0.9.10.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.10.013 - new Source0 ("official" snapshots) - -devel R: libjpeg-devel, zlib-devel ---- Files affected: SPECS: eet.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.5 SPECS/eet.spec:1.6 --- SPECS/eet.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/eet.spec Wed Aug 24 20:25:23 2005 @@ -2,13 +2,11 @@ Summary: Library for speedy data storage, retrieval, and compression Summary(pl): Biblioteka do szybkiego zapisywania, odtwarzania i kompresji danych Name: eet -Version: 0.9.10.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.9 +Version: 0.9.10.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 URL: http://enlightenment.org/ BuildRequires: autoconf @@ -50,6 +48,8 @@ Summary(pl): Pliki nag??wkowe biblioteki Eet Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libjpeg-devel +Requires: zlib-devel %description devel Header files for Eet library. @@ -70,11 +70,11 @@ Statyczna biblioteka Eet. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -118,6 +118,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:25:23 charles +- updated to 0.9.10.013 +- new Source0 ("official" snapshots) +- -devel R: libjpeg-devel, zlib-devel + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:28:04 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: ecore-0.9.9.013.tar.gz Message-ID: <23249.1124908084@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ecore-0.9.9.013.tar.gz ef3dcedf00e18c6449e744edf4a50c50 ecore-0.9.9.013.tar.gz Size: 1074990 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:28:03 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: ecore.spec - updated to 0.9.9.013 - new Source0 ("official"... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:28:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ecore.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.5 SPECS/ecore.spec:1.6 --- SPECS/ecore.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ecore.spec Wed Aug 24 20:27:57 2005 @@ -2,20 +2,19 @@ Summary: Enlightened Core X interface library Summary(pl): Biblioteka interfejsu X Enlightened Core Name: ecore -Version: 0.9.9.010 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: dda96a94cab2fd5d485757b76f0c4775 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel BuildRequires: libtool BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,12 +57,22 @@ Statyczne biblioteki Ecore. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -123,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:27:57 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 20:29:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: lkcp.spec - disable "tset -Q -r", fixes build on my amd64 c... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 18:29:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable "tset -Q -r", fixes build on my amd64 chroot under screen ---- Files affected: SPECS: lkcp.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.2 SPECS/lkcp.spec:1.3 --- SPECS/lkcp.spec:1.2 Wed Aug 24 20:20:46 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:29:34 2005 @@ -30,6 +30,7 @@ %build %{__make} -C src \ + RESET=true \ CC="%{__cc}" \ FLAGS="%{rpmcflags} -I/usr/include/ncurses" @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 18:29:34 glen +- disable "tset -Q -r", fixes build on my amd64 chroot under screen + Revision 1.2 2005/08/24 18:20:46 adamg - distfiles workaround ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.2&r2=1.3&f=u From charles at pld-linux.org Wed Aug 24 20:30:15 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: edje.spec - updated to 0.5.0.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:30:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.0.013 - new Source0 ("official" snapshots) - BR/R imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: edje.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.7 SPECS/edje.spec:1.8 --- SPECS/edje.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/edje.spec Wed Aug 24 20:30:10 2005 @@ -2,21 +2,18 @@ Summary: Complex Graphical Design/Layout Engine Summary(pl): Z?o?ony silnik graficznego projektowania/planowania Name: edje -Version: 0.5.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.5.0.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 94cd1aabb9fc7785123fb4d92255f85e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 1e5829e8c784770da2ccbd57ef55714c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: embryo-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -60,7 +57,7 @@ Requires: %{name} = %{version}-%{release} Requires: ecore-devel Requires: embryo-devel -Requires: imlib2-devel +Requires: imlib2-devel >= 1.2.1 %description devel Header files for Edje. @@ -81,11 +78,11 @@ Statyczna biblioteka Edje. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -131,6 +128,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:30:10 charles +- updated to 0.5.0.013 +- new Source0 ("official" snapshots) +- BR/R imlib2-devel up to >= 1.2.1 + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:30:23 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: edje-0.5.0.013.tar.gz Message-ID: <24704.1124908223@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edje-0.5.0.013.tar.gz 1e5829e8c784770da2ccbd57ef55714c edje-0.5.0.013.tar.gz Size: 3161902 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:32:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: eet.spec - updated md5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:32:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 ---- Files affected: SPECS: eet.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.6 SPECS/eet.spec:1.7 --- SPECS/eet.spec:1.6 Wed Aug 24 20:25:23 2005 +++ SPECS/eet.spec Wed Aug 24 20:32:54 2005 @@ -7,7 +7,7 @@ License: BSD Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz -# Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 +# Source0-md5: 875802e243e37e2eb954d3580cb19678 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:32:54 charles +- updated md5 + Revision 1.6 2005/08/24 18:25:23 charles - updated to 0.9.10.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:33:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: eet-0.9.10.013.tar.gz Message-ID: <26416.1124908382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz 875802e243e37e2eb954d3580cb19678 eet-0.9.10.013.tar.gz Size: 317271 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:57 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: embryo-0.9.1.013.tar.gz Message-ID: <26952.1124908437@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/embryo-0.9.1.013.tar.gz e1140446f243445ad8b987becb975d3d embryo-0.9.1.013.tar.gz Size: 436231 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:56 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: embryo.spec - updated to 0.9.1.013 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:33:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.1.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: embryo.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.5 SPECS/embryo.spec:1.6 --- SPECS/embryo.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/embryo.spec Wed Aug 24 20:33:50 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Embryo Summary(pl): Podstawowe biblioteki Enlightenmenta - Embryo Name: embryo -Version: 0.9.1.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.1.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: d28dd1aadd155d78c42d2bbde48405e9 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: e1140446f243445ad8b987becb975d3d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -49,11 +47,11 @@ Statyczna biblioteka Embryo. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -98,6 +96,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:33:50 charles +- updated to 0.9.1.013 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: emotion-0.0.1.004.tar.gz Message-ID: <27629.1124908499@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/emotion-0.0.1.004.tar.gz 3be5850cf23afeff8976e45a9861b7c4 emotion-0.0.1.004.tar.gz Size: 410793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: emotion.spec - updated to 0.0.1.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:34:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.1.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: emotion.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.5 SPECS/emotion.spec:1.6 --- SPECS/emotion.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/emotion.spec Wed Aug 24 20:34:53 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Emotion Summary(pl): Podstawowe biblioteki Enlightenmenta - Emotion Name: emotion -Version: 0.0.1.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.0.1.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b93da3ce3da37483ad4721facb050744 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Emotion. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -105,6 +103,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:34:53 charles +- updated to 0.0.1.004 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:36:01 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: epeg.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:36:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: epeg.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.4 SPECS/epeg.spec:1.5 --- SPECS/epeg.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epeg.spec Wed Aug 24 20:35:56 2005 @@ -2,14 +2,12 @@ Summary: JPEG Scaling Library Summary(pl): Biblioteka do skalowania JPEG-?w Name: epeg -Version: 0.9.0.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 2d7073b33eb39d447d2c3cb6db5c1391 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ad8505bed8deb7049dfa6322ce908f99 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Epeg. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -96,6 +94,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:35:56 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:36:07 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: epeg-0.9.0.004.tar.gz Message-ID: <28437.1124908567@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epeg-0.9.0.004.tar.gz ad8505bed8deb7049dfa6322ce908f99 epeg-0.9.0.004.tar.gz Size: 2363701 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:37:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: epsilon.spec - updated to 0.3.0.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.0.004 - new Source0 ("official" snapshots) - updates BRs ---- Files affected: SPECS: epsilon.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.4 SPECS/epsilon.spec:1.5 --- SPECS/epsilon.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epsilon.spec Wed Aug 24 20:37:42 2005 @@ -2,22 +2,17 @@ Summary: Enlightened Thumbnail Generator Summary(pl): O?wiecony generator miniaturek obraz?w Name: epsilon -Version: 0.3.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.3.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b86833bb0c6190b93b99234d9d3a5311 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 10118c712b42d00b332c6fe1d9257661 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: edje-devel BuildRequires: epeg-devel -BuildRequires: freetype-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel -BuildRequires: libpng-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +66,7 @@ Statyczna biblioteka Epsilon. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -117,6 +112,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:37:42 charles +- updated to 0.3.0.004 +- new Source0 ("official" snapshots) +- updates BRs + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:37:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: epsilon-0.3.0.004.tar.gz Message-ID: <29465.1124908666@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epsilon-0.3.0.004.tar.gz 10118c712b42d00b332c6fe1d9257661 epsilon-0.3.0.004.tar.gz Size: 335128 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: esmart-0.9.0.004.tar.gz Message-ID: <30925.1124908827@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/esmart-0.9.0.004.tar.gz 23605a2ff7e90c8b28e934f6a1fbfc4d esmart-0.9.0.004.tar.gz Size: 374791 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: esmart.spec - updated to 0.9.0.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:40:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR libltdl-devel ---- Files affected: SPECS: esmart.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmart.spec diff -u SPECS/esmart.spec:1.4 SPECS/esmart.spec:1.5 --- SPECS/esmart.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/esmart.spec Wed Aug 24 20:40:23 2005 @@ -2,21 +2,18 @@ Summary: Evas "smart objects" Summary(pl): "Inteligentne obiekty" Evas Name: esmart -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: fd426d6d36dc57c857f5e91f8950b5d7 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 23605a2ff7e90c8b28e934f6a1fbfc4d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: epeg-devel BuildRequires: epsilon-devel -BuildRequires: libltdl-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,7 +53,7 @@ Statyczne biblioteki Esmart. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:40:23 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR libltdl-devel + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmart.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:37 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: etox.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:41:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR pkgconfig ---- Files affected: SPECS: etox.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.4 SPECS/etox.spec:1.5 --- SPECS/etox.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/etox.spec Wed Aug 24 20:41:32 2005 @@ -2,20 +2,17 @@ Summary: Enlightened Text Object Library Summary(pl): O?wiecona biblioteka obiekt?w tekstowych (Enlightened Text Object Library) Name: etox -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 6f0241bb8021744f8e081e3739441644 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ffb6de465dfc9a9b2802b414dd432932 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: libtool -BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -61,7 +58,7 @@ Statyczna biblioteka Etox. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:41:32 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR pkgconfig + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: etox-0.9.0.004.tar.gz Message-ID: <31771.1124908900@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/etox-0.9.0.004.tar.gz ffb6de465dfc9a9b2802b414dd432932 etox-0.9.0.004.tar.gz Size: 1046396 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: evas-0.9.9.013.tar.gz Message-ID: <32597.1124908963@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/evas-0.9.9.013.tar.gz 6d888cc6427d783ae517185c1e446e38 evas-0.9.9.013.tar.gz Size: 1404665 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: evas.spec - updated to 0.9.9.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:42:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: evas.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.7 SPECS/evas.spec:1.8 --- SPECS/evas.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/evas.spec Wed Aug 24 20:42:34 2005 @@ -17,14 +17,12 @@ Summary: Multi-platform Canvas Library Summary(pl): Wieloplatformowa biblioteka do rysowania Name: evas -Version: 0.9.9.010 -%define _snap 20050706 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: a798480eacc9437d84ed12d64f789fc5 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 6d888cc6427d783ae517185c1e446e38 URL: http://enlightenment.org/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel @@ -82,12 +80,11 @@ Statyczna biblioteka Evas. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -167,6 +164,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:42:34 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:44:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: ewl.spec - updated to 0.0.4.004 - new Source0 ("official" s... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:44:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.4.004 - new Source0 ("official" snapshots) - removed redundant BR etox-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ewl.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.5 SPECS/ewl.spec:1.6 --- SPECS/ewl.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ewl.spec Wed Aug 24 20:44:33 2005 @@ -2,20 +2,17 @@ Summary: Enlightenment Widget Library Summary(pl): Biblioteka widget?w Enlightenmenta (Enlightenment Widget Library) Name: ewl -Version: 0.0.4.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.0.4.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 008c998c511e424165abdfbf319eaa00 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: emotion-devel -BuildRequires: etox-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,11 +48,22 @@ Statyczna biblioteka EWL. %prep -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -107,6 +115,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:44:33 charles +- updated to 0.0.4.004 +- new Source0 ("official" snapshots) +- removed redundant BR etox-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:44:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: ewl-0.0.4.004.tar.gz Message-ID: <1355.1124909080@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ewl-0.0.4.004.tar.gz aed8f9eaf06ed5f0120d6f9ce2dc985c ewl-0.0.4.004.tar.gz Size: 1222523 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:45:50 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: enlightenmentDR17.spec - updated to 0.16.999.013 - new Sour... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:45:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.16.999.013 - new Source0 ("official" snapshots) - BR gettext-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: enlightenmentDR17.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.5 SPECS/enlightenmentDR17.spec:1.6 --- SPECS/enlightenmentDR17.spec:1.5 Thu Aug 4 13:06:18 2005 +++ SPECS/enlightenmentDR17.spec Wed Aug 24 20:45:44 2005 @@ -1,20 +1,20 @@ # $Revision$, $Date$ +%define _src_name enlightenment Summary: Enlightenment Window Manager Summary(pl): Zarz?dca okien X - Enlightenment Name: enlightenmentDR17 -Version: 0.16.999.010 -%define _snap 20050708 -Release: 0.%{_snap}.0.1 +Version: 0.16.999.013 +Release: 1 License: BSD Group: X11/Window Managers -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/e-%{_snap}.tar.gz -# Source0-md5: 66f01dd81c2cc2b06e47fd11cc4c6d29 +Source0: http://enlightenment.freedesktop.org/files/%{_src_name}-%{version}.tar.gz +# Source0-md5: d8dd1ab454cc08e33905bb03f6d480cf Source1: %{name}-xsession.desktop URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel +BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,7 +41,19 @@ Pliki nag??wkowe dla Enlightenmenta. %prep -%setup -q -n e +%setup -q -n %{_src_name}-%{version} +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 + #name change: sed -e '/AM_INIT_AUTOMAKE/s/enlightenment/%{name}/' \ -i configure.in @@ -55,7 +67,7 @@ %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -108,6 +120,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:45:44 charles +- updated to 0.16.999.013 +- new Source0 ("official" snapshots) +- BR gettext-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/08/04 11:06:18 darekr - BR: sed 4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:46:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: entice.spec - updated to 0.9.3.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entice.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/entice.spec diff -u SPECS/entice.spec:1.4 SPECS/entice.spec:1.5 --- SPECS/entice.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/entice.spec Wed Aug 24 20:46:47 2005 @@ -2,14 +2,12 @@ Summary: Image viewer using Enlightenment libraries Summary(pl): Przegl?darka obrazk?w u?ywaj?ca bibliotek Enlightenmenta Name: entice -Version: 0.9.1 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.3.004 +Release: 1 License: BSD Group: X11/Window Managers/Tools -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 3b1d9e40558ebc803efc7b2fd9e7df42 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: c5ffa01f6327b59b4fbbb3729e1e0867 Patch0: %{name}-no_buildtime_gimp.patch URL: http://enlightenment.org/ BuildRequires: autoconf @@ -37,12 +35,12 @@ z tego katalogu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -70,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:46:47 charles +- updated to 0.9.3.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entice.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:46:54 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: entice-0.9.3.004.tar.gz Message-ID: <2835.1124909213@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entice-0.9.3.004.tar.gz c5ffa01f6327b59b4fbbb3729e1e0867 entice-0.9.3.004.tar.gz Size: 881544 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: enlightenment-0.16.999.013.tar.gz Message-ID: <2106.1124909258@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/enlightenment-0.16.999.013.tar.gz d8dd1ab454cc08e33905bb03f6d480cf enlightenment-0.16.999.013.tar.gz Size: 41558793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: entrance.spec - updated to 0.9.0.004 - new Source0 ("offici... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:47:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entrance.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/entrance.spec diff -u SPECS/entrance.spec:1.6 SPECS/entrance.spec:1.7 --- SPECS/entrance.spec:1.6 Sun Jul 10 09:17:59 2005 +++ SPECS/entrance.spec Wed Aug 24 20:47:34 2005 @@ -2,14 +2,12 @@ Summary: Enlightened display manager Summary(pl): O?wiecony zarz?dca ekranu Name: entrance -Version: 0.9.0.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.2 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Applications -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 4f1747d588dcb4ed1f0f613966519ca4 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 48d8999a5be31e4b089e0faf40bf9fd9 Source1: %{name}.init Source2: %{name}.Xsession Source3: %{name}.gen-conf @@ -44,7 +42,7 @@ jakich KDM czy GDM mog? tylko pomarzy?... i to bez narzutu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 sed '/PACKAGE_CFG_DIR/s@"${sysconfdir}"@"${localstatedir}/lib/${PACKAGE}"@' \ @@ -119,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:47:34 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.6 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entrance.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:48:24 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: entrance-0.9.0.004.tar.gz Message-ID: <3393.1124909304@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entrance-0.9.0.004.tar.gz 48d8999a5be31e4b089e0faf40bf9fd9 entrance-0.9.0.004.tar.gz Size: 16901820 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 21:01:08 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.2 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 19:01:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.2 ---- Files affected: SPECS: gtk+2.spec (1.179.2.9 -> 1.179.2.10) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.9 SPECS/gtk+2.spec:1.179.2.10 --- SPECS/gtk+2.spec:1.179.2.9 Wed Aug 24 10:00:08 2005 +++ SPECS/gtk+2.spec Wed Aug 24 21:01:00 2005 @@ -14,13 +14,13 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.1 +Version: 2.8.2 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 +# Source0-md5: 5b8b6d24f9f24469f96934b6efcc34b9 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.10 2005/08/24 19:01:00 aflinta +- 2.8.2 + Revision 1.179.2.9 2005/08/24 08:00:08 aflinta - 2.8.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.9&r2=1.179.2.10&f=u From aflinta at pld-linux.org Wed Aug 24 21:01:47 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: gtk+-2.8.2.tar.bz2 Message-ID: <12173.1124910107@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.2.tar.bz2 5b8b6d24f9f24469f96934b6efcc34b9 gtk+-2.8.2.tar.bz2 Size: 11802646 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 21:08:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: horde-passwd.spec - fix for broken ldap::_userDN() In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 19:08:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for broken ldap::_userDN() ---- Files affected: SPECS: horde-passwd.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.24 SPECS/horde-passwd.spec:1.25 --- SPECS/horde-passwd.spec:1.24 Wed Aug 24 19:04:32 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 21:08:52 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-24 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -16,6 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -51,6 +52,7 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 +%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 19:08:52 glen +- fix for broken ldap::_userDN() + Revision 1.24 2005/08/24 17:04:32 glen - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.24&r2=1.25&f=u From charles at pld-linux.org Wed Aug 24 21:12:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: DISTFILES: imlib2_loaders-1.2.1.004.tar.gz Message-ID: <19449.1124910766@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2_loaders-1.2.1.004.tar.gz 554e93eefef26a00bc63aec15d0f913d imlib2_loaders-1.2.1.004.tar.gz Size: 309782 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 21:12:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: imlib2_loaders.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 19:12:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: imlib2_loaders.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/imlib2_loaders.spec diff -u SPECS/imlib2_loaders.spec:1.3 SPECS/imlib2_loaders.spec:1.4 --- SPECS/imlib2_loaders.spec:1.3 Tue Jul 12 21:08:41 2005 +++ SPECS/imlib2_loaders.spec Wed Aug 24 21:12:37 2005 @@ -2,20 +2,18 @@ Summary: Additional Loaders for Imlib2 Summary(pl): Dodatkowe biblioteki wczytuj?ce dla Imlib2 Name: imlib2_loaders -Version: 1.2.1.001 -%define _snap 20050704 -Release: 0.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: Mixed (BSD and GPL) Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: ff63cea4860ae7c085895ab452cac179 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 554e93eefef26a00bc63aec15d0f913d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: edb-devel +BuildRequires: edb-devel >= 1.0.5 BuildRequires: eet-devel -BuildRequires: imlib2-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool Requires: imlib2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,7 +29,7 @@ rozprowadzane bezpo?rednio z bibliotek? Imlib2. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -66,6 +64,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 19:12:37 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 + Revision 1.3 2005/07/12 19:08:41 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2_loaders.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Wed Aug 24 22:17:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: lkcp.spec - typo, pl summary In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 20:17:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, pl summary ---- Files affected: SPECS: lkcp.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.3 SPECS/lkcp.spec:1.4 --- SPECS/lkcp.spec:1.3 Wed Aug 24 20:29:34 2005 +++ SPECS/lkcp.spec Wed Aug 24 22:17:29 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Live Kernel Configuration Panel +Summary(pl): Live Kernel Configuration Panel - panel do konfiguracji j?dra w czasie pracy Name: lkcp Version: 0.5.3 Release: 1 @@ -20,7 +21,7 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +Live Kernel Configuration Panel (LKCP) to oparty na ncurses interfejs do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -53,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 20:17:29 qboosh +- typo, pl summary + Revision 1.3 2005/08/24 18:29:34 glen - disable "tset -Q -r", fixes build on my amd64 chroot under screen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Wed Aug 24 22:52:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: confdir.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 20:52:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: confdir.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/confdir.spec diff -u SPECS/confdir.spec:1.12 SPECS/confdir.spec:1.13 --- SPECS/confdir.spec:1.12 Wed Nov 10 14:32:59 2004 +++ SPECS/confdir.spec Wed Aug 24 22:51:57 2005 @@ -30,7 +30,7 @@ Summary: Header files for confdir library Summary(pl): Pliki nag??wkowe biblioteki confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description devel Header files for confdir library. @@ -42,7 +42,7 @@ Summary: Static confdir library Summary(pl): Biblioteka statyczna confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description static Static confdir library. @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 20:51:57 darekr +- strict deps + Revision 1.12 2004/11/10 13:32:59 paladine - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/confdir.spec?r1=1.12&r2=1.13&f=u From darekr at pld-linux.org Wed Aug 24 23:08:00 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:07 2005 Subject: SPECS: gpppkill.spec - cosmetics In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 21:08:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: gpppkill.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.17 SPECS/gpppkill.spec:1.18 --- SPECS/gpppkill.spec:1.17 Tue Aug 31 11:00:58 2004 +++ SPECS/gpppkill.spec Wed Aug 24 23:07:55 2005 @@ -14,8 +14,8 @@ Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba URL: http://www.pla.net.py/home/oliver/gpppkill/ -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Provides: gpppkill +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,16 +39,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -install -d ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin -%{__make} install DESTDIR=${RPM_BUILD_ROOT} +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README CHANGELOG +%doc CHANGELOG README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/24 21:07:55 darekr +- cosmetics + Revision 1.17 2004/08/31 09:00:58 snurf - typos / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Wed Aug 24 23:24:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: initng-initscripts-20050825.tar.bz2 Message-ID: <2600.1124918644@distfiles.pld-linux.org> Files fetched: 1 STORED: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-20050825.tar.bz2 8aee8e9866b90b2910d06027767a6a5a initng-initscripts-20050825.tar.bz2 Size: 6870 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 23:24:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: initng-pld.spec - 20050825 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 21:24:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 20050825 snap ---- Files affected: SPECS: initng-pld.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/initng-pld.spec diff -u SPECS/initng-pld.spec:1.4 SPECS/initng-pld.spec:1.5 --- SPECS/initng-pld.spec:1.4 Wed Aug 3 12:09:38 2005 +++ SPECS/initng-pld.spec Wed Aug 24 23:24:00 2005 @@ -3,12 +3,12 @@ Summary(pl): Skrypty inicjalizuj?ce initng dla PLD Name: initng-pld Version: 0.0.1 -%define _snap 20050803 +%define _snap 20050825 Release: 0.%{_snap}.1 License: GPL Group: Base Source0: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-%{_snap}.tar.bz2 -# Source0-md5: 17a08c9107517ef4ba034df472bbac4a +# Source0-md5: 8aee8e9866b90b2910d06027767a6a5a Requires: initng Requires: module-init-tools Requires: mount @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 21:24:00 glen +- 20050825 snap + Revision 1.4 2005/08/03 10:09:38 glen - fix md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng-pld.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 23:35:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: mkvtoolnix.spec - fixed help files, added -help.patch In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:35:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed help files, added -help.patch ---- Files affected: SPECS: mkvtoolnix.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.6 SPECS/mkvtoolnix.spec:1.7 --- SPECS/mkvtoolnix.spec:1.6 Wed Aug 24 02:00:08 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 23:35:42 2005 @@ -6,11 +6,12 @@ Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix Version: 1.5.5 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 # Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 +Patch0: %{name}-help.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -32,26 +33,34 @@ %prep %setup -q +%patch0 -p1 %build %{__sed} -i 's,wx-config,wx-gtk2-ansi-config,g' configure -%configure +%{__sed} -i 's,$INSTDIR,%{_datadir}/%{name},' src/mmg/mmg.cpp +%configure %{__make} %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# help files +install doc/*.h* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc +install doc/images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO doc/*.html doc/images/* +%doc AUTHORS ChangeLog README TODO %attr(755,root,root) %{_bindir}/* +%{_datadir}/%{name} %{_mandir}/man1/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -60,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 21:35:42 charles +- fixed help files, added -help.patch + Revision 1.6 2005/08/24 00:00:08 charles - updated to 1.5.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 23:36:58 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: mkvtoolnix-help.patch (NEW) - fixed path to help files In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:36:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed path to help files ---- Files affected: SOURCES: mkvtoolnix-help.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mkvtoolnix-help.patch diff -u /dev/null SOURCES/mkvtoolnix-help.patch:1.1 --- /dev/null Wed Aug 24 23:36:58 2005 +++ SOURCES/mkvtoolnix-help.patch Wed Aug 24 23:36:53 2005 @@ -0,0 +1,10 @@ +--- mkvtoolnix-1.5.5/src/mmg/mmg.cpp.orig 2005-08-21 15:04:48.000000000 +0200 ++++ mkvtoolnix-1.5.5/src/mmg/mmg.cpp 2005-08-24 22:54:38.000000000 +0200 +@@ -2002,6 +2002,7 @@ + cfg = new wxConfig(wxT("mkvmergeGUI")); + wxConfigBase::Set(cfg); + cfg->SetPath(wxT("/GUI")); ++ cfg->Write(wxT("installation_path"), wxT("$INSTDIR")); + cfg->Read(wxT("last_directory"), &last_open_dir, wxT("")); + for (i = 0; i < 4; i++) { + k.Printf(wxT("last_settings %u"), i); ================================================================ From twittner at pld-linux.org Thu Aug 25 00:06:12 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: cgdb-am_no_debug.patch (NEW) - don't force `-g' debug flag In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:06:12 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't force `-g' debug flag ---- Files affected: SOURCES: cgdb-am_no_debug.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-am_no_debug.patch diff -u /dev/null SOURCES/cgdb-am_no_debug.patch:1.1 --- /dev/null Thu Aug 25 00:06:12 2005 +++ SOURCES/cgdb-am_no_debug.patch Thu Aug 25 00:06:07 2005 @@ -0,0 +1,90 @@ +diff -Nur cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am 2005-08-24 23:58:38.751560968 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libkui.a +diff -Nur cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am 2005-08-24 23:58:38.758559904 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libwm.a +diff -Nur cgdb-0.5.3~/cgdb/src/Makefile.am cgdb-0.5.3/cgdb/src/Makefile.am +--- cgdb-0.5.3~/cgdb/src/Makefile.am 2005-08-03 04:24:11.000000000 +0200 ++++ cgdb-0.5.3/cgdb/src/Makefile.am 2005-08-24 23:58:38.761559448 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am +--- cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am 2005-08-24 23:58:38.740562640 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include \ ++AM_CFLAGS = -Wall -I$(srcdir)/../include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/util/include + +diff -Nur cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am +--- cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am 2005-08-24 23:58:38.715566440 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/rlctx/include \ +diff -Nur cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am +--- cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am 2005-08-24 23:58:38.722565376 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ +diff -Nur cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am +--- cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am 2005-08-03 04:24:15.000000000 +0200 ++++ cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am 2005-08-24 23:58:38.730564160 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/various/adt/src/Makefile.am cgdb-0.5.3/various/adt/src/Makefile.am +--- cgdb-0.5.3~/various/adt/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/various/adt/src/Makefile.am 2005-08-24 23:58:38.690570240 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include + + noinst_LIBRARIES = libadt.a + +diff -Nur cgdb-0.5.3~/various/rlctx/src/Makefile.am cgdb-0.5.3/various/rlctx/src/Makefile.am +--- cgdb-0.5.3~/various/rlctx/src/Makefile.am 2005-08-03 04:24:16.000000000 +0200 ++++ cgdb-0.5.3/various/rlctx/src/Makefile.am 2005-08-24 23:58:38.698569024 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(srcdir)/../include +diff -Nur cgdb-0.5.3~/various/util/src/Makefile.am cgdb-0.5.3/various/util/src/Makefile.am +--- cgdb-0.5.3~/various/util/src/Makefile.am 2004-09-08 21:41:44.000000000 +0200 ++++ cgdb-0.5.3/various/util/src/Makefile.am 2005-08-24 23:58:38.669573432 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(srcdir)/../include + noinst_LIBRARIES = libutil.a + + libutil_a_SOURCES = \ ================================================================ From twittner at pld-linux.org Thu Aug 25 00:07:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: cgdb-missing_includes.patch (NEW) - add missing #include ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:07:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add missing #include (it appears after am/ac regeneration) ---- Files affected: SOURCES: cgdb-missing_includes.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-missing_includes.patch diff -u /dev/null SOURCES/cgdb-missing_includes.patch:1.1 --- /dev/null Thu Aug 25 00:07:49 2005 +++ SOURCES/cgdb-missing_includes.patch Thu Aug 25 00:07:44 2005 @@ -0,0 +1,13 @@ +--- cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c~ 2005-08-24 23:39:47.693507928 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c 2005-08-24 23:48:35.060335984 +0200 +@@ -14,6 +14,10 @@ + #include /* for getenv */ + #endif /* HAVE_STDLIB_H */ + ++#if HAVE_STDIO_H ++#include ++#endif /* HAVE_STDIO_H */ ++ + /* term.h prototypes */ + extern int tgetent(); + extern int tgetflag(); ================================================================ From cvs at pld-linux.org Thu Aug 25 00:08:14 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:14:08 2005 Subject: rc-scripts/trunk/rc.d/init.d: cpusets functions Message-ID: <6333@svn.pld-linux.org> Author: arekm Date: Thu Aug 25 00:08:11 2005 New Revision: 6333 Modified: rc-scripts/trunk/rc.d/init.d/cpusets rc-scripts/trunk/rc.d/init.d/functions Log: Fix is_yes in cpuset stuff. Quote file paths when doing echo > something. Modified: rc-scripts/trunk/rc.d/init.d/cpusets ============================================================================== --- rc-scripts/trunk/rc.d/init.d/cpusets (original) +++ rc-scripts/trunk/rc.d/init.d/cpusets Thu Aug 25 00:08:11 2005 @@ -18,7 +18,7 @@ # Source function library. . /etc/rc.d/init.d/functions -if is_yes ${CPUSETS} ; then +if is_yes "${CPUSETS}" ; then if ! grep -q "/dev/cpuset" /proc/mounts ; then nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 fi Modified: rc-scripts/trunk/rc.d/init.d/functions ============================================================================== --- rc-scripts/trunk/rc.d/init.d/functions (original) +++ rc-scripts/trunk/rc.d/init.d/functions Thu Aug 25 00:08:11 2005 @@ -498,7 +498,7 @@ # And start it up. busy cd / - is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks + is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then if [ -n "$waitname" -a -n "$waittime" ]; then # Save basename. @@ -690,8 +690,8 @@ if [ "$pid" != "" ]; then cpuset_msg="..." - if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then - if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then + if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then + if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") else cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") @@ -706,8 +706,8 @@ # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` # if [ "$pid" != "" ]; then # cpuset_msg="..." -# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then -# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then +# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then +# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") # else # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") From twittner at pld-linux.org Thu Aug 25 00:13:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: cgdb.spec - get rid of debug flag (-g) during normal build ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:13:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - get rid of debug flag (-g) during normal build (-am_no_debug.patch) - added missing #include (build failed after am/ac regeneration, -missing_includes.patch - regenerate am/ac (CPPFLAGS hack is still needed) - rel. 2 ---- Files affected: SPECS: cgdb.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.12 SPECS/cgdb.spec:1.13 --- SPECS/cgdb.spec:1.12 Wed Aug 24 19:37:24 2005 +++ SPECS/cgdb.spec Thu Aug 25 00:13:11 2005 @@ -3,13 +3,16 @@ Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb Version: 0.5.3 -Release: 1 +Release: 2 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz # Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch +Patch1: %{name}-missing_includes.patch +Patch2: %{name}-am_no_debug.patch URL: http://cgdb.sourceforge.net/ +BuildRequires: autoconf BuildRequires: automake BuildRequires: readline-devel Requires: gdb @@ -35,10 +38,16 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -CPPFLAGS="-I/usr/include/ncurses" -cp -f /usr/share/automake/config.sub config +CPPFLAGS=" -I/usr/include/ncurses " +%{__aclocal} -I config +%{__autoconf} +%{__autoheader} +%{__automake} + %configure %{__make} @@ -65,6 +74,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 22:13:11 twittner +- get rid of debug flag (-g) during normal build (-am_no_debug.patch) +- added missing #include (build failed after am/ac regeneration, + -missing_includes.patch +- regenerate am/ac (CPPFLAGS hack is still needed) +- rel. 2 + Revision 1.12 2005/08/24 17:37:24 adamg - updated to 0.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Thu Aug 25 00:30:07 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: syslinux.spec - 3.10 In-Reply-To: References: Message-ID: Author: areq Date: Wed Aug 24 22:30:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.10 ---- Files affected: SPECS: syslinux.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: SPECS/syslinux.spec diff -u SPECS/syslinux.spec:1.65 SPECS/syslinux.spec:1.66 --- SPECS/syslinux.spec:1.65 Fri Jul 8 09:52:11 2005 +++ SPECS/syslinux.spec Thu Aug 25 00:30:01 2005 @@ -4,12 +4,12 @@ Summary(pt_BR): Carregador de boot simples Summary(zh_CN): Linux???????????????????? Name: syslinux -Version: 3.09 +Version: 3.10 Release: 1 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 -# Source0-md5: dd403b15ef18bb0e5d78d3f552f822a5 +# Source0-md5: 777d868eef7619ce971bfbc0c3ad4245 URL: http://syslinux.zytor.com/ BuildRequires: perl-base BuildRequires: nasm @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66 2005/08/24 22:30:01 areq +- 3.10 + Revision 1.65 2005/07/08 07:52:11 arekm - add all readme files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslinux.spec?r1=1.65&r2=1.66&f=u From areq at pld-linux.org Thu Aug 25 00:30:13 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: syslinux-3.10.tar.bz2 Message-ID: <2652.1124922613@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.10.tar.bz2 777d868eef7619ce971bfbc0c3ad4245 syslinux-3.10.tar.bz2 Size: 1245565 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 00:50:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gnome-icons-graphite.spec - updated to 1.2 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 22:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2 ---- Files affected: SPECS: gnome-icons-graphite.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-graphite.spec diff -u SPECS/gnome-icons-graphite.spec:1.2 SPECS/gnome-icons-graphite.spec:1.3 --- SPECS/gnome-icons-graphite.spec:1.2 Thu Jul 28 14:41:30 2005 +++ SPECS/gnome-icons-graphite.spec Thu Aug 25 00:50:16 2005 @@ -4,12 +4,12 @@ Summary: Graphite GNOME Icons Summary(pl): Zestaw ikonek graphite dla GNOME Name: gnome-icons-graphite -Version: 1.1 +Version: 1.2 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/graphite/%{realname}-%{version}.tar.bz2 -# Source0-md5: 6348f0acd4ba04bf6c02cfe39cfdbbea +# Source0-md5: 7ab77bcce941fcf0f09f19d56d93811f URL: http://gnome-look.org/content/show.php?content=26757 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 22:50:16 paladine +- updated to 1.2 + Revision 1.2 2005/07/28 12:41:30 freetz - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-graphite.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 00:51:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: graphite-1.2.tar.bz2 Message-ID: <11493.1124923865@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/graphite/graphite-1.2.tar.bz2 7ab77bcce941fcf0f09f19d56d93811f graphite-1.2.tar.bz2 Size: 3861068 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: eGroupWare-1.0.0.009.tar.bz2 Message-ID: <5986.1124924655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/egroupware/eGroupWare-1.0.0.009.tar.bz2 2ed2f3041ab4ff235f56ed23dfa7274b eGroupWare-1.0.0.009.tar.bz2 Size: 11042609 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: egroupware.spec - 1.0.0.009, security fixes In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 23:04:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.0.0.009, security fixes ---- Files affected: SPECS: egroupware.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.2 SPECS/egroupware.spec:1.3 --- SPECS/egroupware.spec:1.2 Thu Jul 21 19:23:32 2005 +++ SPECS/egroupware.spec Thu Aug 25 01:04:00 2005 @@ -5,14 +5,13 @@ Summary: eGroupWare - a web-based groupware suite written in PHP Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware -Version: 1.0.0.008 -%define _rel 2 -Release: 0.%{_rel}.1 +Version: 1.0.0.009 +Release: 0.1 Epoch: 0 License: GPL Group: Applications/WWW -Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}-%{_rel}.tar.bz2 -# Source0-md5: 30984ed46fa064632a3f3a1137786cbd +Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 +# Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 BuildArch: noarch @@ -70,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 23:04:00 glen +- 1.0.0.009, security fixes + Revision 1.2 2005/07/21 17:23:32 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 01:10:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gnome-icons-gperfection2.spec - updated to 2.3 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 23:10:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3 ---- Files affected: SPECS: gnome-icons-gperfection2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-gperfection2.spec diff -u SPECS/gnome-icons-gperfection2.spec:1.9 SPECS/gnome-icons-gperfection2.spec:1.10 --- SPECS/gnome-icons-gperfection2.spec:1.9 Fri Jul 29 14:33:00 2005 +++ SPECS/gnome-icons-gperfection2.spec Thu Aug 25 01:10:11 2005 @@ -5,12 +5,12 @@ Summary: Gperfection2 GNOME Icons Summary(pl): Zestaw ikonek Gperfection2 dla GNOME Name: gnome-icons-gperfection2 -Version: 2.1 +Version: 2.3 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/%{realname}-%{version}.tar.bz2 -# Source0-md5: 75677c02d32c35be0fbbc653d217a966 +# Source0-md5: d986acad9835c14e5c6bcbd4e1119f62 URL: http://gnome-look.org/content/show.php?content=22989 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/24 23:10:11 paladine +- updated to 2.3 + Revision 1.9 2005/07/29 12:33:00 freetz - 2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-gperfection2.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Thu Aug 25 01:11:19 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: gperfection2-2.3.tar.bz2 Message-ID: <8378.1124925079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/gperfection2-2.3.tar.bz2 d986acad9835c14e5c6bcbd4e1119f62 gperfection2-2.3.tar.bz2 Size: 3889073 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Thu Aug 25 03:51:33 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: egroupware.spec - add R In-Reply-To: References: Message-ID: Author: wolvverine Date: Thu Aug 25 01:51:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add R ---- Files affected: SPECS: egroupware.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.3 SPECS/egroupware.spec:1.4 --- SPECS/egroupware.spec:1.3 Thu Aug 25 01:04:00 2005 +++ SPECS/egroupware.spec Thu Aug 25 03:51:28 2005 @@ -14,6 +14,11 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 +Requires: php-mysql +Requires: php-pgsql +Requires: php-pcre +Requires: php-gd +Requires: php-mbstring BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 01:51:28 wolvverine +- add R + Revision 1.3 2005/08/24 23:04:00 glen - 1.0.0.009, security fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Thu Aug 25 06:55:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gpppkill.spec - fixed build, use optflags In-Reply-To: References: Message-ID: Author: qboosh Date: Thu Aug 25 04:55:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed build, use optflags ---- Files affected: SPECS: gpppkill.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.18 SPECS/gpppkill.spec:1.19 --- SPECS/gpppkill.spec:1.18 Wed Aug 24 23:07:55 2005 +++ SPECS/gpppkill.spec Thu Aug 25 06:55:11 2005 @@ -8,16 +8,16 @@ License: GPL Vendor: The gpppkill Team Group: X11/Applications/Networking -Patch0: %{name}-warning.patch # Native URL is http: only, but we prefer ftp: # Source0: http://www.pla.net.py/home/oliver/gpppkill/archive/%{name}-%{version}.tar.gz Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba +Patch0: %{name}-warning.patch URL: http://www.pla.net.py/home/oliver/gpppkill/ -Provides: gpppkill +BuildRequires: gtk+-devel +BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - %description gpppkill is a X11 program for Linux that finishes the ppp connection if it not receive a minimal amount of bytes during certain time. It @@ -27,7 +27,7 @@ %description -l pl gpppkill to program dla X, kt?ry ko?czy po??czenie ppp je?li w danym okresie czasu nie otrzyma minimalnej ilo?ci bajt?w. Ukazuje on r?wnie? -ruch ppp w formie grafu. Konfiguruje si? go za pomoc? GUI. Wykrywa +ruch ppp w formie wykresu. Konfiguruje si? go za pomoc? GUI. Wykrywa wszystkie pppd i pyta, kt?rego u?y?. %prep @@ -35,21 +35,22 @@ %patch0 -p1 %build -%{__make} +%{__make} \ + CC="%{__cxx}" \ + CFLAGS="%{rpmcxxflags} -Wall -Wno-unused -Wno-deprecated -fpermissive -DGTK_DISABLE_COMPAT_H" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -d $RPM_BUILD_ROOT%{_bindir} -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT +install gpppkill $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGELOG README +%doc CHANGELOG CONTRIBUTORS README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 04:55:11 qboosh +- fixed build, use optflags + Revision 1.18 2005/08/24 21:07:55 darekr - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.18&r2=1.19&f=u From aredridel at pld-linux.org Thu Aug 25 07:34:05 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: logjam-4.5.1.tar.bz2 Message-ID: <11975.1124948045@distfiles.pld-linux.org> Files fetched: 1 STORED: http://neugierig.org/software/logjam/download/logjam-4.5.1.tar.bz2 ccae70dc36644cd1529c581443484ebe logjam-4.5.1.tar.bz2 Size: 748283 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Thu Aug 25 07:34:01 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: logjam.spec - up to 4.5.1 In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 05:34:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.5.1 ---- Files affected: SPECS: logjam.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/logjam.spec diff -u SPECS/logjam.spec:1.19 SPECS/logjam.spec:1.20 --- SPECS/logjam.spec:1.19 Wed Jun 8 16:40:34 2005 +++ SPECS/logjam.spec Thu Aug 25 07:33:56 2005 @@ -2,14 +2,13 @@ Summary: The GTK+2-client for LiveJournal Summary(pl): Oparty na GTK+2 klient do LiveJournala Name: logjam -Version: 4.4.1 -Release: 3 +Version: 4.5.1 +Release: 1 License: GPL Group: X11/Applications -Source0: http://logjam.danga.com/download/%{name}-%{version}.tar.bz2 -# Source0-md5: f16f68a4a6b15fb5bb650614f3ff081c +Source0: http://neugierig.org/software/logjam/download/%{name}-%{version}.tar.bz2 +# Source0-md5: ccae70dc36644cd1529c581443484ebe Source1: %{name}.desktop -Patch0: %{name}-sync-url.patch Patch1: %{name}-locale_names.patch URL: http://logjam.danga.com/ BuildRequires: automake @@ -21,6 +20,7 @@ BuildRequires: intltool BuildRequires: librsvg-devel >= 2.2.3 BuildRequires: libxml2-devel >= 2.0 +BuildRequires: sqlite3-devel BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -34,7 +34,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 mv -f po/{uk_UA,uk}.po mv -f po/{ru_RU,ru}.po @@ -43,7 +42,8 @@ %build cp -f /usr/share/automake/config.sub . %configure \ - --with-xmms=runtime + --with-xmms=runtime \ + --with-sqlite3 %{__make} %install @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/25 05:33:56 aredridel +- up to 4.5.1 + Revision 1.19 2005/06/08 14:40:34 zbyniu - BR: pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/logjam.spec?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Thu Aug 25 08:09:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: apache.spec - todo security In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 06:09:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - todo security ---- Files affected: SPECS: apache.spec (1.403 -> 1.404) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.403 SPECS/apache.spec:1.404 --- SPECS/apache.spec:1.403 Sun Jul 10 01:41:05 2005 +++ SPECS/apache.spec Thu Aug 25 08:09:20 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ # TODO: +# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -1828,6 +1829,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.404 2005/08/25 06:09:20 glen +- todo security + Revision 1.403 2005/07/09 23:41:05 glen - rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.403&r2=1.404&f=u From arekm at pld-linux.org Thu Aug 25 08:14:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: rc-scripts.spec - rel 2; fix cpuset parts In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:14:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; fix cpuset parts ---- Files affected: SPECS: rc-scripts.spec (1.197 -> 1.198) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.197 SPECS/rc-scripts.spec:1.198 --- SPECS/rc-scripts.spec:1.197 Tue Aug 23 19:55:17 2005 +++ SPECS/rc-scripts.spec Thu Aug 25 08:14:53 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 1 +Release: 2 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -19,6 +19,7 @@ # Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch +Patch2: %{name}-cpuset.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -99,6 +100,7 @@ %ifarch sparc sparc64 %patch1 -p1 %endif +%patch2 -p0 %build %{__aclocal} @@ -305,6 +307,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.198 2005/08/25 06:14:53 arekm +- rel 2; fix cpuset parts + Revision 1.197 2005/08/23 17:55:17 baggins - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.197&r2=1.198&f=u From arekm at pld-linux.org Thu Aug 25 08:15:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: rc-scripts-cpuset.patch (NEW) - new; cpuset fixes In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:15:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new; cpuset fixes ---- Files affected: SOURCES: rc-scripts-cpuset.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-cpuset.patch diff -u /dev/null SOURCES/rc-scripts-cpuset.patch:1.1 --- /dev/null Thu Aug 25 08:15:14 2005 +++ SOURCES/rc-scripts-cpuset.patch Thu Aug 25 08:15:09 2005 @@ -0,0 +1,48 @@ +Index: rc.d/init.d/cpusets +=================================================================== +--- rc.d/init.d/cpusets (wersja 6332) ++++ rc.d/init.d/cpusets (kopia robocza) +@@ -18,7 +18,7 @@ + # Source function library. + . /etc/rc.d/init.d/functions + +-if is_yes ${CPUSETS} ; then ++if is_yes "${CPUSETS}" ; then + if ! grep -q "/dev/cpuset" /proc/mounts ; then + nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 + fi +Index: rc.d/init.d/functions +=================================================================== +--- rc.d/init.d/functions (wersja 6332) ++++ rc.d/init.d/functions (kopia robocza) +@@ -498,7 +498,7 @@ + # And start it up. + busy + cd / +- is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks ++ is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" + if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then + if [ -n "$waitname" -a -n "$waittime" ]; then + # Save basename. +@@ -690,8 +690,8 @@ + + if [ "$pid" != "" ]; then + cpuset_msg="..." +- if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +- if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++ if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++ if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + else + cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") +@@ -706,8 +706,8 @@ + # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` + # if [ "$pid" != "" ]; then + # cpuset_msg="..." +-# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +-# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + # else + # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:39:55 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: lighttpd-openssl.patch (NEW) - fixes infinite loop on slo... In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:39:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes infinite loop on slow connection over SSL ---- Files affected: SOURCES: lighttpd-openssl.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-openssl.patch diff -u /dev/null SOURCES/lighttpd-openssl.patch:1.1 --- /dev/null Thu Aug 25 08:39:54 2005 +++ SOURCES/lighttpd-openssl.patch Thu Aug 25 08:39:49 2005 @@ -0,0 +1,67 @@ +--- branches/lighttpd-merge-1.4.x/src/connections.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/connections.c (revision 621) +@@ -213,7 +213,7 @@ + + #ifdef USE_OPENSSL + if (srv_sock->is_ssl) { +- int r; ++ int r, ssl_err; + + switch ((r = SSL_get_error(con->ssl, len))) { + case SSL_ERROR_WANT_READ: +@@ -237,8 +237,15 @@ + + /* fall thourgh */ + default: +- log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", +- r, ERR_error_string(ERR_get_error(), NULL)); ++ ssl_err = ERR_get_error(); ++ switch(ssl_err) { ++ case SSL_F_SSL23_GET_CLIENT_HELLO: ++ /* a unencrypted HTTP request on a HTTPS socket. Do a redirect to the right location */ ++ default: ++ log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", ++ r, ERR_error_string(ERR_get_error(), NULL)); ++ break; ++ } + break; + } + } else { +--- branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 621) +@@ -357,7 +357,7 @@ + + if (-1 == mkdir(p->b->ptr, 0700)) { + if (errno != EEXIST) { +- log_error_write(srv, __FILE__, __LINE__, "ssss", "creating cache-directory", p->b->ptr, "failed", strerror(errno)); ++ log_error_write(srv, __FILE__, __LINE__, "sbss", "creating cache-directory", p->b, "failed", strerror(errno)); + + return -1; + } +--- branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 621) +@@ -123,6 +123,7 @@ + size_t toSend; + stat_cache_entry *sce = NULL; + int ifd; ++ int write_wait = 0; + + if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->data.file.name, &sce)) { + log_error_write(srv, __FILE__, __LINE__, "sb", +@@ -162,6 +163,7 @@ + if ((r = SSL_write(con->ssl, s, toSend)) <= 0) { + switch ((ssl_r = SSL_get_error(con->ssl, r))) { + case SSL_ERROR_WANT_WRITE: ++ write_wait = 1; + break; + case SSL_ERROR_SYSCALL: + switch(errno) { +@@ -196,7 +198,7 @@ + if (c->offset == c->data.file.length) { + chunk_finished = 1; + } +- } while(!chunk_finished); ++ } while(!chunk_finished && !write_wait); + + break; + } ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:40:38 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: lighttpd.spec - add openssl fix (Changeset 621) In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:40:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add openssl fix (Changeset 621) ---- Files affected: SPECS: lighttpd.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.122 SPECS/lighttpd.spec:1.123 --- SPECS/lighttpd.spec:1.122 Mon Aug 22 17:18:39 2005 +++ SPECS/lighttpd.spec Thu Aug 25 08:40:33 2005 @@ -57,6 +57,7 @@ Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch Patch3: %{name}-lua-pkgconfig.patch +Patch4: %{name}-openssl.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -199,6 +200,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p2 %build %{__libtoolize} @@ -350,6 +352,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/25 06:40:33 aredridel +- add openssl fix (Changeset 621) + Revision 1.122 2005/08/22 15:18:39 glen - add pkgconfig support for locating lua libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.122&r2=1.123&f=u From glen at pld-linux.org Thu Aug 25 09:11:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: egroupware.conf (NEW) - getting started In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:11:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - getting started ---- Files affected: SOURCES: egroupware.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u /dev/null SOURCES/egroupware.conf:1.1 --- /dev/null Thu Aug 25 09:11:21 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:11:16 2005 @@ -0,0 +1,8 @@ +# vim:syn=apache + +Alias /egroupware /usr/share/egroupware + + php_value memory_limit 16M + + +# vim: filetype=apache ts=4 sw=4 et ================================================================ From glen at pld-linux.org Thu Aug 25 09:27:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: egroupware.conf - need mbstring.func_overload In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:27:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - need mbstring.func_overload ---- Files affected: SOURCES: egroupware.conf (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u SOURCES/egroupware.conf:1.1 SOURCES/egroupware.conf:1.2 --- SOURCES/egroupware.conf:1.1 Thu Aug 25 09:11:16 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:27:53 2005 @@ -3,6 +3,7 @@ Alias /egroupware /usr/share/egroupware php_value memory_limit 16M + php_value mbstring.func_overload 7 # vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/egroupware.conf?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 09:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: egroupware.spec - added apache config In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:28:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added apache config ---- Files affected: SPECS: egroupware.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.4 SPECS/egroupware.spec:1.5 --- SPECS/egroupware.spec:1.4 Thu Aug 25 03:51:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 09:28:25 2005 @@ -6,16 +6,18 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.1 +Release: 0.4 Epoch: 0 License: GPL Group: Applications/WWW Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b +Source1: %{name}.conf URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 Requires: php-mysql Requires: php-pgsql +#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -23,6 +25,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _appdir %{_datadir}/%{name} +%define _sysconfdir /etc/%{name} %description eGroupWare is a multi-user, web-based groupware suite developed on a @@ -51,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_appdir} +install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}} cp -a *.php $RPM_BUILD_ROOT%{_appdir} cp -a addressbook admin backup bookmarks calendar comic developer_tools \ @@ -60,11 +63,27 @@ phpsysinfo polls preferences projects registration setup sitemgr stocks tts \ wiki $RPM_BUILD_ROOT%{_appdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf + %clean rm -rf $RPM_BUILD_ROOT +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %files %defattr(644,root,root,755) +%attr(710,root,http) %dir %{_sysconfdir} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* %{_appdir} @@ -74,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 07:28:25 glen +- added apache config + Revision 1.4 2005/08/25 01:51:28 wolvverine - add R ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.4&r2=1.5&f=u From aflinta at pld-linux.org Thu Aug 25 10:05:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: cairo.spec - avoid to link with external libpixman, rel 3. In-Reply-To: References: Message-ID: Author: aflinta Date: Thu Aug 25 08:05:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - avoid to link with external libpixman, rel 3. ---- Files affected: SPECS: cairo.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.32 SPECS/cairo.spec:1.33 --- SPECS/cairo.spec:1.32 Wed Aug 17 19:19:41 2005 +++ SPECS/cairo.spec Thu Aug 25 10:04:57 2005 @@ -3,21 +3,20 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 0.9.2 -Release: 2 +Release: 3 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz # Source0-md5: 992095a5db597384a89b41e93737105d Patch0: %{name}-bug4110.patch URL: http://cairographics.org/ +BuildConflicts: libpixman-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.1.0 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 -# libpixman incorporated (explanation in NEWS) -#BuildRequires: libpixman-devel >= 0.1.6 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -26,7 +25,6 @@ BuildRequires: zlib-devel Requires: freetype >= 2.1.0 Requires: glitz >= 0.4.4 -#Requires: libpixman >= 0.1.6 Requires: xrender >= 0.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,9 +76,9 @@ Requires: fontconfig-devel Requires: freetype-devel >= 2.1.0 Requires: glitz-devel >= 0.4.4 -#Requires: libpixman-devel >= 0.1.6 Requires: libpng-devel Requires: xrender-devel >= 0.6 +Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -151,6 +149,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/25 08:04:57 aflinta +- avoid to link with external libpixman, rel 3. + Revision 1.32 2005/08/17 17:19:41 paladine - added bug4110 patch (thx freetz) - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.32&r2=1.33&f=u From adamg at pld-linux.org Thu Aug 25 10:05:46 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: APC-3.0.8.tgz Message-ID: <27796.1124957146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/APC-3.0.8.tgz a70a14a00275e551e8085f742322433f APC-3.0.8.tgz Size: 75541 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 10:05:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: php-pecl-APC.spec, php4-pecl-APC.spec - updated to 3.0.8 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 08:05:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.8 ---- Files affected: SPECS: php-pecl-APC.spec (1.8 -> 1.9) , php4-pecl-APC.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-APC.spec diff -u SPECS/php-pecl-APC.spec:1.8 SPECS/php-pecl-APC.spec:1.9 --- SPECS/php-pecl-APC.spec:1.8 Sun Aug 21 20:54:41 2005 +++ SPECS/php-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php-devel @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.8 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.3 SPECS/php4-pecl-APC.spec:1.4 --- SPECS/php4-pecl-APC.spec:1.3 Sun Aug 21 20:54:41 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.3 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-APC.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 10:22:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: template-php4-pecl.spec (NEW) - copy of template-php-pecl.spec In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:22:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy of template-php-pecl.spec ---- Files affected: SPECS: template-php4-pecl.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u /dev/null SPECS/template-php4-pecl.spec:1.1 --- /dev/null Thu Aug 25 10:22:30 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:22:25 2005 @@ -0,0 +1,100 @@ +# $Revision$, $Date$ +%define _modname - +%define _status - + +Summary: %{_modname} - +Summary(pl): %{_modname} - +Name: php-pecl-%{_modname} +Version: 1.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +URL: http://pecl.php.net/package/Modname/ +BuildRequires: libtool +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description + +In PECL status of this extension is: %{_status}. + +%description -l pl + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 08:22:25 glen +- copy of template-php-pecl.spec + +Revision 1.10 2004/08/07 17:47:11 adamg +- ok, let's force php5 for pecl extensions + +Revision 1.9 2004/05/30 16:13:15 adamg +- fixed english information about status of the package; cosmetics + +Revision 1.8 2003/10/21 11:17:28 adamg +- added default doc files + +Revision 1.7 2003/10/15 17:37:05 adamg +- it finally happened - PECL separated from PEAR and moved to its own + repository, thus changes in urls (s/pear/pecl/) + +Revision 1.6 2003/10/07 20:50:01 adamg +- do not use macros in URL + +Revision 1.5 2003/08/31 20:49:12 adamg +- more specific URL + +Revision 1.4 2003/08/18 08:09:35 gotar +- mass commit: cosmetics (removed trailing white spaces) + +Revision 1.3 2003/06/12 12:31:48 qboosh +- cosmetics + +Revision 1.2 2003/06/11 23:09:37 adamg +- fixed package status information + +Revision 1.1 2003/06/11 17:18:49 adamg +- initial import of PECL template ================================================================ From paladine at pld-linux.org Thu Aug 25 10:25:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: gnome-keyring-manager-desktop.patch - updated for 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:25:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: gnome-keyring-manager-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gnome-keyring-manager-desktop.patch diff -u SOURCES/gnome-keyring-manager-desktop.patch:1.1 SOURCES/gnome-keyring-manager-desktop.patch:1.2 --- SOURCES/gnome-keyring-manager-desktop.patch:1.1 Wed Nov 17 13:37:44 2004 +++ SOURCES/gnome-keyring-manager-desktop.patch Thu Aug 25 10:25:27 2005 @@ -1,6 +1,6 @@ -diff -urN gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in ---- gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:07.517253736 +0100 -+++ gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:32.275489912 +0100 +diff -urN gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in +--- gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in 2005-03-25 16:41:46.000000000 +0100 ++++ gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in 2005-08-24 21:16:15.760210344 +0200 @@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Product=gnome-keyring-manager X-GNOME-Bugzilla-Component=general ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-keyring-manager-desktop.patch?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Thu Aug 25 10:26:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: gnome-keyring-manager-2.11.92.tar.bz2 Message-ID: <7395.1124958366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/gnome-keyring-manager-2.11.92.tar.bz2 73ad2540e61970442f880eb24b595d74 gnome-keyring-manager-2.11.92.tar.bz2 Size: 386900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:26:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gnome-keyring-manager.spec - updated to 2.11.92 - gnome-doc... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:26:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.11.92 - gnome-doc-utils for omf files - sorted %%files ---- Files affected: SPECS: gnome-keyring-manager.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.7 SPECS/gnome-keyring-manager.spec:1.8 --- SPECS/gnome-keyring-manager.spec:1.7 Mon Apr 25 11:47:57 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 10:26:02 2005 @@ -2,23 +2,24 @@ Summary: Keyring manager for GNOME Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager -Version: 0.0.4 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/0.0/%{name}-%{version}.tar.bz2 -# Source0-md5: 6c44751e9d5fa25559a751fc9751606f +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 73ad2540e61970442f880eb24b595d74 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.8.1 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-keyring-devel >= 0.4.1 -BuildRequires: gtk+2-devel >= 2:2.4.4 +BuildRequires: gtk+2-devel >= 2:2.6.0 BuildRequires: intltool >= 0.23 BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: gtk+2 >= 2:2.4.4 +Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,8 +34,11 @@ %patch0 -p1 %build +gnome-doc-prepare --copy --force +%{__gnome_doc_common} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} %install @@ -46,7 +50,7 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no -%find_lang %{name} +%find_lang %{name} --with-gnome %clean rm -rf $RPM_BUILD_ROOT @@ -61,8 +65,9 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/* %{_desktopdir}/* +%{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 08:26:02 paladine +- updated to 2.11.92 +- gnome-doc-utils for omf files +- sorted %%files + Revision 1.7 2005/04/25 09:47:57 paladine - new style macros - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Thu Aug 25 10:26:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: template-php4-pecl.spec - use confdir based php In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:26:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir based php ---- Files affected: SPECS: template-php4-pecl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.1 SPECS/template-php4-pecl.spec:1.2 --- SPECS/template-php4-pecl.spec:1.1 Thu Aug 25 10:22:25 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:26:49 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php4 Summary: %{_modname} - Summary(pl): %{_modname} - @@ -12,13 +13,13 @@ Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool -BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +BuildRequires: php4-devel +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -42,21 +43,29 @@ install -d $RPM_BUILD_ROOT%{extensionsdir} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/25 08:26:49 glen +- use confdir based php + Revision 1.1 2005/08/25 08:22:25 glen - copy of template-php-pecl.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 10:31:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: template-php4-pecl.spec - typo, merge installs In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:31:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, merge installs ---- Files affected: SPECS: template-php4-pecl.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.2 SPECS/template-php4-pecl.spec:1.3 --- SPECS/template-php4-pecl.spec:1.2 Thu Aug 25 10:26:49 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:31:34 2005 @@ -40,11 +40,10 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini ; Enable %{_modname} extension module extension=%{_modname}.so EOF @@ -74,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 08:31:34 glen +- typo, merge installs + Revision 1.2 2005/08/25 08:26:49 glen - use confdir based php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Thu Aug 25 10:37:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: php4-pecl-APC.spec - use confdir php, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:37:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir php, rel 2 ---- Files affected: SPECS: php4-pecl-APC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.4 SPECS/php4-pecl-APC.spec:1.5 --- SPECS/php4-pecl-APC.spec:1.4 Thu Aug 25 10:05:42 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:36:56 2005 @@ -1,12 +1,13 @@ # $Revision$, $Date$ %define _modname APC %define _status stable +%define _sysconfdir /etc/php4 Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} Version: 3.0.8 -Release: 1 +Release: 2 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz @@ -14,12 +15,11 @@ URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description APC is the Alternative PHP Cache. It was conceived of to provide a @@ -46,24 +46,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/apc.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CHANGELOG,INSTALL,NOTICE} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -72,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 08:36:56 glen +- use confdir php, rel 2 + Revision 1.4 2005/08/25 08:05:42 adamg - updated to 3.0.8 @@ -83,4 +93,3 @@ Revision 1.1 2005/07/27 11:09:41 adamg - new (cp from php-pecl-APC.spec) - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Thu Aug 25 10:37:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: yelp-2.11.92.tar.bz2 Message-ID: <14578.1124959047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/yelp-2.11.92.tar.bz2 0458ead502d20d69ec96397da792f285 yelp-2.11.92.tar.bz2 Size: 649041 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:37:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): yelp.spec - updated to 2.11.92 - use style macros -... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:37:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - use style macros - sorted %%files ---- Files affected: SPECS: yelp.spec (1.66.2.10 -> 1.66.2.11) ---- Diffs: ================================================================ Index: SPECS/yelp.spec diff -u SPECS/yelp.spec:1.66.2.10 SPECS/yelp.spec:1.66.2.11 --- SPECS/yelp.spec:1.66.2.10 Thu Aug 18 14:24:16 2005 +++ SPECS/yelp.spec Thu Aug 25 10:37:22 2005 @@ -11,12 +11,12 @@ Summary: A system documentation reader from the GNOME project Summary(pl): Czytnik dokumentacji z projektu GNOME Name: yelp -Version: 2.11.1 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: f133a46fb20eb4733e5d5078a7c93ece +# Source0-md5: 0458ead502d20d69ec96397da792f285 Patch0: %{name}-desktop-categories.patch Patch1: %{name}-MOZILLA_HOME.patch URL: http://www.gnome.org/ @@ -40,9 +40,9 @@ %endif BuildRequires: pkgconfig >= 1:0.15.0 BuildRequires: popt-devel -BuildRequires: rpm-build >= 4.1-10 +BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: zlib-devel -Requires(post): GConf2 +Requires(post,preun): GConf2 Requires: docbook-style-xsl >= 1.55.0 Requires: gnome-doc-utils >= 0.3.1 Requires: gnome-vfs2 >= 2.11.0 @@ -93,17 +93,20 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install +%gconf_schema_install yelp.schemas + +%preun +%gconf_schema_uninstall yelp.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc README ChangeLog NEWS TODO AUTHORS %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/%{name} -%{_libdir}/bonobo/servers/* -%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png %{_desktopdir}/* +%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png +%{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/yelp.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -111,6 +114,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.11 2005/08/25 08:37:22 paladine +- updated to 2.11.92 +- use style macros +- sorted %%files + Revision 1.66.2.10 2005/08/18 12:24:16 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/yelp.spec?r1=1.66.2.10&r2=1.66.2.11&f=u From adamg at pld-linux.org Thu Aug 25 11:08:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: apache.spec - fix for a byterange handling bug that could c... In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 09:08:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for a byterange handling bug that could cause a DoS - release 5 ---- Files affected: SPECS: apache.spec (1.404 -> 1.405) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.404 SPECS/apache.spec:1.405 --- SPECS/apache.spec:1.404 Thu Aug 25 08:09:20 2005 +++ SPECS/apache.spec Thu Aug 25 11:08:30 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ # TODO: -# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -37,7 +36,7 @@ Summary(tr): Lider WWW taray?c? Name: apache Version: 2.0.54 -Release: 4 +Release: 5 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -91,6 +90,8 @@ Patch23: %{name}-normalize-path.patch # http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre Patch24: %{name}2-pcre-patch.diff +# http://issues.apache.org/bugzilla/attachment.cgi?id=16102 DoS +Patch25: %{name}2-byterange.patch URL: http://httpd.apache.org/ BuildRequires: automake BuildRequires: apr-devel >= 1:1.0.0 @@ -775,6 +776,7 @@ %patch22 -p1 %patch23 -p1 %{?with_external_pcre:%patch24 -p2} +%patch25 -p0 %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *) %{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in @@ -1829,6 +1831,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.405 2005/08/25 09:08:30 adamg +- fix for a byterange handling bug that could cause a DoS +- release 5 + Revision 1.404 2005/08/25 06:09:20 glen - todo security ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.404&r2=1.405&f=u From paladine at pld-linux.org Thu Aug 25 11:09:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: gnubiff-2.1.5.tar.gz Message-ID: <1518.1124960976@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnubiff/gnubiff-2.1.5.tar.gz 5b8c406042028558a0cd3d24ec2cf199 gnubiff-2.1.5.tar.gz Size: 757377 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:09:39 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gnubiff.spec - updated to 2.1.5 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:09:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.5 - sorted %%files ---- Files affected: SPECS: gnubiff.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/gnubiff.spec diff -u SPECS/gnubiff.spec:1.23 SPECS/gnubiff.spec:1.24 --- SPECS/gnubiff.spec:1.23 Wed Jun 1 22:06:44 2005 +++ SPECS/gnubiff.spec Thu Aug 25 11:09:33 2005 @@ -6,12 +6,12 @@ Summary: Mail notification program Summary(pl): Program powiadamiaj?cy o nowej poczcie Name: gnubiff -Version: 2.1.3 +Version: 2.1.5 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/gnubiff/%{name}-%{version}.tar.gz -# Source0-md5: 4832f7d100b8f476082191a4c66a772f +# Source0-md5: 5b8c406042028558a0cd3d24ec2cf199 URL: http://gnubiff.sourceforge.net/ %{?with_gnome:BuildRequires: GConf2-devel >= 2.4.0} BuildRequires: autoconf >= 2.53 @@ -81,8 +81,8 @@ %{_pixmapsdir}/*.png %if %{with gnome} -%{_libdir}/bonobo/servers/*.server %{_datadir}/gnome-*/ui/*.xml +%{_libdir}/bonobo/servers/*.server %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +91,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/25 09:09:33 paladine +- updated to 2.1.5 +- sorted %%files + Revision 1.23 2005/06/01 20:06:44 zbyniu - BR: fam-devel, gettext-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnubiff.spec?r1=1.23&r2=1.24&f=u From paladine at pld-linux.org Thu Aug 25 11:13:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: python-pygtk-pangocairo.defs (REMOVED) - already in sources In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:13:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - already in sources ---- Files affected: SOURCES: python-pygtk-pangocairo.defs (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Thu Aug 25 11:14:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: pygtk-2.7.4.tar.bz2 Message-ID: <4419.1124961241@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/pygtk-2.7.4.tar.bz2 103670cb22c6cb65375dbd68aa727315 pygtk-2.7.4.tar.bz2 Size: 752672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:14:03 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): python-pygtk.spec - updated to 2.7.4 - removed pang... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:14:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.7.4 - removed pangocairo.defs (already in sources) - fixed/updated BRs/Rs - sorted %%files ---- Files affected: SPECS: python-pygtk.spec (1.113.2.6 -> 1.113.2.7) ---- Diffs: ================================================================ Index: SPECS/python-pygtk.spec diff -u SPECS/python-pygtk.spec:1.113.2.6 SPECS/python-pygtk.spec:1.113.2.7 --- SPECS/python-pygtk.spec:1.113.2.6 Thu Aug 18 23:44:43 2005 +++ SPECS/python-pygtk.spec Thu Aug 25 11:13:58 2005 @@ -10,16 +10,15 @@ Summary: Python bindings for GTK+ 2.x libraries Summary(pl): Wi?zania Pythona do bibliotek GTK+ 2.x Name: python-%{module} -Version: 2.7.3 -Release: 2 +Version: 2.7.4 +Release: 1 Epoch: 2 License: LGPL Group: Libraries/Python Source0: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/%{module}-%{version}.tar.bz2 -# Source0-md5: 17986ed00ce4b3fb3e699c7f3735942c +# Source0-md5: 103670cb22c6cb65375dbd68aa727315 Source1: %{name}-python.m4 Source2: %{name}-jhflags.m4 -Source3: %{name}-pangocairo.defs Patch0: %{name}-pyc.patch URL: http://www.pygtk.org/ BuildRequires: atk-devel >= 1:1.8.1 @@ -29,10 +28,10 @@ BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.1 BuildRequires: libtool -BuildRequires: pango-devel >= 1:1.9.0 +BuildRequires: pango-devel >= 1:1.10.0 BuildRequires: python-devel >= 1:2.3.2 %{?with_numpy:BuildRequires: python-numpy-devel} -BuildRequires: python-pycairo-devel +BuildRequires: python-pycairo-devel >= 0.5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -81,7 +80,7 @@ Summary(pl): Wi?zania Pythona do biblioteki GObject Group: Libraries/Python %pyrequires_eq python-modules -Requires: glib2 >= 1:2.7.4 +Requires: glib2 >= 1:2.8.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -97,8 +96,8 @@ Group: Libraries/Python Requires: %{name}-atk = %{epoch}:%{version}-%{release} Requires: %{name}-pango = %{epoch}:%{version}-%{release} -Requires: gtk+2 >= 2:2.7.4 -Requires: python-pycairo +Requires: gtk+2 >= 2:2.8.0 +Requires: python-pycairo >= 0.5.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -113,7 +112,7 @@ Summary(pl): Wi?zania Pythona do biblioteki ATK Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: atk >= 1.8.0 +Requires: atk >= 1:1.8.0 %description atk Python bindings for ATK library. @@ -126,7 +125,7 @@ Summary(pl): Wi?zania Pythona do biblioteki Pango Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: pango > 1.9.0 +Requires: pango >= 1:1.10.0 Requires: python-pycairo %description pango @@ -156,7 +155,6 @@ mkdir m4 cp %{SOURCE1} m4/python.m4 cp %{SOURCE2} m4/jhflags.m4 -cp %{SOURCE3} pangocairo.defs %build %{__libtoolize} @@ -189,15 +187,12 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -%{_includedir}/pygtk-2.0 - %dir %{_datadir}/%{module} %dir %{_datadir}/%{module}/2.0 %dir %{_datadir}/%{module}/2.0/codegen %{_datadir}/%{module}/2.0/codegen/*.py[co] - %{_datadir}/%{module}/2.0/defs - +%{_includedir}/pygtk-2.0 %{_pkgconfigdir}/*.pc %files examples @@ -237,6 +232,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113.2.7 2005/08/25 09:13:58 paladine +- updated to 2.7.4 +- removed pangocairo.defs (already in sources) +- fixed/updated BRs/Rs +- sorted %%files + Revision 1.113.2.6 2005/08/18 21:44:43 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pygtk.spec?r1=1.113.2.6&r2=1.113.2.7&f=u From glen at pld-linux.org Thu Aug 25 11:45:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: egroupware.spec - splitting dirs for fine tune of permissions In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 09:45:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - splitting dirs for fine tune of permissions ---- Files affected: SPECS: egroupware.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.5 SPECS/egroupware.spec:1.6 --- SPECS/egroupware.spec:1.5 Thu Aug 25 09:28:25 2005 +++ SPECS/egroupware.spec Thu Aug 25 11:45:28 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.4 +Release: 0.7 Epoch: 0 License: GPL Group: Applications/WWW @@ -85,7 +85,42 @@ %attr(710,root,http) %dir %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* -%{_appdir} +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/addressbook +%{_appdir}/admin +%{_appdir}/backup +%{_appdir}/bookmarks +%{_appdir}/calendar +%{_appdir}/comic +%{_appdir}/developer_tools +%{_appdir}/email +%{_appdir}/emailadmin +%{_appdir}/etemplate +%{_appdir}/felamimail +%{_appdir}/filemanager +%{_appdir}/forum +%{_appdir}/ftp +%{_appdir}/fudforum +%{_appdir}/headlines +%{_appdir}/infolog +%{_appdir}/jinn +%{_appdir}/manual +%{_appdir}/messenger +%{_appdir}/news_admin +%{_appdir}/phpbrain +%{_appdir}/phpgwapi +%{_appdir}/phpldapadmin +%{_appdir}/phpsysinfo +%{_appdir}/polls +%{_appdir}/preferences +%{_appdir}/projects +%{_appdir}/registration +%{_appdir}/setup +%{_appdir}/sitemgr +%{_appdir}/stocks +%{_appdir}/tts +%{_appdir}/wiki %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -93,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:45:28 glen +- splitting dirs for fine tune of permissions + Revision 1.5 2005/08/25 07:28:25 glen - added apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.5&r2=1.6&f=u From heretyk at pld-linux.org Thu Aug 25 11:55:09 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: jude-icon.png (NEW), jude.desktop - added icon for Jude In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:55:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added icon for Jude ---- Files affected: SOURCES: jude-icon.png (NONE -> 1.1) (NEW), jude.desktop (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/jude-icon.png <> ================================================================ Index: SOURCES/jude.desktop diff -u SOURCES/jude.desktop:1.2 SOURCES/jude.desktop:1.3 --- SOURCES/jude.desktop:1.2 Wed Nov 17 00:20:43 2004 +++ SOURCES/jude.desktop Thu Aug 25 11:55:04 2005 @@ -3,6 +3,7 @@ Name=Jude Comment=Jude Comment[pl]=Jude +Icon=jude.png Exec=jude Terminal=false MultipleArgs=false ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jude.desktop?r1=1.2&r2=1.3&f=u From heretyk at pld-linux.org Thu Aug 25 11:58:57 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: jude.spec - up to 1.6.2 - icon added In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:58:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.2 - icon added ---- Files affected: SPECS: jude.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.5 SPECS/jude.spec:1.6 --- SPECS/jude.spec:1.5 Wed Nov 17 00:20:56 2004 +++ SPECS/jude.spec Thu Aug 25 11:58:52 2005 @@ -3,12 +3,13 @@ Summary: A New Java/UML Object-Oriented Design Tool Summary(pl): ?rodowisko obiektowo zorientowanego projektowania narz?dzi UML Name: jude -Version: 1.4 -Release: 2 +Version: 1.6.2 +Release: 1 License: Freeware Group: Applications/Engineering -Source0: http://objectclub.esm.co.jp/Jude/com%(echo %{version} |tr -d .)/%{name}-%{codename}-%(echo %{version} |tr . _).zip +Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop +Source2: %{name}-icon.png URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch @@ -29,7 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}} cat < $RPM_BUILD_ROOT%{_bindir}/%{name} #!/bin/sh @@ -38,6 +39,7 @@ install jude-%{codename}.jar JudeDefaultModel.jude $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png %clean rm -rf $RPM_BUILD_ROOT @@ -48,6 +50,7 @@ %attr(755,root,root) %{_bindir}/* %{_datadir}/%{name} %{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +58,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:58:52 heretyk +- up to 1.6.2 +- icon added + Revision 1.5 2004/11/16 23:20:56 paladine - rel 2 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Thu Aug 25 12:04:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - commit my last change... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:04:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commit my last changes, dated 2005-06-19 ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.5 -> 1.11.2.6) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 Sun Jun 19 19:04:13 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:04:42 2005 @@ -14,7 +14,7 @@ Name: php-pear-%{_pearname} Version: 1.3.0 %define _rc RC3 -Release: 0.%{_rc}.4 +Release: 0.%{_rc}.5 License: PHP 3.00 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz @@ -192,6 +192,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -x /usr/bin/pear ]; then + umask 002 + # this builds the pear registry depdb + /usr/bin/pear list > /dev/null +fi + %files %defattr(644,root,root,755) %doc %{_pearname}-%{version}%{_rc}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*,poweredbyphpdoc.gif} @@ -210,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.6 2005/08/25 10:04:42 glen +- commit my last changes, dated 2005-06-19 + Revision 1.11.2.5 2005/06/19 17:04:13 glen - missing dir - NOTE: it doesn't work non-root now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.5&r2=1.11.2.6&f=u From paladine at pld-linux.org Thu Aug 25 12:06:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: gnome-keyring-manager.spec - fixed %%files - added missing ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 10:06:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %%files - added missing BR/R: scrollkeeper - run %%scrollkeeper_update_post{,un} - rel. 2 ---- Files affected: SPECS: gnome-keyring-manager.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.8 SPECS/gnome-keyring-manager.spec:1.9 --- SPECS/gnome-keyring-manager.spec:1.8 Thu Aug 25 10:26:02 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 12:06:45 2005 @@ -3,7 +3,7 @@ Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager Version: 2.11.92 -Release: 1 +Release: 2 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 @@ -18,7 +18,9 @@ BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,preun): GConf2 +Requires(post,postun): scrollkeeper Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,16 +59,22 @@ %post %gconf_schema_install gnome-keyring-manager.schemas +%scrollkeeper_update_post %preun %gconf_schema_uninstall gnome-keyring-manager.schemas +%postun +%scrollkeeper_update_postun + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_datadir}/* +%{_datadir}/%{name} %{_desktopdir}/* +%{_mandir}/man1/* +%{_omf_dest_dir}/%{name} %{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -75,6 +83,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 10:06:45 paladine +- fixed %%files +- added missing BR/R: scrollkeeper +- run %%scrollkeeper_update_post{,un} +- rel. 2 + Revision 1.8 2005/08/25 08:26:02 paladine - updated to 2.11.92 - gnome-doc-utils for omf files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Thu Aug 25 12:10:36 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:08 2005 Subject: SOURCES: dev-list - fix grsec In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:10:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix grsec ---- Files affected: SOURCES: dev-list (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.29 SOURCES/dev-list:1.30 --- SOURCES/dev-list:1.29 Mon Aug 22 10:46:10 2005 +++ SOURCES/dev-list Thu Aug 25 12:10:31 2005 @@ -2640,7 +2640,7 @@ %dev(b,2,37) %attr(660,root,floppy) /dev/fd1CompaQ %dev(c,1,7) %attr(644,root,root) /dev/full %dev(c,10,229) %attr(660,root,fsctrl) /dev/fuse -%dev(c,1,10) %attr(622,root,root) /dev/grsec +%dev(c,1,12) %attr(622,root,root) /dev/grsec %dev(b,3,0) %attr(660,root,disk) /dev/hda %dev(b,3,1) %attr(660,root,disk) /dev/hda1 %dev(b,3,10) %attr(660,root,disk) /dev/hda10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.29&r2=1.30&f=u From glen at pld-linux.org Thu Aug 25 12:11:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: egroupware.spec - permission changes, check_install.php passed In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:11:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - permission changes, check_install.php passed ---- Files affected: SPECS: egroupware.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.6 SPECS/egroupware.spec:1.7 --- SPECS/egroupware.spec:1.6 Thu Aug 25 11:45:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 12:11:52 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.7 +Release: 0.9 Epoch: 0 License: GPL Group: Applications/WWW @@ -101,7 +101,6 @@ %{_appdir}/filemanager %{_appdir}/forum %{_appdir}/ftp -%{_appdir}/fudforum %{_appdir}/headlines %{_appdir}/infolog %{_appdir}/jinn @@ -109,7 +108,6 @@ %{_appdir}/messenger %{_appdir}/news_admin %{_appdir}/phpbrain -%{_appdir}/phpgwapi %{_appdir}/phpldapadmin %{_appdir}/phpsysinfo %{_appdir}/polls @@ -122,12 +120,33 @@ %{_appdir}/tts %{_appdir}/wiki +%dir %{_appdir}/phpgwapi +%{_appdir}/phpgwapi/*.php +%{_appdir}/phpgwapi/cron +%{_appdir}/phpgwapi/doc +%{_appdir}/phpgwapi/inc +%{_appdir}/phpgwapi/js +%{_appdir}/phpgwapi/setup +%{_appdir}/phpgwapi/templates +%{_appdir}/phpgwapi/themes +%dir %attr(775,root,http) %{_appdir}/phpgwapi/images +%{_appdir}/phpgwapi/images/* + +%dir %attr(775,root,http) %{_appdir}/fudforum +%{_appdir}/fudforum/*.php +%{_appdir}/fudforum/inc +%{_appdir}/fudforum/setup +%{_appdir}/fudforum/templates + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 10:11:52 glen +- permission changes, check_install.php passed + Revision 1.6 2005/08/25 09:45:28 glen - splitting dirs for fine tune of permissions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.6&r2=1.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:13:13 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: horde-passwd.spec - unification In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:13:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unification ---- Files affected: SPECS: horde-passwd.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.25 SPECS/horde-passwd.spec:1.26 --- SPECS/horde-passwd.spec:1.25 Wed Aug 24 21:08:52 2005 +++ SPECS/horde-passwd.spec Thu Aug 25 12:13:07 2005 @@ -16,7 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/25 10:13:07 paszczus +- unification + Revision 1.25 2005/08/24 19:08:52 glen - fix for broken ldap::_userDN() ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.25&r2=1.26&f=u From paszczus at pld-linux.org Thu Aug 25 12:15:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: l7-protocols-2005-08-24.tar.gz Message-ID: <9113.1124964928@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/l7-filter/l7-protocols-2005-08-24.tar.gz d6529a1483678b8b7969fc55dcd3f294 l7-protocols-2005-08-24.tar.gz Size: 65328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:15:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: l7-protocols.spec - updated to 2005-08-24 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:15:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 ---- Files affected: SPECS: l7-protocols.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/l7-protocols.spec diff -u SPECS/l7-protocols.spec:1.10 SPECS/l7-protocols.spec:1.11 --- SPECS/l7-protocols.spec:1.10 Fri Jul 29 15:16:35 2005 +++ SPECS/l7-protocols.spec Thu Aug 25 12:15:22 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define dashver 2005-07-28 +%define dashver 2005-08-24 # Summary: Protocol definitions files for l7-filter Summary(pl): Pliki definicji protoko??w dla l7-filter Name: l7-protocols -Version: 2005_07_28 +Version: 2005_08_24 Release: 1 License: GPL Group: Applications/Networking Source0: http://dl.sourceforge.net/l7-filter/%{name}-%{dashver}.tar.gz -# Source0-md5: 9020a5bf60175ba7194d3f718cf6585f +# Source0-md5: d6529a1483678b8b7969fc55dcd3f294 URL: http://l7-filter.sourceforge.net/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 10:15:22 paszczus +- updated to 2005-08-24 + Revision 1.10 2005/07/29 13:16:35 paszczus - updated to 2005_07_28 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/l7-protocols.spec?r1=1.10&r2=1.11&f=u From arekm at pld-linux.org Thu Aug 25 12:17:21 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - fix br In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:17:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix br ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.6 -> 1.11.2.7) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 SPECS/php-pear-PhpDocumentor.spec:1.11.2.7 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 Thu Aug 25 12:04:42 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:17:16 2005 @@ -22,7 +22,7 @@ Patch0: %{name}-includes_fix.patch Patch1: %{name}-html_treemenu_includes_fix.patch URL: http://pear.php.net/package/PhpDocumentor/ -BuildRequires: php-pear-PEAR >= 1.4.0-0.a11.5 +BuildRequires: php-pear-PEAR >= 1:1.4.0-0.a11.5 BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: sed >= 4.0 Requires(post): php-pear-PEAR @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.7 2005/08/25 10:17:16 arekm +- fix br + Revision 1.11.2.6 2005/08/25 10:04:42 glen - commit my last changes, dated 2005-06-19 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.6&r2=1.11.2.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: DISTFILES: kmplayer-0.9.1-pre1.tar.bz2 Message-ID: <25276.1124966469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xs4all.nl/~jjvrieze/kmplayer-0.9.1-pre1.tar.bz2 b82f729fc99967cf76d92a78f241e164 kmplayer-0.9.1-pre1.tar.bz2 Size: 740728 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): kmplayer.spec - updated to 0.9.1-pre1 - adaptarized In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:41:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.9.1-pre1 - adaptarized ---- Files affected: SPECS: kmplayer.spec (1.48.2.2 -> 1.48.2.3) ---- Diffs: ================================================================ Index: SPECS/kmplayer.spec diff -u SPECS/kmplayer.spec:1.48.2.2 SPECS/kmplayer.spec:1.48.2.3 --- SPECS/kmplayer.spec:1.48.2.2 Fri Jul 29 12:44:26 2005 +++ SPECS/kmplayer.spec Thu Aug 25 12:41:03 2005 @@ -1,21 +1,23 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without gstreamer # Do not build kgstplayer +%bcond_with koffice # Build koffice plugin +%bcond_without xine # Do not build kxineplayer -%bcond_without gstreamer # Do not build kgstplayer -%bcond_with koffice # Build koffice plugin -%bcond_without xine # Do not build kxineplayer - +%define _pre pre1 Summary: A KDE MPlayer/Xine/ffmpeg/ffserver/VDR frontend Summary(pl): Frontend dla program?w MPlayer/Xine/ffmpeg/ffserver/VDR pod KDE Name: kmplayer -Version: 0.9.0a -Release: 0.1 +Version: 0.9.1 +Release: 0.%{_pre}.1 Epoch: 2 License: GPL Group: X11/Applications/Multimedia # From kdeextragear-2 kde cvs module #Source0: ftp://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2 -Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}.tar.bz2 -# Source0-md5: c6d5203bf1bfe5d2f1a5fb9f3b048c74 +Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}-%{_pre}.tar.bz2 +# Source0-md5: b82f729fc99967cf76d92a78f241e164 #Patch0: %{name}-mimetypes.patch URL: http://www.xs4all.nl/~jjvrieze/kmplayer.html BuildRequires: arts-qt-devel @@ -23,7 +25,7 @@ %{?with_gstreamer:BuildRequires: gstreamer-plugins-devel} BuildRequires: kdelibs-devel >= 9:3.1.92 %{?with_koffice:BuildRequires: koffice-devel} -BuildRequires: rpmbuild(macros) >= 1.129 +BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 %{?with_xine:BuildRequires: xine-lib-devel >= 1:1.0} #BuildRequires: unsermake @@ -53,7 +55,7 @@ Integracja kmplayera z koffice. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{_pre} %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ src/kmplayer.desktop \ @@ -65,7 +67,7 @@ #export UNSERMAKE=/usr/share/unsermake/unsermake -#%{__make} -f admin/Makefile.common cvs +#%{__make} -f admin/Makefile.common cvs %configure \ --disable-rpath \ @@ -87,7 +89,7 @@ # remove bogus translation rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx -#%find_lang %{name} --with-kde +#%find_lang %{name} --with-kde %clean rm -rf $RPM_BUILD_ROOT @@ -130,6 +132,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.3 2005/08/25 10:41:03 paszczus +- updated to 0.9.1-pre1 +- adaptarized + Revision 1.48.2.2 2005/07/29 10:44:26 paszczus - updated to 0.9.0a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kmplayer.spec?r1=1.48.2.2&r2=1.48.2.3&f=u From trojan at pld-linux.org Thu Aug 25 12:47:22 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (GCC4): gcc.spec - updated to 4.0.1 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 10:47:22 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - updated to 4.0.1 ---- Files affected: SPECS: gcc.spec (1.308 -> 1.308.2.1) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308 SPECS/gcc.spec:1.308.2.1 --- SPECS/gcc.spec:1.308 Mon May 23 12:30:55 2005 +++ SPECS/gcc.spec Thu Aug 25 12:47:16 2005 @@ -25,14 +25,12 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -%define _snap 20050521 -Release: 0.%{_snap}.2 +Release: 0.1 Epoch: 5 License: GPL v2+ Group: Development/Languages -#Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/gcc-4.0-%{_snap}.tar.bz2 -# Source0-md5: 7f45e29a00590ce57a001a9294e8184e +Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 947416e825a877a0d69489be1be43be1 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -40,12 +38,6 @@ Patch3: %{name}-ada-link-new-libgnat.patch Patch4: %{name}-ada-link.patch Patch5: %{name}-alpha-ada_fix.patch -# PRs -Patch10: %{name}-pr19664.patch -Patch11: %{name}-pr20218.patch -Patch12: %{name}-pr20297.patch -Patch14: %{name}-push-pop-visibility.patch -Patch15: %{name}-pr21704.patch URL: http://gcc.gnu.org/ BuildRequires: autoconf BuildRequires: automake @@ -676,8 +668,7 @@ Statyczne biblioteki Obiektowego C. %prep -#setup -q -n gcc-%{version} -%setup -q -n gcc-4.0-%{_snap} +%setup -q -n gcc-%{version} %patch0 -p1 %patch1 -p1 @@ -686,13 +677,6 @@ %patch4 -p1 %patch5 -p1 -# PRs -%patch10 -p1 -%patch11 -p0 -%patch12 -p1 -%patch14 -p0 -%patch15 -p1 - # because we distribute modified version of gcc... perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c perl -pi -e 's@(bug_report_url.*";@' gcc/version.c @@ -1204,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.1 2005/08/25 10:47:16 trojan +- updated to 4.0.1 + Revision 1.308 2005/05/23 10:30:55 pluto - fix handling #pragma gcc visibility for builtins. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308&r2=1.308.2.1&f=u From paszczus at pld-linux.org Thu Aug 25 13:03:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS: adapter.awk - do not be so humble ; added one more author In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 11:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - do not be so humble ; added one more author ---- Files affected: SPECS: adapter.awk (1.172 -> 1.173) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.172 SPECS/adapter.awk:1.173 --- SPECS/adapter.awk:1.172 Tue Aug 23 22:34:51 2005 +++ SPECS/adapter.awk Thu Aug 25 13:03:07 2005 @@ -9,6 +9,7 @@ # Tomasz K?oczko # Artur Frysiak # Michal Kochanowicz +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.172&r2=1.173&f=u From paladine at pld-linux.org Thu Aug 25 13:04:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): gnome-media.spec - missing dir - rel. 3 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dir - rel. 3 ---- Files affected: SPECS: gnome-media.spec (1.122.2.5 -> 1.122.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-media.spec diff -u SPECS/gnome-media.spec:1.122.2.5 SPECS/gnome-media.spec:1.122.2.6 --- SPECS/gnome-media.spec:1.122.2.5 Thu Aug 18 12:56:42 2005 +++ SPECS/gnome-media.spec Thu Aug 25 13:04:01 2005 @@ -4,7 +4,7 @@ Summary(pl): Programy multimedialne dla GNOME Name: gnome-media Version: 2.11.91 -Release: 2 +Release: 3 License: GPL v2+/LGPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-media/2.11/%{name}-%{version}.tar.bz2 @@ -295,6 +295,7 @@ %dir %{_datadir}/gnome-media/pixmaps %{_datadir}/gnome-media/glade %{_datadir}/gstreamer-properties +%dir %{_omf_dest_dir}/%{name} %{_omf_dest_dir}/%{name}/gstreamer-properties-C.omf %{_pixmapsdir}/gstreamer-properties.png %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas @@ -393,6 +394,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122.2.6 2005/08/25 11:04:01 paladine +- missing dir +- rel. 3 + Revision 1.122.2.5 2005/08/18 10:56:42 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-media.spec?r1=1.122.2.5&r2=1.122.2.6&f=u From paladine at pld-linux.org Thu Aug 25 13:04:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): gnome-applets.spec - missing dirs - rel. 2 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dirs - rel. 2 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.8 -> 1.152.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.8 SPECS/gnome-applets.spec:1.152.2.9 --- SPECS/gnome-applets.spec:1.152.2.8 Wed Aug 24 08:54:24 2005 +++ SPECS/gnome-applets.spec Thu Aug 25 13:04:44 2005 @@ -8,7 +8,7 @@ Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets Version: 2.11.92.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2, FDL Group: X11/Applications @@ -533,6 +533,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml %{_pixmapsdir}/accessx-status-applet %{_iconsdir}/hicolor/48x48/apps/ax-applet.png +%dir %{_omf_dest_dir}/accessx-status %{_omf_dest_dir}/accessx-status/accessx-status-C.omf %lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf @@ -545,6 +546,7 @@ %{_datadir}/%{name}/glade/battstat_applet.glade %{_sysconfdir}/gconf/schemas/battstat.schemas %{_sysconfdir}/sound/events/battstat_applet.soundlist +%dir %{_omf_dest_dir}/battstat %{_omf_dest_dir}/battstat/battstat-C.omf %files charpicker -f char-palette.lang @@ -555,6 +557,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas +%dir %{_omf_dest_dir}/char-palette %{_omf_dest_dir}/char-palette/char-palette-C.omf %lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf @@ -570,6 +573,7 @@ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png +%dir %{_omf_dest_dir}/cpufreq-applet %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf %lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf @@ -580,6 +584,7 @@ %{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas +%dir %{_omf_dest_dir}/drivemount %{_omf_dest_dir}/drivemount/drivemount-C.omf %lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf @@ -592,6 +597,7 @@ %{_datadir}/%{name}/geyes %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas +%dir %{_omf_dest_dir}/geyes %{_omf_dest_dir}/geyes/geyes-C.omf %lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf @@ -603,6 +609,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GtikApplet.xml %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas +%dir %{_omf_dest_dir}/gtik2_applet2 %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf %lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf @@ -614,6 +621,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml %{_datadir}/%{name}/gweather %{_sysconfdir}/gconf/schemas/gweather.schemas +%dir %{_omf_dest_dir}/gweather %{_omf_dest_dir}/gweather/gweather-C.omf %lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf @@ -673,6 +681,7 @@ %{_datadir}/%{name}/glade/gswitchit*.glade %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas +%dir %{_omf_dest_dir}/gswitchit %{_omf_dest_dir}/gswitchit/gswitchit-C.omf %lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf @@ -687,6 +696,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas +%dir %{_omf_dest_dir}/command-line %{_omf_dest_dir}/command-line/command-line-C.omf %lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf @@ -697,6 +707,7 @@ %{_libdir}/bonobo/servers/GNOME_MixerApplet.server %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas +%dir %{_omf_dest_dir}/mixer_applet2 %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf %lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf @@ -716,6 +727,7 @@ %{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas +%dir %{_omf_dest_dir}/multiload %{_omf_dest_dir}/multiload/multiload-C.omf %lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf @@ -728,6 +740,7 @@ %{_datadir}/%{name}/glade/stickynotes.glade %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas +%dir %{_omf_dest_dir}/stickynotes_applet %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf %lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf @@ -738,6 +751,7 @@ %{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +%dir %{_omf_dest_dir}/trashapplet %{_omf_dest_dir}/trashapplet/trashapplet-C.omf %lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf %lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf @@ -748,6 +762,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.9 2005/08/25 11:04:44 paladine +- missing dirs +- rel. 2 + Revision 1.152.2.8 2005/08/24 06:54:24 paladine - updated to 2.11.92.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.8&r2=1.152.2.9&f=u From havner at pld-linux.org Thu Aug 25 13:12:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:14:08 2005 Subject: fortunes-pl: pld-offensive - glen's polish course continues In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 11:12:26 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - glen's polish course continues ---- Files affected: fortunes-pl: pld-offensive (1.6 -> 1.7) ---- Diffs: ================================================================ Index: fortunes-pl/pld-offensive diff -u fortunes-pl/pld-offensive:1.6 fortunes-pl/pld-offensive:1.7 --- fortunes-pl/pld-offensive:1.6 Fri Feb 4 11:54:52 2005 +++ fortunes-pl/pld-offensive Thu Aug 25 13:12:21 2005 @@ -55,3 +55,12 @@ 11:36 <@cieciwa> Panowie... 11:37 <@cieciwa> komu przyjebac ??? tak od serca ? % +[13:08:17] < mmazur> 'kurwa mac' is short for 'kurwa twoja mac' which means (literally) 'whore your mother' [IN] +[13:08:27] < mmazur> So it's kind of heavy for a curse :) [IN] +[13:08:46] < glen> we have saying here in estonia, after one anectote [IN] +[13:08:48] < gausus> mmazur: nalezy Ci sie medal KEN i uscisk reki miodka za promocje poprawnie rozumianej polszczyzny na obczyznie [IN] +[13:08:54] < glen> "suck your own mother's dick" :) [IN] +[13:09:00] < gausus> mmazur: ale ucz ich ucz, jak ich podbijemy to beda nas rozumiec [IN] +[13:09:20] < gausus> glen: afair nobodys mother has a dick of her own [IN] +[13:09:27] < gausus> at least where i come from [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld-offensive?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:24:35 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:08 2005 Subject: SPECS (DEVEL): imlib2.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:24:35 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - added URL ---- Files affected: SPECS: imlib2.spec (1.51.2.1 -> 1.51.2.2) ---- Diffs: ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.51.2.1 SPECS/imlib2.spec:1.51.2.2 --- SPECS/imlib2.spec:1.51.2.1 Thu Mar 31 01:38:47 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:24:30 2005 @@ -2,14 +2,13 @@ Summary: Powerful image loading and rendering library Summary(pl): Pot??na biblioteka wczytuj?ca i renderuj?ca obrazki Name: imlib2 -Version: 1.2.0 -%define _snap 20050329 -Release: 1.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: LGPL Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/pub/e17/%{name}-%{_snap}.tar.gz -# Source0-md5: cd77568626e5212ffcdbb881e407d8c6 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 9130e1b016eb392700c51baaa35c76cd +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -71,13 +70,13 @@ Biblioteki statyczne imlib2. %prep -%setup -q -n %{name} +%setup -q sed -i -e 's@/lib -lX11@/%{_lib} -lX11@' configure.in %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -137,6 +136,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51.2.2 2005/08/25 11:24:30 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- added URL + Revision 1.51.2.1 2005/03/30 23:38:47 sparky - updated to 20050329 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.51.2.1&r2=1.51.2.2&f=u From charles at pld-linux.org Thu Aug 25 13:24:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: imlib2-1.2.1.004.tar.gz Message-ID: <26548.1124969079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2-1.2.1.004.tar.gz 9130e1b016eb392700c51baaa35c76cd imlib2-1.2.1.004.tar.gz Size: 902236 bytes -- Virtually Yours: distfiles. From trojan at pld-linux.org Thu Aug 25 13:31:29 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 11:31:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: binutils.spec (1.219 -> 1.220) ---- Diffs: ================================================================ Index: SPECS/binutils.spec diff -u SPECS/binutils.spec:1.219 SPECS/binutils.spec:1.220 --- SPECS/binutils.spec:1.219 Thu Jul 21 20:56:00 2005 +++ SPECS/binutils.spec Thu Aug 25 13:31:23 2005 @@ -14,13 +14,13 @@ Summary(tr): GNU geli?tirme ara?lar? Summary(uk): ????? ???????????? GNU ??? ???????? ??????????? ??????? Name: binutils -Version: 2.16.91.0.2 -Release: 2 +Version: 2.16.91.0.3 +Release: 1 Epoch: 2 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6 Patch0: %{name}-gasp.patch @@ -248,6 +248,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.220 2005/08/25 11:31:23 trojan +- updated to 2.16.91.0.3 + Revision 1.219 2005/07/21 18:56:00 arekm - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/binutils.spec?r1=1.219&r2=1.220&f=u From trojan at pld-linux.org Thu Aug 25 13:32:13 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: binutils-2.16.91.0.3.tar.bz2 binutils-non-english-man-pages.tar.bz2 Message-ID: <31455.1124969533@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.3.tar.bz2 c737a5787927f60758b4960f10e44f93 binutils-2.16.91.0.3.tar.bz2 Size: 12214719 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/binutils-non-english-man-pages.tar.bz2 a717d9707ec77d82acb6ec9078c472d6 binutils-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From charles at pld-linux.org Thu Aug 25 13:36:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: enlightenmentDR17.spec - external vera fonts (req. fonts-TT... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:36:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) ---- Files affected: SPECS: enlightenmentDR17.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.6 SPECS/enlightenmentDR17.spec:1.7 --- SPECS/enlightenmentDR17.spec:1.6 Wed Aug 24 20:45:44 2005 +++ SPECS/enlightenmentDR17.spec Thu Aug 25 13:36:42 2005 @@ -83,6 +83,14 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop +cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts +VERA=$(ls Vera*.ttf) +for FONT in $VERA; do + rm -f $FONT + ln -s %{_fontsdir}/TTF/$FONT . +done +cd - + %find_lang %{name} %clean @@ -120,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:36:42 charles +- external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) + Revision 1.6 2005/08/24 18:45:44 charles - updated to 0.16.999.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.6&r2=1.7&f=u From paladine at pld-linux.org Thu Aug 25 13:43:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: netspeed_applet-0.13.tar.gz Message-ID: <5915.1124970193@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/netspeed_applet-0.13.tar.gz b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Size: 647081 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 13:43:11 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: gnome-applet-netspeed.spec - updated to 0.13 - missing dir ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:43:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.13 - missing dir - missing BRs - use more macros ---- Files affected: SPECS: gnome-applet-netspeed.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applet-netspeed.spec diff -u SPECS/gnome-applet-netspeed.spec:1.6 SPECS/gnome-applet-netspeed.spec:1.7 --- SPECS/gnome-applet-netspeed.spec:1.6 Mon Apr 25 11:09:08 2005 +++ SPECS/gnome-applet-netspeed.spec Thu Aug 25 13:43:06 2005 @@ -3,19 +3,22 @@ Summary: Show how much traffic occurs on a network device Summary(pl): Pokazywanie wielko?ci ruchu wyst?puj?cego na urz?dzeniu sieciowym Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 2 +Version: 0.13 +Release: 1 License: GPL Group: X11/Applications Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/%{_realname}-%{version}.tar.gz -# Source0-md5: 7a651eab80c1a10654595fcfd4832463 +# Source0-md5: b5c5332993ed779c3653433c6f3b6a9a URL: http://mfcn.ilo.de/netspeed_applet/ BuildRequires: automake BuildRequires: gnome-desktop-devel >= 2.4.0 BuildRequires: gnome-panel-devel >= 2.4.0 BuildRequires: intltool >= 0.21 BuildRequires: libglade2-devel >= 2.0.1 -BuildRequires: libgnomeui-devel >= 2.4.0 +BuildRequires: libgnomeui-devel >= 2.8.0 +BuildRequires: libgtop-devel >= 2.10.0 +BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,postun): scrollkeeper BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,9 +59,10 @@ %files -f netspeed-applet.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO -%attr(755,root,root) %{_libdir}/netspeed_applet2 +%attr(755,root,root) %{_libdir}/%{_realname}2 %{_libdir}/bonobo/servers/*.server -%{_datadir}/omf/netspeed_applet/*.omf +%{_omf_dest_dir}/%{_realname} +%{_pixmapsdir}/%{_realname} %{_pixmapsdir}/*.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -67,6 +71,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:43:06 paladine +- updated to 0.13 +- missing dir +- missing BRs +- use more macros + Revision 1.6 2005/04/25 09:09:08 paladine - run %%scrollkeeper_update_post{,un} - removed redundant BR: libgtop-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applet-netspeed.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:50:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: ecore.spec, edje.spec, eet.spec, embryo.spec, emotion.spec, ... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: ecore.spec (1.6 -> 1.7) , edje.spec (1.8 -> 1.9) , eet.spec (1.7 -> 1.8) , embryo.spec (1.6 -> 1.7) , emotion.spec (1.6 -> 1.7) , epeg.spec (1.5 -> 1.6) , epsilon.spec (1.5 -> 1.6) , etox.spec (1.5 -> 1.6) , evas.spec (1.8 -> 1.9) , ewl.spec (1.6 -> 1.7) , imlib2.spec (1.52 -> 1.53) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.6 SPECS/ecore.spec:1.7 --- SPECS/ecore.spec:1.6 Wed Aug 24 20:27:57 2005 +++ SPECS/ecore.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ecore/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel @@ -132,6 +132,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:27:57 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.8 SPECS/edje.spec:1.9 --- SPECS/edje.spec:1.8 Wed Aug 24 20:30:10 2005 +++ SPECS/edje.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 1e5829e8c784770da2ccbd57ef55714c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Edje/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -128,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:30:10 charles - updated to 0.5.0.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.7 SPECS/eet.spec:1.8 --- SPECS/eet.spec:1.7 Wed Aug 24 20:32:54 2005 +++ SPECS/eet.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 875802e243e37e2eb954d3580cb19678 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Eet/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 11:50:22 charles +- proper URL + Revision 1.7 2005/08/24 18:32:54 charles - updated md5 ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.6 SPECS/embryo.spec:1.7 --- SPECS/embryo.spec:1.6 Wed Aug 24 20:33:50 2005 +++ SPECS/embryo.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: e1140446f243445ad8b987becb975d3d -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Embryo/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -96,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:33:50 charles - updated to 0.9.1.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.6 SPECS/emotion.spec:1.7 --- SPECS/emotion.spec:1.6 Wed Aug 24 20:34:53 2005 +++ SPECS/emotion.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Emotion/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:34:53 charles - updated to 0.0.1.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.5 SPECS/epeg.spec:1.6 --- SPECS/epeg.spec:1.5 Wed Aug 24 20:35:56 2005 +++ SPECS/epeg.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ad8505bed8deb7049dfa6322ce908f99 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epeg/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:35:56 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.5 SPECS/epsilon.spec:1.6 --- SPECS/epsilon.spec:1.5 Wed Aug 24 20:37:42 2005 +++ SPECS/epsilon.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 10118c712b42d00b332c6fe1d9257661 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epsilon/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:37:42 charles - updated to 0.3.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.5 SPECS/etox.spec:1.6 --- SPECS/etox.spec:1.5 Wed Aug 24 20:41:32 2005 +++ SPECS/etox.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ffb6de465dfc9a9b2802b414dd432932 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Etox/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:41:32 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.8 SPECS/evas.spec:1.9 --- SPECS/evas.spec:1.8 Wed Aug 24 20:42:34 2005 +++ SPECS/evas.spec Thu Aug 25 13:50:22 2005 @@ -23,7 +23,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 6d888cc6427d783ae517185c1e446e38 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Evas/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel BuildRequires: autoconf @@ -164,6 +164,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:42:34 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.6 SPECS/ewl.spec:1.7 --- SPECS/ewl.spec:1.6 Wed Aug 24 20:44:33 2005 +++ SPECS/ewl.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ewl/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:44:33 charles - updated to 0.0.4.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.52 SPECS/imlib2.spec:1.53 --- SPECS/imlib2.spec:1.52 Thu Jun 16 23:55:02 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: e32970d03d8aee2885782312d0a7f15f -URL: http://enlightenment.org/Libraries/Imlib2.html +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -136,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.53 2005/08/25 11:50:22 charles +- proper URL + Revision 1.52 2005/06/16 21:55:02 charles - updated to 1.2.1 - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.52&r2=1.53&f=u From charles at pld-linux.org Thu Aug 25 13:52:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (DEVEL): edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:52:02 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21.2.3 -> 1.21.2.4) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.3 SPECS/edb.spec:1.21.2.4 --- SPECS/edb.spec:1.21.2.3 Wed Aug 24 20:19:40 2005 +++ SPECS/edb.spec Thu Aug 25 13:51:57 2005 @@ -9,7 +9,7 @@ Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.4 2005/08/25 11:51:57 charles +- proper URL + Revision 1.21.2.3 2005/08/24 18:19:40 charles - updated to 1.0.5.004 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.3&r2=1.21.2.4&f=u From charles at pld-linux.org Thu Aug 25 13:56:55 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:56:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21 SPECS/edb.spec:1.22 --- SPECS/edb.spec:1.21 Thu Oct 28 11:58:30 2004 +++ SPECS/edb.spec Thu Aug 25 13:56:50 2005 @@ -9,7 +9,7 @@ Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: c8ee165f92dbc6e6fd9c9114e90e338c Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/25 11:56:50 charles +- proper URL + Revision 1.21 2004/10/28 09:58:30 paladine - "GTK+" unification (hope thats all) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21&r2=1.22&f=u From paszczus at pld-linux.org Thu Aug 25 15:00:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: horde.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:00:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: horde.spec (1.96 -> 1.97) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.96 SPECS/horde.spec:1.97 --- SPECS/horde.spec:1.96 Tue Aug 23 22:23:55 2005 +++ SPECS/horde.spec Thu Aug 25 14:59:58 2005 @@ -15,7 +15,7 @@ Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde Version: 3.0.5 -Release: 0.1 +Release: 1 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -311,6 +311,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.97 2005/08/25 12:59:58 paszczus +- release 1 + Revision 1.96 2005/08/23 20:23:55 glen - merged from DEVEL, updated to 3.0.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.96&r2=1.97&f=u From paszczus at pld-linux.org Thu Aug 25 15:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: gollem.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:04:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: gollem.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.10 SPECS/gollem.spec:1.11 --- SPECS/gollem.spec:1.10 Tue Aug 23 22:32:23 2005 +++ SPECS/gollem.spec Thu Aug 25 15:04:41 2005 @@ -5,7 +5,7 @@ Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.1 +Release: 1 License: GPL Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz @@ -129,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 13:04:41 paszczus +- release 1 + Revision 1.10 2005/08/23 20:32:23 paszczus - updated to FINAL 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.10&r2=1.11&f=u From adamg at pld-linux.org Thu Aug 25 15:13:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:09 2005 Subject: SOURCES: apache2-byterange.patch (NEW) - forgotten In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:13:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - forgotten ---- Files affected: SOURCES: apache2-byterange.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/apache2-byterange.patch diff -u /dev/null SOURCES/apache2-byterange.patch:1.1 --- /dev/null Thu Aug 25 15:13:51 2005 +++ SOURCES/apache2-byterange.patch Thu Aug 25 15:13:46 2005 @@ -0,0 +1,81 @@ +--- modules/http/http_protocol.c (revision 226972) ++++ modules/http/http_protocol.c (working copy) +@@ -2856,18 +2856,35 @@ + #define MIN_LENGTH(len1, len2) ((len1 > len2) ? len2 : len1) + request_rec *r = f->r; + conn_rec *c = r->connection; +- byterange_ctx *ctx = f->ctx; ++ byterange_ctx *ctx; + apr_bucket *e; + apr_bucket_brigade *bsend; + apr_off_t range_start; + apr_off_t range_end; + char *current; +- apr_off_t bb_length; + apr_off_t clength = 0; + apr_status_t rv; + int found = 0; + +- if (!ctx) { ++ /* Iterate through the brigade until reaching EOS or a bucket with ++ * unknown length. */ ++ for (e = APR_BRIGADE_FIRST(bb); ++ (e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e) ++ && e->length != (apr_size_t)-1); ++ e = APR_BUCKET_NEXT(e)) { ++ clength += e->length; ++ } ++ ++ /* Don't attempt to do byte range work if this brigade doesn't ++ * contain an EOS, or if any of the buckets has an unknown length; ++ * this avoids the cases where it is expensive to perform ++ * byteranging (i.e. may require arbitrary amounts of memory). */ ++ if (!APR_BUCKET_IS_EOS(e) || clength <= 0) { ++ ap_remove_output_filter(f); ++ return ap_pass_brigade(f->next, bb); ++ } ++ ++ { + int num_ranges = ap_set_byterange(r); + + /* We have nothing to do, get out of the way. */ +@@ -2876,7 +2893,7 @@ + return ap_pass_brigade(f->next, bb); + } + +- ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx)); ++ ctx = apr_pcalloc(r->pool, sizeof(*ctx)); + ctx->num_ranges = num_ranges; + /* create a brigade in case we never call ap_save_brigade() */ + ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc); +@@ -2903,29 +2920,6 @@ + } + } + +- /* We can't actually deal with byte-ranges until we have the whole brigade +- * because the byte-ranges can be in any order, and according to the RFC, +- * we SHOULD return the data in the same order it was requested. +- * +- * XXX: We really need to dump all bytes prior to the start of the earliest +- * range, and only slurp up to the end of the latest range. By this we +- * mean that we should peek-ahead at the lowest first byte of any range, +- * and the highest last byte of any range. +- */ +- if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { +- ap_save_brigade(f, &ctx->bb, &bb, r->pool); +- return APR_SUCCESS; +- } +- +- /* Prepend any earlier saved brigades. */ +- APR_BRIGADE_PREPEND(bb, ctx->bb); +- +- /* It is possible that we won't have a content length yet, so we have to +- * compute the length before we can actually do the byterange work. +- */ +- apr_brigade_length(bb, 1, &bb_length); +- clength = (apr_off_t)bb_length; +- + /* this brigade holds what we will be sending */ + bsend = apr_brigade_create(r->pool, c->bucket_alloc); + + ================================================================ From baggins at pld-linux.org Thu Aug 25 15:32:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SOURCES: linux-2.6-atm-vbr.patch (NEW) - ported to 2.6 from ftp://... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:32:17 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported to 2.6 from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs ---- Files affected: SOURCES: linux-2.6-atm-vbr.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atm-vbr.patch diff -u /dev/null SOURCES/linux-2.6-atm-vbr.patch:1.1 --- /dev/null Thu Aug 25 15:32:17 2005 +++ SOURCES/linux-2.6-atm-vbr.patch Thu Aug 25 15:32:12 2005 @@ -0,0 +1,162 @@ +Index: linux/include/linux/atm.h +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/include/linux/atm.h,v +retrieving revision 1.2 +diff -u -r1.2 atm.h +--- linux/include/linux/atm.h 12 Feb 2003 20:56:33 -0000 1.2 ++++ linux/include/linux/atm.h 9 Apr 2003 12:08:38 -0000 +@@ -72,7 +72,7 @@ + /* connection identifier range; socket must be + bound or connected */ + #define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos) +- /* Quality of Service setting */ ++ /* Quality of Service setting (with vbr support) */ + #define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap) + /* Service Access Point */ + #define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc) +@@ -127,9 +127,11 @@ + #define ATM_NONE 0 /* no traffic */ + #define ATM_UBR 1 + #define ATM_CBR 2 +-#define ATM_VBR 3 ++#define ATM_VBR_NRT 3 ++#define ATM_VBR ATM_VBR_NRT /* for backward compatibility */ + #define ATM_ABR 4 + #define ATM_ANYCLASS 5 /* compatible with everything */ ++#define ATM_VBR_RT 6 + + #define ATM_MAX_PCR -1 /* maximum available PCR */ + +@@ -140,6 +142,11 @@ + int min_pcr; /* minimum PCR in cells per second */ + int max_cdv; /* maximum CDV in microseconds */ + int max_sdu; /* maximum SDU in bytes */ ++ ++ /* extra params for VBR */ ++ int scr; /* sustained rate in cells per second */ ++ int mbs; /* maximum burst size (MBS) in cells */ ++ + /* extra params for ABR */ + unsigned int icr; /* Initial Cell Rate (24-bit) */ + unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ +@@ -243,4 +251,37 @@ + }; + + typedef unsigned short atm_backend_t; ++struct atm_trafprm_compat { ++ unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */ ++ int max_pcr; /* maximum PCR in cells per second */ ++ int pcr; /* desired PCR in cells per second */ ++ int min_pcr; /* minimum PCR in cells per second */ ++ int max_cdv; /* maximum CDV in microseconds */ ++ int max_sdu; /* maximum SDU in bytes */ ++ /* extra params for ABR */ ++ unsigned int icr; /* Initial Cell Rate (24-bit) */ ++ unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ ++ unsigned int frtt : 24; /* Fixed Round Trip Time (24-bit) */ ++ unsigned int rif : 4; /* Rate Increment Factor (4-bit) */ ++ unsigned int rdf : 4; /* Rate Decrease Factor (4-bit) */ ++ unsigned int nrm_pres :1; /* nrm present bit */ ++ unsigned int trm_pres :1; /* rm present bit */ ++ unsigned int adtf_pres :1; /* adtf present bit */ ++ unsigned int cdf_pres :1; /* cdf present bit*/ ++ unsigned int nrm :3; /* Max # of Cells for each forward RM cell (3-bit) */ ++ unsigned int trm :3; /* Time between forward RM cells (3-bit) */ ++ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */ ++ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */ ++ unsigned int spare :9; /* spare bits */ ++}; ++ ++struct atm_qos_compat { ++ struct atm_trafprm_compat txtp; /* parameters in TX direction */ ++ struct atm_trafprm_compat rxtp __ATM_API_ALIGN; ++ /* parameters in RX direction */ ++ unsigned char aal __ATM_API_ALIGN; ++}; ++ ++#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat) ++ /* Quality of Service setting (no vbr support) */ + #endif +Index: linux/net/atm/common.c +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/net/atm/common.c,v +retrieving revision 1.13 +diff -u -r1.13 common.c +--- linux/net/atm/common.c 17 Mar 2003 16:13:12 -0000 1.13 ++++ linux/net/atm/common.c 9 Apr 2003 12:10:28 -0000 +@@ -1085,6 +1085,43 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ struct atm_qos qos; ++ ++ if (copy_from_user(&qos_compat,optval,sizeof(qos_compat))) ++ return -EFAULT; ++ ++ /* convert old atm_qos to new atm_qos */ ++ qos.aal = qos_compat.aal; ++ qos.rxtp.traffic_class = qos_compat.rxtp.traffic_class; ++ qos.rxtp.max_pcr = qos_compat.rxtp.max_pcr; ++ qos.rxtp.pcr = qos_compat.rxtp.pcr; ++ qos.rxtp.min_pcr = qos_compat.rxtp.min_pcr; ++ qos.rxtp.max_cdv = qos_compat.rxtp.max_cdv; ++ qos.rxtp.max_sdu = qos_compat.rxtp.max_sdu; ++ qos.rxtp.scr = 0; ++ qos.rxtp.mbs = 0; ++ qos.txtp.traffic_class = qos_compat.txtp.traffic_class; ++ qos.txtp.max_pcr = qos_compat.txtp.max_pcr; ++ qos.txtp.pcr = qos_compat.txtp.pcr; ++ qos.txtp.min_pcr = qos_compat.txtp.min_pcr; ++ qos.txtp.max_cdv = qos_compat.txtp.max_cdv; ++ qos.txtp.max_sdu = qos_compat.txtp.max_sdu; ++ qos.txtp.scr = 0; ++ qos.txtp.mbs = 0; ++ ++ error = check_qos(&qos); ++ if (error) return error; ++ if (sock->state == SS_CONNECTED) ++ return atm_change_qos(vcc,&qos); ++ if (sock->state != SS_UNCONNECTED) ++ return -EBADFD; ++ vcc->qos = qos; ++ set_bit(ATM_VF_HASQOS,&vcc->flags); ++ return 0; ++ } + case SO_ATMQOS: + { + struct atm_qos qos; +@@ -1132,6 +1169,31 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ ++ if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) ++ return -EINVAL; ++ ++ /* convert new atm_qos to old atm_qos */ ++ qos_compat.aal = vcc->qos.aal; ++ qos_compat.rxtp.traffic_class = vcc->qos.rxtp.traffic_class; ++ qos_compat.rxtp.max_pcr = vcc->qos.rxtp.max_pcr; ++ qos_compat.rxtp.pcr = vcc->qos.rxtp.pcr; ++ qos_compat.rxtp.min_pcr = vcc->qos.rxtp.min_pcr; ++ qos_compat.rxtp.max_cdv = vcc->qos.rxtp.max_cdv; ++ qos_compat.rxtp.max_sdu = vcc->qos.rxtp.max_sdu; ++ qos_compat.txtp.traffic_class = vcc->qos.txtp.traffic_class; ++ qos_compat.txtp.max_pcr = vcc->qos.txtp.max_pcr; ++ qos_compat.txtp.pcr = vcc->qos.txtp.pcr; ++ qos_compat.txtp.min_pcr = vcc->qos.txtp.min_pcr; ++ qos_compat.txtp.max_cdv = vcc->qos.txtp.max_cdv; ++ qos_compat.txtp.max_sdu = vcc->qos.txtp.max_sdu; ++ ++ return copy_to_user(optval,&qos_compat,sizeof(qos_compat)) ? ++ -EFAULT : 0; ++ } + case SO_ATMQOS: + if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) + return -EINVAL; ================================================================ From havner at pld-linux.org Thu Aug 25 15:33:32 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:14:09 2005 Subject: fortunes-pl: pld - madrosci gaususa (ale to mu sie calkiem udalo m... In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:33:32 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - madrosci gaususa (ale to mu sie calkiem udalo musze przyznac) ---- Files affected: fortunes-pl: pld (1.425 -> 1.426) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.425 fortunes-pl/pld:1.426 --- fortunes-pl/pld:1.425 Wed Jul 13 22:44:38 2005 +++ fortunes-pl/pld Thu Aug 25 15:33:27 2005 @@ -3559,3 +3559,6 @@ Mariusz Mazur @ pld-devel-pl % +[15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] +[15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.425&r2=1.426&f=u From baggins at pld-linux.org Thu Aug 25 15:34:11 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM VBR is baaaaack! In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:34:11 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM VBR is baaaaack! ---- Files affected: SPECS: kernel.spec (1.441.2.1161 -> 1.441.2.1162) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1161 SPECS/kernel.spec:1.441.2.1162 --- SPECS/kernel.spec:1.441.2.1161 Tue Aug 23 15:06:36 2005 +++ SPECS/kernel.spec Thu Aug 25 15:34:05 2005 @@ -253,6 +253,8 @@ Patch112: linux-2.6-via82c586-irq-routing.patch Patch113: linux-2.6-3Com_IBM-fix.patch Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch +# Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs +Patch115: linux-2.6-atm-vbr.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -688,6 +690,7 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 +%patch115 -p1 %ifarch %{ix86} %if %{with abi} @@ -1481,6 +1484,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1162 2005/08/25 13:34:05 baggins +- ATM VBR is baaaaack! + Revision 1.441.2.1161 2005/08/23 13:06:36 baggins - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1161&r2=1.441.2.1162&f=u From adamg at pld-linux.org Thu Aug 25 15:37:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: File_Find-1.0.0.tgz Message-ID: <26311.1124977077@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/File_Find-1.0.0.tgz fa77a8b791c5a56c08336e8e2debad34 File_Find-1.0.0.tgz Size: 4871 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 15:37:58 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: php-pear-File_Find.spec - updated to 1.0.0 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.0 ---- Files affected: SPECS: php-pear-File_Find.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-File_Find.spec diff -u SPECS/php-pear-File_Find.spec:1.18 SPECS/php-pear-File_Find.spec:1.19 --- SPECS/php-pear-File_Find.spec:1.18 Fri Jan 14 08:30:22 2005 +++ SPECS/php-pear-File_Find.spec Thu Aug 25 15:37:53 2005 @@ -2,18 +2,18 @@ %include /usr/lib/rpm/macros.php %define _class File %define _subclass Find -%define _status beta +%define _status stable %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - a class that facillitates the search of filesystems Summary(pl): %{_pearname} - klasa z narz?dziami do przeszukiwania systemu plik?w Name: php-pear-%{_pearname} -Version: 0.3.1 +Version: 1.0.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: a81c83a7ce53f4fb9bec8a0019fde0e8 +# Source0-md5: fa77a8b791c5a56c08336e8e2debad34 URL: http://pear.php.net/package/File_Find/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 13:37:53 adamg +- updated to 1.0.0 + Revision 1.18 2005/01/14 07:30:22 adamg - updated to 0.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-File_Find.spec?r1=1.18&r2=1.19&f=u From baggins at pld-linux.org Thu Aug 25 15:39:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (LINUX_2_6): kernel.spec - TODO updated In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:39:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - TODO updated ---- Files affected: SPECS: kernel.spec (1.441.2.1162 -> 1.441.2.1163) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1162 SPECS/kernel.spec:1.441.2.1163 --- SPECS/kernel.spec:1.441.2.1162 Thu Aug 25 15:34:05 2005 +++ SPECS/kernel.spec Thu Aug 25 15:39:05 2005 @@ -3,6 +3,9 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs +# - check and maybe port ATM patches from 2.4 +# linux-2.4.22-fore200e-0.2f.patch +# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1484,6 +1487,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1163 2005/08/25 13:39:05 baggins +- TODO updated + Revision 1.441.2.1162 2005/08/25 13:34:05 baggins - ATM VBR is baaaaack! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1162&r2=1.441.2.1163&f=u From arekm at pld-linux.org Thu Aug 25 15:51:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: SOURCES (DEVEL): php-gd_imagerotate_enable.patch, php-nohttpd.patc... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 13:51:06 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 5.1rc1 (we loose one parameter to imagereotate unfortunately) ---- Files affected: SOURCES: php-gd_imagerotate_enable.patch (1.2 -> 1.2.2.1) , php-nohttpd.patch (1.1 -> 1.1.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-gd_imagerotate_enable.patch diff -u SOURCES/php-gd_imagerotate_enable.patch:1.2 SOURCES/php-gd_imagerotate_enable.patch:1.2.2.1 --- SOURCES/php-gd_imagerotate_enable.patch:1.2 Mon Oct 18 14:25:34 2004 +++ SOURCES/php-gd_imagerotate_enable.patch Thu Aug 25 15:51:00 2005 @@ -1,5 +1,6 @@ ---- ./ext/gd/gd.c.org 2004-08-17 01:08:56.000000000 +0200 -+++ ./ext/gd/gd.c 2004-10-18 14:24:15.797275104 +0200 +diff -urbB php-5.1.0RC1.org/ext/gd/gd.c php-5.1.0RC1/ext/gd/gd.c +--- php-5.1.0RC1.org/ext/gd/gd.c 2005-08-25 15:26:22.317049000 +0200 ++++ php-5.1.0RC1/ext/gd/gd.c 2005-08-25 15:27:37.644598376 +0200 @@ -209,8 +209,8 @@ PHP_FE(imagecopyresampled, NULL) #endif @@ -10,7 +11,7 @@ PHP_FE(imageantialias, NULL) #endif -@@ -416,11 +416,11 @@ +@@ -429,11 +429,11 @@ #ifdef GD2_FMT_COMPRESSED REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); #endif @@ -23,7 +24,7 @@ REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); /* Section Filters */ REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); -@@ -1191,7 +1191,6 @@ +@@ -1204,7 +1204,6 @@ /* }}} */ #endif @@ -31,7 +32,16 @@ /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor) Rotate an image using a custom angle */ PHP_FUNCTION(imagerotate) -@@ -1221,7 +1220,6 @@ +@@ -1221,7 +1220,7 @@ + + ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd); + +- im_dst = gdImageRotate(im_src, degrees, color, ignoretransparent); ++ im_dst = gdImageRotate(im_src, degrees, color); + + if (im_dst != NULL) { + ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd); +@@ -1230,7 +1229,6 @@ } } /* }}} */ @@ -39,8 +49,10 @@ #if HAVE_GD_IMAGESETTILE /* {{{ proto bool imagesettile(resource image, resource tile) ---- ./ext/gd/php_gd.h.org 2004-01-08 18:32:08.000000000 +0100 -+++ ./ext/gd/php_gd.h 2004-10-18 14:24:34.372451248 +0200 +Tylko w php-5.1.0RC1/ext/gd: gd.c.orig +diff -urbB php-5.1.0RC1.org/ext/gd/php_gd.h php-5.1.0RC1/ext/gd/php_gd.h +--- php-5.1.0RC1.org/ext/gd/php_gd.h 2005-08-25 15:26:22.366042000 +0200 ++++ php-5.1.0RC1/ext/gd/php_gd.h 2005-08-25 15:27:37.645598224 +0200 @@ -103,8 +103,8 @@ PHP_FUNCTION(imagecopyresampled); #endif ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1 SOURCES/php-nohttpd.patch:1.1.4.1 --- SOURCES/php-nohttpd.patch:1.1 Fri Jul 30 07:54:01 2004 +++ SOURCES/php-nohttpd.patch Thu Aug 25 15:51:01 2005 @@ -1,14 +1,15 @@ ---- php-4.3.8/sapi/apache2handler/config.m4.orig 2003-07-16 07:46:46.000000000 +0200 -+++ php-4.3.8/sapi/apache2handler/config.m4 2004-07-30 00:45:48.301382112 +0200 -@@ -52,9 +52,9 @@ +diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4 +--- php-5.1.0RC1.org/sapi/apache2handler/config.m4 2005-08-05 10:14:54.000000000 +0200 ++++ php-5.1.0RC1/sapi/apache2handler/config.m4 2005-08-25 15:09:38.486655320 +0200 +@@ -58,9 +58,9 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required.]) ++ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then + AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-gd_imagerotate_enable.patch?r1=1.2&r2=1.2.2.1&f=u http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1&r2=1.1.4.1&f=u From havner at pld-linux.org Thu Aug 25 15:51:55 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:14:09 2005 Subject: fortunes-pl: pld - no i madrosci ciag dalszy :-) In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:51:55 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - no i madrosci ciag dalszy :-) ---- Files affected: fortunes-pl: pld (1.426 -> 1.427) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.426 fortunes-pl/pld:1.427 --- fortunes-pl/pld:1.426 Thu Aug 25 15:33:27 2005 +++ fortunes-pl/pld Thu Aug 25 15:51:50 2005 @@ -3562,3 +3562,9 @@ [15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] [15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] % +[15:36:37] < gausus> havner: a autoryzacje dostales :) [IN] +[15:36:48] < gausus> potem bedzie potop i potomni dostana tylko moje przemyslenia i co [IN] +[15:36:53] < gausus> beda nas mieli za cywilizacje kretynow ? [IN] +[15:37:01] < gausus> chociaz w sumie [IN] +[15:37:11] < gausus> moze to i lepiej niz jakby mialo po nas cos wiecej pozostac ;) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.426&r2=1.427&f=u From arekm at pld-linux.org Thu Aug 25 16:09:50 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (DEVEL): php.spec - started 5.1 (cpdf, dbx, dio, fam, mnogos... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 14:09:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ---- Files affected: SPECS: php.spec (1.467 -> 1.467.2.1) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467 SPECS/php.spec:1.467.2.1 --- SPECS/php.spec:1.467 Tue Aug 23 12:31:11 2005 +++ SPECS/php.spec Thu Aug 25 16:09:44 2005 @@ -5,7 +5,6 @@ # - mcve, # - ovrimos, # - pfpro, -# - ircg, # These extensions BuildRequires proprietary libraries... # - deal with modules removed from php and not moved to PECL # (existing only in php4): @@ -24,16 +23,13 @@ %bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) %bcond_with oracle # with oracle extension module (BR: proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) -%bcond_without cpdf # without cpdf extension module %bcond_without curl # without CURL extension module -%bcond_without fam # without FAM (File Alteration Monitor) extension module %bcond_without imap # without IMAP extension module %bcond_with interbase # with InterBase extension module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension module %bcond_without ming # without ming extension module %bcond_without mm # without mm support for session storage -%bcond_without mnogosearch # without mnogosearch extension module %bcond_without msession # without msession extension module %bcond_without mssql # without MS SQL extension module %bcond_without odbc # without ODBC extension module @@ -77,13 +73,14 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.0.4 -Release: 10%{?with_hardening:hardened} +Version: 5.1.0 +%define _rc RC1 +Release: 0.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 -# Source0-md5: fb1aac107870f897d26563a9cc5053c0 +Source0: http://www.php.net/distributions/%{name}-%{version}%{_rc}.tar.bz2 +# Source0-md5: c7aebeb915e6f898559365cf82493ad0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -114,7 +111,6 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch -Patch20: %{name}-mnogosearch-fix.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -122,7 +118,6 @@ Patch25: %{name}-hwapi-link.patch Patch26: %{name}-dba-link.patch Patch27: %{name}-install_gd_headers.patch -Patch28: %{name}-cpdf-fix.patch Patch29: %{name}-gcc4.patch Patch30: %{name}-hardening-fix.patch Patch31: %{name}-both-apxs.patch @@ -142,7 +137,6 @@ %if %{with xmlrpc} BuildRequires: expat-devel %endif -%{?with_fam:BuildRequires: fam-devel} %{?with_fdf:BuildRequires: fdftk-devel} BuildRequires: fcgi-devel BuildRequires: flex @@ -154,7 +148,6 @@ BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2} -%{?with_cpdf:BuildRequires: libcpdf-devel >= 2.02r1-2} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 @@ -166,7 +159,6 @@ %{?with_mhash:BuildRequires: mhash-devel} %{?with_ming:BuildRequires: ming-devel >= 0.1.0} %{?with_mm:BuildRequires: mm-devel >= 1.3.0} -%{?with_mnogosearch:BuildRequires: mnogosearch-devel >= 3.2.6} BuildRequires: mysql-devel >= 4.0.0 %{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0} BuildRequires: ncurses-ext-devel @@ -195,7 +187,7 @@ BuildRequires: apache1-devel %endif %if %{with apache2} -BuildRequires: apache-devel >= 2.0.52-2 +BuildRequires: apache-devel >= 2.0.44-1 BuildRequires: apr-devel >= 1:1.0.0 BuildRequires: apr-util-devel >= 1:1.0.0 %endif @@ -465,20 +457,6 @@ %description calendar -l pl Modu? PHP dodaj?cy wsparcie dla kalendarza. -%package cpdf -Summary: cpdf extension module for PHP -Summary(pl): Modu? cpdf dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description cpdf -This is a dynamic shared object (DSO) for PHP that will add PDF -support through libcpdf library. - -%description cpdf -l pl -Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. - %package ctype Summary: ctype extension module for PHP Summary(pl): Modu? ctype dla PHP @@ -536,36 +514,6 @@ %description dbase -l pl Modu? PHP ze wsparciem dla DBase. -%package dbx -Summary: DBX extension module for PHP -Summary(pl): Modu? DBX dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dbx -This is a dynamic shared object (DSO) for PHP that will add DB -abstraction layer. DBX supports odbc, mysql, pgsql, mssql, fbsql and -more. - -%description dbx -l pl -Modu? PHP dodaj?cy warstw? abstrakcji do obs?ugi baz danych. DBX -obs?uguje bazy odbc, mysql, pgsql, mssql, fbsql i inne. - -%package dio -Summary: Direct I/O extension module for PHP -Summary(pl): Modu? Direct I/O dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dio -This is a dynamic shared object (DSO) for PHP that will add direct -file I/O support. - -%description dio -l pl -Modu? PHP dodaj?cy obs?ug? bezpo?rednich operacji I/O na plikach. - %package dom Summary: DOM extension module for PHP Summary(pl): Modu? DOM dla PHP @@ -597,23 +545,6 @@ %description exif -l pl Modu? PHP dodaj?cy obs?ug? znacznik?w EXIF w plikach obrazk?w. -%package fam -Summary: FAM (File Alteration Monitor) module for PHP -Summary(pl): Modu? FAM (File Alteration Monitor) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description fam -This PHP module adds support for FAM (File Alteration Monitor). -FAM monitors files and directories, notifying interested applications -of changes. - -%description fam -l pl -Modu? PHP dodaj?cy obs?ug? dla FAM (File Alteration Monitor). -FAM monitoruje pliki oraz katalogi, informuj?c zainteresowane aplikacje -o zmianach. - %package fdf Summary: FDF extension module for PHP Summary(pl): Modu? FDF dla PHP @@ -856,21 +787,6 @@ Modu? PHP dodaj?cy obs?ug? plik?w Flash (.swf) poprzez bibliotek? ming. -%package mnogosearch -Summary: mnoGoSearch extension module for PHP -Summary(pl): Modu? mnoGoSearch dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description mnogosearch -This is a dynamic shared object (DSO) for PHP that will allow you to -access mnoGoSearch free search engine. - -%description mnogosearch -l pl -Modu? PHP dodaj?cy pozwalaj?cy na dost?p do wolnodost?pnego silnika -wyszukiwarki mnoGoSearch. - %package msession Summary: msession extension module for PHP Summary(pl): Modu? msession dla PHP @@ -1401,20 +1317,6 @@ %description xsl -l pl Modu? PHP dodaj?cy now? obs?ug? XSLT (przy u?yciu libxslt). -%package yp -Summary: NIS (yp) extension module for PHP -Summary(pl): Modu? NIS (yp) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description yp -This is a dynamic shared object (DSO) for PHP that will add NIS -(Yellow Pages) support. - -%description yp -l pl -Modu? PHP dodaj?cy wsparcie dla NIS (Yellow Pages). - %package zlib Summary: Zlib extension module for PHP Summary(pl): Modu? zlib dla PHP @@ -1430,7 +1332,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1441,23 +1343,24 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +# FIXME; it's still needed? +# %patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 -%patch12 -p1 -%patch13 -p1 +# DROPME: not needed +# %patch12 -p1 +# DROPME: seems not needed +# %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 -%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1465,8 +1368,9 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -%patch27 -p1 -%patch29 -p1 +# FIXME: ??? +# %patch27 -p1 +# %patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -1546,8 +1450,6 @@ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ - --enable-dbx=shared \ - --enable-dio=shared \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1573,9 +1475,8 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --enable-yp=shared \ + --with-xmlreader \ --with-bz2=shared \ - %{?with_cpdf:--with-cpdflib=shared} \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ --with-dbase=shared \ @@ -1586,7 +1487,6 @@ %endif %{?with_fdf:--with-fdftk=shared} \ --with-iconv=shared \ - %{?with_fam:--with-fam=shared} \ --with-filepro=shared \ --with-freetype-dir=shared \ --with-gettext=shared \ @@ -1597,13 +1497,12 @@ %{?with_imap:--with-imap=shared --with-imap-ssl} \ %{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \ --with-jpeg-dir=/usr \ - %{?with_ldap:--with-ldap=shared} \ + %{?with_ldap:--with-ldap=shared --with-ldap-sasl} \ --with-mcrypt=shared \ %{?with_mhash:--with-mhash=shared} \ --with-mime-magic=shared,/usr/share/file/magic.mime \ %{?with_ming:--with-ming=shared} \ %{?with_mm:--with-mm} \ - %{!?with_mnogosearch:--without-mnogosearch}%{?with_mnogosearch:--with-mnogosearch=shared,/usr} \ %{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \ %{?with_mssql:--with-mssql=shared} \ --with-mysql=shared,/usr \ @@ -1612,6 +1511,7 @@ --with-ncurses=shared \ %{?with_oci8:--with-oci8=shared} \ %{?with_openssl:--with-openssl=shared} \ + --with-kerberos \ %{?with_oracle:--with-oracle=shared} \ %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared} \ --with-pear=%{php_pear_dir} \ @@ -1625,11 +1525,11 @@ %{?with_snmp:--with-snmp=shared} \ %{?with_sybase:--with-sybase=shared,/usr} \ %{?with_sybase_ct:--with-sybase-ct=shared,/usr} \ - %{?with_sqlite:--with-sqlite=shared,/usr} \ + %{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \ --with-t1lib=shared \ %{?with_tidy:--with-tidy=shared} \ --with-tiff-dir=/usr \ - %{?with_odbc:--with-unixODBC=shared} \ + %{?with_odbc:--with-unixODBC=shared,/usr} \ %{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \ --with-xsl=shared \ --with-zlib=shared \ @@ -1879,12 +1779,6 @@ %postun calendar %extension_postun -%post cpdf -%extension_post - -%postun cpdf -%extension_postun - %post ctype %extension_post @@ -1909,18 +1803,6 @@ %postun dbase %extension_postun -%post dbx -%extension_post - -%postun dbx -%extension_postun - -%post dio -%extension_post - -%postun dio -%extension_postun - %post dom %extension_post @@ -1933,12 +1815,6 @@ %postun exif %extension_postun -%post fam -%extension_post - -%postun fam -%extension_postun - %post fdf %extension_post @@ -2035,12 +1911,6 @@ %postun ming %extension_postun -%post mnogosearch -%extension_post - -%postun mnogosearch -%extension_postun - %post msession %extension_post @@ -2272,12 +2142,6 @@ %postun xsl %extension_postun -%post yp -%extension_post - -%postun yp -%extension_postun - %post zlib %extension_post @@ -2293,9 +2157,6 @@ %triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini -%triggerun cpdf -- %{name}-cpdf < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove cpdf %{_sysconfdir}/php.ini - %triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini @@ -2308,21 +2169,12 @@ %triggerun dbase -- %{name}-dbase < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini -%triggerun dbx -- %{name}-dbx < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbx %{_sysconfdir}/php.ini - -%triggerun dio -- %{name}-dio < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dio %{_sysconfdir}/php.ini - %triggerun dom -- %{name}-dom < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dom %{_sysconfdir}/php.ini %triggerun exif -- %{name}-exif < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini -%triggerun fam -- %{name}-fam < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fam %{_sysconfdir}/php.ini - %triggerun fdf -- %{name}-fdf < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fdf %{_sysconfdir}/php.ini @@ -2371,9 +2223,6 @@ %triggerun ming -- %{name}-ming < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini -%triggerun mnogosearch -- %{name}-mnogosearch < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mnogosearch %{_sysconfdir}/php.ini - %triggerun msession -- %{name}-msession < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini @@ -2461,9 +2310,6 @@ %triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xsl %{_sysconfdir}/php.ini -%triggerun yp -- %{name}-yp < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove yp %{_sysconfdir}/php.ini - %triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini @@ -2544,13 +2390,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so -%if %{with cpdf} -%files cpdf -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/cpdf.ini -%attr(755,root,root) %{extensionsdir}/cpdf.so -%endif - %files ctype %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini @@ -2573,28 +2412,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so -%files dbx -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbx.ini -%attr(755,root,root) %{extensionsdir}/dbx.so - -%files dio -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dio.ini -%attr(755,root,root) %{extensionsdir}/dio.so - %files dom %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so -%if %{with fam} -%files fam -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fam.ini -%attr(755,root,root) %{extensionsdir}/fam.so -%endif - %if %{with fdf} %files fdf %defattr(644,root,root,755) @@ -2694,13 +2516,6 @@ %attr(755,root,root) %{extensionsdir}/ming.so %endif -%if %{with mnogosearch} -%files mnogosearch -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mnogosearch.ini -%attr(755,root,root) %{extensionsdir}/mnogosearch.so -%endif - %if %{with msession} %files msession %defattr(644,root,root,755) @@ -2894,11 +2709,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xsl.ini %attr(755,root,root) %{extensionsdir}/xsl.so -%files yp -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/yp.ini -%attr(755,root,root) %{extensionsdir}/yp.so - %files zlib %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/zlib.ini @@ -2910,6 +2720,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.1 2005/08/25 14:09:44 arekm +- started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy + Revision 1.467 2005/08/23 10:31:11 glen - rel 10 for finished conf.d support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467&r2=1.467.2.1&f=u From arekm at pld-linux.org Thu Aug 25 16:10:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: php-5.1.0RC1.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz Message-ID: <15469.1124979007@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.php.net/distributions/php-5.1.0RC1.tar.bz2 c7aebeb915e6f898559365cf82493ad0 php-5.1.0RC1.tar.bz2 Size: 5989455 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- Virtually Yours: distfiles. From andree at pld-linux.org Thu Aug 25 16:58:32 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: VMware-workstation.spec - added bcond to build kernel24 mod... In-Reply-To: References: Message-ID: Author: andree Date: Thu Aug 25 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added bcond to build kernel24 modules ---- Files affected: SPECS: VMware-workstation.spec (1.66 -> 1.67) ---- Diffs: ================================================================ Index: SPECS/VMware-workstation.spec diff -u SPECS/VMware-workstation.spec:1.66 SPECS/VMware-workstation.spec:1.67 --- SPECS/VMware-workstation.spec:1.66 Sat Aug 20 02:06:15 2005 +++ SPECS/VMware-workstation.spec Thu Aug 25 16:58:27 2005 @@ -9,10 +9,14 @@ %bcond_without kernel # don't build kernel modules %bcond_without smp # without SMP kernel modules %bcond_without userspace # don't build userspace utilities +%bcond_with kernel24 # build kernel24 modules (disable kernel26) %bcond_with internal_libs # internal libs stuff %bcond_with verbose # verbose build (V=1) # %include /usr/lib/rpm/macros.perl +%if %{with kernel24} +%define _kernelsrcdir /usr/src/linux-2.4 +%endif # %define _ver 5.0.0 %define _build 13124 @@ -192,6 +196,82 @@ %description -n kernel-smp-misc-vmnet -l pl Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. +%package -n kernel24-misc-vmmon +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-misc-vmmon +Kernel modules for VMware Workstation - vmmon. + +%description -n kernel24-misc-vmmon -l pl +Modu?y j?dra dla VMware Workstation - vmmon. + +%package -n kernel24-misc-vmnet +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-misc-vmnet +Kernel modules for VMware Workstation - vmnet. + +%description -n kernel24-misc-vmnet -l pl +Modu?y j?dra dla VMware Workstation - vmnet. + +%package -n kernel24-smp-misc-vmmon +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmmon +SMP kernel modules fov VMware Workstation - vmmon-smp. + +%description -n kernel24-smp-misc-vmmon -l pl +Modu?y j?dra SMP dla VMware Workstation - vmmon-smp. + +%package -n kernel24-smp-misc-vmnet +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmnet +SMP kernel module for VMware Workstation - vmnet-smp. + +%description -n kernel24-smp-misc-vmnet -l pl +Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. + %prep %setup -q -n vmware-distrib %setup -qDT -n vmware-distrib -a1 @@ -220,6 +300,8 @@ %if %{with kernel} rm -rf built mkdir built + +%if %{without kernel24} cp -a vmmon-only vmmon-only.clean cp -a vmnet-only vmnet-only.clean for mod in vmmon vmnet ; do @@ -244,7 +326,42 @@ cd - done done -cd .. + +%else +for mod in vmmon vmnet ; do + rm -rf $mod-only + tar xf $mod.tar + cd $mod-only + sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile + sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile + +%if %{with smp} + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod-smp.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod-smp.o + fi + + %{__make} VM_KBUILD=no clean +%endif + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod.o + fi + + cd .. +done +%endif # kernel24 + %endif %install @@ -267,6 +384,8 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc cd vmware-any-any-update%{_urel} + +%if %{without kernel24} install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ @@ -277,6 +396,21 @@ install built/vmnet-smp.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko %endif + +%else +install built/vmmon.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.o +install built/vmnet.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.o +%if %{with smp} && %{with dist_kernel} +install built/vmmon-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.o +install built/vmnet-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.o +%endif + +%endif + cd - %endif @@ -358,6 +492,30 @@ %postun -n kernel-smp-misc-vmnet %depmod %{_kernel_ver}smp +%post -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%post -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%post -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%post -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + %if %{with userspace} %files %defattr(644,root,root,755) @@ -428,6 +586,7 @@ %endif %if %{with kernel} +%if %{without kernel24} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -445,6 +604,28 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko* %endif + +%else +%files -n kernel24-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmmon.o* + +%files -n kernel24-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmnet.o* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel24-smp-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmmon.o* + +%files -n kernel24-smp-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmnet.o* +%endif + +%endif + %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -453,6 +634,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.67 2005/08/25 14:58:27 andree +- added bcond to build kernel24 modules + Revision 1.66 2005/08/20 00:06:15 charles - rpmbuild(macros) >= 1.217 - added kernel, userspace, verbose bconds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.66&r2=1.67&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: horde.spec - added GeoIP database In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 15:35:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added GeoIP database ---- Files affected: SPECS: horde.spec (1.97 -> 1.98) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.97 SPECS/horde.spec:1.98 --- SPECS/horde.spec:1.97 Thu Aug 25 14:59:58 2005 +++ SPECS/horde.spec Thu Aug 25 17:35:46 2005 @@ -22,6 +22,8 @@ Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz # Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf +Source2: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz +# Source2-md5: 4f29410e385065eaa37037c1b1a44695 Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch @@ -149,6 +151,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +# MaxMind GeoIP Hostname Country lookup + +install %{SOURCE2} $RPM_BUILD_ROOT/var/lib/horde/ + > $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log install scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir} @@ -181,6 +187,9 @@ NOTE: You don't need SQL database for Auhtorization if You use LDAP for authorization. +If you want to use MaxMind GeoIP Hostname Country lookup do 'gunzip /var/lib/horde/GeoIP.dat.gz' +and enable this function in horde configuration. + EOF # ' @@ -300,6 +309,7 @@ %dir %attr(770,root,http) /var/log/%{name} %dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log +%attr(640,root,http) /var/lib/%{name}/GeoIP.dat.gz %files -n openldap-schema-horde %defattr(644,root,root,755) @@ -311,6 +321,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.98 2005/08/25 15:35:46 paszczus +- added GeoIP database + Revision 1.97 2005/08/25 12:59:58 paszczus - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.97&r2=1.98&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: horde-3.0.5.tar.gz GeoIP.dat.gz Message-ID: <7880.1124984152@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz STORED: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz 4f29410e385065eaa37037c1b1a44695 GeoIP.dat.gz Size: 418910 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Thu Aug 25 18:08:40 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: adapter.awk - spaces -> tabs, pld-linux.org In-Reply-To: References: Message-ID: Author: wolf Date: Thu Aug 25 16:08:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs, pld-linux.org ---- Files affected: SPECS: adapter.awk (1.173 -> 1.174) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.173 SPECS/adapter.awk:1.174 --- SPECS/adapter.awk:1.173 Thu Aug 25 13:03:07 2005 +++ SPECS/adapter.awk Thu Aug 25 18:08:33 2005 @@ -7,9 +7,9 @@ # Micha? Kuratczyk # Sebastian Zagrodzki # Tomasz K?oczko -# Artur Frysiak +# Artur Frysiak # Michal Kochanowicz -# Elan Ruusam?e +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.173&r2=1.174&f=u From glen at pld-linux.org Thu Aug 25 18:21:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: egroupware.spec - created virtual DB packages to let user c... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 16:21:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created virtual DB packages to let user choose just one database ---- Files affected: SPECS: egroupware.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.7 SPECS/egroupware.spec:1.8 --- SPECS/egroupware.spec:1.7 Thu Aug 25 12:11:52 2005 +++ SPECS/egroupware.spec Thu Aug 25 18:21:09 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.9 +Release: 0.12 Epoch: 0 License: GPL Group: Applications/WWW @@ -14,10 +14,8 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b Source1: %{name}.conf URL: http://www.egroupware.org/ +Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-mysql -Requires: php-pgsql -#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -40,6 +38,33 @@ adresow?, kalendarz, infolog (notatki, rzeczy do zrobienia, rozmowy telefoniczne), zarz?dzanie tre?ci?, forum, zak?adki, wiki. +%package db-mysql +Summary: eGroupware DB Driver for MySQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mysql + +%description db-mysql +This virtual package provides MySQL database backend for eGroupware. + +%package db-pgsql +Summary: eGroupware DB Driver for PostgreSQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-pgsql + +%description db-pgsql +This virtual package provides PostgreSQL database backend for eGroupware. + +%package db-mssql +Summary: eGroupware DB Driver for MS SQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mssql + +%description db-mssql +This virtual package provides MS SQL database backend for eGroupware. + %prep %setup -q -n %{name} @@ -138,12 +163,24 @@ %{_appdir}/fudforum/setup %{_appdir}/fudforum/templates +%files db-mysql +%defattr(644,root,root,755) + +%files db-pgsql +%defattr(644,root,root,755) + +%files db-mssql +%defattr(644,root,root,755) + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 16:21:09 glen +- created virtual DB packages to let user choose just one database + Revision 1.7 2005/08/25 10:11:52 glen - permission changes, check_install.php passed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Thu Aug 25 19:04:50 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atmdd patch ported from 2.4 In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:04:50 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atmdd patch ported from 2.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1163 -> 1.441.2.1164) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1163 SPECS/kernel.spec:1.441.2.1164 --- SPECS/kernel.spec:1.441.2.1163 Thu Aug 25 15:39:05 2005 +++ SPECS/kernel.spec Thu Aug 25 19:04:44 2005 @@ -5,7 +5,6 @@ # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs # - check and maybe port ATM patches from 2.4 # linux-2.4.22-fore200e-0.2f.patch -# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -258,6 +257,7 @@ Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch # Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs Patch115: linux-2.6-atm-vbr.patch +Patch116: linux-2.6-atmdd.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -694,6 +694,7 @@ %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1487,6 +1488,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1164 2005/08/25 17:04:44 baggins +- atmdd patch ported from 2.4 + Revision 1.441.2.1163 2005/08/25 13:39:05 baggins - TODO updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1163&r2=1.441.2.1164&f=u From baggins at pld-linux.org Thu Aug 25 19:06:41 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SOURCES: linux-2.6-atmdd.patch (NEW) - ported from linux-2.4.25-at... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:06:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported from linux-2.4.25-atmdd.patch ---- Files affected: SOURCES: linux-2.6-atmdd.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atmdd.patch diff -u /dev/null SOURCES/linux-2.6-atmdd.patch:1.1 --- /dev/null Thu Aug 25 19:06:41 2005 +++ SOURCES/linux-2.6-atmdd.patch Thu Aug 25 19:06:36 2005 @@ -0,0 +1,953 @@ +diff -urN linux-2.4.25/drivers/atm/Makefile linux-2.4.25-atmdd/drivers/atm/Makefile +--- linux-2.4.25/drivers/atm/Makefile 2004-02-23 15:18:29.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/Makefile 2004-02-29 22:51:26.000000000 +0100 +@@ -31,6 +31,7 @@ + obj-$(CONFIG_ATM_IDT77252) += suni.o + endif + ++obj-$(CONFIG_ATM_DD) += atmdd.o + obj-$(CONFIG_ATM_TCP) += atmtcp.o + obj-$(CONFIG_ATM_FIRESTREAM) += firestream.o + obj-$(CONFIG_ATM_LANAI) += lanai.o +diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfig +--- linux-2.4.25/drivers/atm/Kcnfig 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.25-atmdd/drivers/atm/Kconfig 2004-02-29 22:52:59.000000000 +0100 +@@ -4,6 +4,14 @@ + + menu "ATM drivers" + depends on NETDEVICES && ATM ++ ++config ATM_DD ++ tristate "ATM loopback" ++ depends on INET && ATM ++ help ++ This is an example atm driver. It does not require any actual ATM ++ hardware. It supports AAL5 and AAL0. Frames are merely looped back ++ to the sender on the same VC they were sent. + + config ATM_TCP + tristate "ATM over TCP" +diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.c +--- linux-2.4.25/drivers/atm/atmdd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/atmdd.c 2004-02-29 22:58:11.000000000 +0100 +@@ -0,0 +1,920 @@ ++/* ++####################################################################### ++# ++# (C) Copyright 2001 ++# Alex Zeffertt, Cambridge Broadband Ltd, ajz@cambridgebroadband.com ++# ++# 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 ++####################################################################### ++# Notes: ++# ++# This is an example atm driver. It does not require any actual ATM ++# hardware. It supports AAL5 and AAL0. frames are merely looped back ++# to the sender on the same VC they were sent. ++# ++####################################################################### ++*/ ++ ++/*############ Includes ###############################################*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* for xtime */ ++ ++/*############ Defines ################################################*/ ++ ++#define MYATMDD "atmdd" ++#define KLOG_PREAMBLE MYATMDD ": " ++#define MYATMDD_VPI_BITS 1 /* Allow ?.1.? but not ?.2.? */ ++#define MYATMDD_VCI_BITS 11 /* Allow ?.?.2047 but not ?.?.2048 */ ++#define MYATMDD_PCR 100000 ++#define RXQ_SZ 16 ++#define TXQ_SZ 16 ++#define AAL5_MTU (1510+8) /* Default AAL5 Maximum Transmission Unit (and length of AAL5 buffers) */ ++#define AAL5_BUFLEN (((AAL5_MTU + 47)/48)*48) /* Round up to n*48 bytes */ ++#if 0 ++# define DEBUG(format,args...) printk(format,##args) ++#else ++# define DEBUG(format,args...) ++#endif ++/*############ Types ##################################################*/ ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ RX_EMPTY, /* No sk_buff present */ ++ RX_FULL, /* sk_buff present and awaiting data */ ++ RX_RECVD, /* sk_buff present and contains valid data */ ++} myatmdd_rxstatus_e; ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ TX_EMPTY, /* No sk_buff present */ ++ TX_FULL, /* sk_buff present and awaiting transmission */ ++ TX_SENT, /* sk_buff present and has been sent */ ++} myatmdd_txstatus_e; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_rxstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_rxq_t; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_txstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_txq_t; ++ ++typedef struct { ++} myatmdd_devdata_t; ++ ++typedef struct { ++ myatmdd_rxq_t rxqueue; ++ myatmdd_txq_t txqueue; ++} myatmdd_vccdata_t; ++ ++/*############ Module paramters #######################################*/ ++ ++MODULE_AUTHOR("Alex Zeffertt, ajz@cambridgebroadband.com"); ++MODULE_DESCRIPTION("Example ATM device driver (loopback)"); ++#ifdef MODULE_LICENSE ++MODULE_LICENSE("GPL"); ++#endif ++/*#################### Forward declarations ###########################*/ ++ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc); ++ ++static void myatmdd_free_tx_skb(struct sk_buff *skb); ++ ++/* these functions will need modifying in a real ATM driver */ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc); ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc); ++ ++/* functions for manipulating circular bufs */ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size); ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size); ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue); ++static int myatmdd_release_txq(myatmdd_txq_t *queue); ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb); ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */); ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue); ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len); ++ ++/* myatmdd_ops registered by ATM device */ ++static int myatmdd_open(struct atm_vcc *vcc); ++static void myatmdd_close(struct atm_vcc *vcc); ++static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg); ++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb); ++static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs); ++static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page); ++ ++/* myatmdd_phy_ops registered by phy driver */ ++static void myatmdd_phy_int(struct atm_dev *dev); ++static int myatmdd_phy_start(struct atm_dev *dev); /* <-- This is the only thing exported by PHY driver */ ++static int myatmdd_phy_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg); ++ ++/*#################### Global scope variables #########################*/ ++ ++/* operations registered by the atm device */ ++static const struct atmdev_ops myatmdd_ops = ++{ ++ open: myatmdd_open, ++ close: myatmdd_close, ++ ioctl: myatmdd_ioctl, ++ getsockopt: myatmdd_getsockopt, ++ setsockopt: myatmdd_setsockopt, ++ send: myatmdd_send, ++ change_qos: myatmdd_change_qos, ++ proc_read: myatmdd_proc_read, ++ owner: THIS_MODULE, ++}; ++ ++/* operations registered by the phy driver */ ++static const struct atmphy_ops myatmdd_phy_ops = { ++ start: myatmdd_phy_start, ++ ioctl: myatmdd_phy_ioctl, ++ interrupt: myatmdd_phy_int, ++}; ++ ++struct atm_dev *myatmdd_dev; ++ ++/*#################### Function definitions ###########################*/ ++ ++ ++/* ++######################################################### ++# ++# Function : myatmdd_rx_interrupt, and myatmdd_tx_interrupt ++# ++# Purpose : handle interrupt from hardware. In first ++# case this means extract recvd buffers and pass ++# it up protocol stack. In 2nd case this means ++# free the sent buffers. ++# ++# Args : pointer to private data of the VCC concerned ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ int pkt_len; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len))) ++ { ++ struct sk_buff *newskb; ++ ++ /* Get a new skb to replace the one just consumed */ ++ if (!(newskb = dev_alloc_skb(AAL5_BUFLEN))) ++ { ++ atomic_inc(&vcc->stats->rx_err); ++ printk(KERN_ERR KLOG_PREAMBLE "cannot receive packet - out of memory\n"); ++ /* put skb back in rx queue) */ ++ myatmdd_rxq_enqueue(&priv->rxqueue, skb); ++ return; ++ } ++ myatmdd_rxq_enqueue(&priv->rxqueue, newskb); ++ ++ if (!atm_charge (vcc, skb->truesize)) ++ { ++ /* Exceeded memory quota for this vcc ++ * NOTE: if atm_charge succeeds you must then push or accounting will screw up ++ */ ++ dev_kfree_skb(skb); ++ /* &vcc->stats->drop stats incremented in atm_charge */ ++ } ++ else ++ { ++ /* sk_buff passed all sanity checks! */ ++ ++ /* Add received length to socket buffer */ ++ skb_put(skb, pkt_len); ++ ++ /* update device stats */ ++ atomic_inc(&vcc->stats->rx); ++ ++ /* add timestamp for upper layers to use */ ++ do_gettimeofday(&skb->stamp); ++ ++ /* Point socket buffer at the right VCC before giving to socket layer */ ++ ATM_SKB(skb)->vcc = vcc; ++ ++ /* push socket buffer up to ATM layer */ ++ vcc->push(vcc, skb); ++ } ++ } ++} ++ ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_txq_dequeue(&priv->txqueue))) ++ { ++ // Update channel stats and free the memory ++ atomic_inc(&vcc->stats->tx); ++ myatmdd_free_tx_skb(skb); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : myatmdd_emulate_loopback_hardware ++# ++# Purpose : emulate things normally done by hardware ++# i.e. copying tx bufs to rx bufs (we're modelling ++# a loopback system here), calling the tx done ++# interrupt, and calling the rx done interrupt. ++# ++# Args : priv = data private to VCC ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc) ++{ ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ struct sk_buff **ptxskb; ++ struct sk_buff **prxskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ ptxskb = priv->txqueue.hw_ptr; ++ prxskb = priv->rxqueue.hw_ptr; ++ ++ /* Send each tx buff waiting to go */ ++ while (priv->txqueue.status[ptxskb - priv->txqueue.start] == TX_FULL) ++ { ++ struct sk_buff *txskb = *ptxskb; ++ struct sk_buff *rxskb = *prxskb; ++ int pkt_len = priv->txqueue.pkt_len[ptxskb - priv->txqueue.start]; ++ ++ /* Is there an rx buffer? */ ++ if (priv->rxqueue.status[prxskb - priv->rxqueue.start] == RX_FULL) ++ { ++ /* Yes - Is the length in range? */ ++ if (pkt_len <= AAL5_BUFLEN) ++ { ++ /* Yes - do the copy */ ++ memcpy(rxskb->data, txskb->data,pkt_len); ++ priv->rxqueue.pkt_len[prxskb - priv->rxqueue.start] = pkt_len; ++ ++ /* Indicate rx buffer recvd */ ++ priv->rxqueue.status[prxskb - priv->rxqueue.start] = RX_RECVD; ++ ++ /* increment and maybe wrap rx pointer */ ++ if (++prxskb == priv->rxqueue.end) ++ prxskb = priv->rxqueue.start; ++ priv->rxqueue.hw_ptr = prxskb; ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "recvd frame too long - discarded\n"); ++ } ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "no rx buffers available\n"); ++ } ++ ++ /* Indicate tx buffer sent */ ++ priv->txqueue.status[ptxskb - priv->txqueue.start] = TX_SENT; ++ ++ /* increment and maybe wrap tx pointer */ ++ if (++ptxskb == priv->txqueue.end) ++ ptxskb = priv->txqueue.start; ++ priv->txqueue.hw_ptr = ptxskb; ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_tx_interrupt(vcc); ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_rx_interrupt(vcc); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : functions for manipulating circular buffs ++# ++# Purpose : ++# ++# Args : ++# ++# Returns : ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = RX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = TX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is there an skb here */ ++ if (*pskb == NULL) ++ continue; /* No, so skip this entry in ring */ ++ ++ /* Yes - free it */ ++ dev_kfree_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++static int myatmdd_release_txq(myatmdd_txq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ /* Scan through all TX bd's and cleanup */ ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is this buffer currently unused - i.e. no skb */ ++ if (*pskb == NULL) ++ continue; /* Yes, so ignore it */ ++ ++ /* If we reach here, we have found a socket buffer that ++ * exists in the TX ring and is waiting to be released. ++ */ ++ printk(KERN_WARNING KLOG_PREAMBLE "discarding unsent tx sk_buff\n"); ++ atomic_inc(&ATM_SKB(*pskb)->vcc->stats->tx_err); ++ myatmdd_free_tx_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if tx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = TX_FULL; ++ queue->pkt_len[queue->head - queue->start] = skb->len; ++ queue->head = newhead; ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if rx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = RX_FULL; ++ queue->head = newhead; ++ return 0; ++} ++ ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == TX_SENT) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = TX_EMPTY; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* returns NULL for "no new recvd frames" */ ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == RX_RECVD) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = RX_EMPTY; ++ *pkt_len = queue->pkt_len[queue->tail - queue->start]; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* ++######################################################### <> From baggins at pld-linux.org Thu Aug 25 19:09:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM TODO done In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:09:53 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM TODO done ---- Files affected: SPECS: kernel.spec (1.441.2.1164 -> 1.441.2.1165) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1164 SPECS/kernel.spec:1.441.2.1165 --- SPECS/kernel.spec:1.441.2.1164 Thu Aug 25 19:04:44 2005 +++ SPECS/kernel.spec Thu Aug 25 19:09:47 2005 @@ -3,8 +3,6 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs -# - check and maybe port ATM patches from 2.4 -# linux-2.4.22-fore200e-0.2f.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1488,6 +1486,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1165 2005/08/25 17:09:47 baggins +- ATM TODO done + Revision 1.441.2.1164 2005/08/25 17:04:44 baggins - atmdd patch ported from 2.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1164&r2=1.441.2.1165&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: open4-0.1.0.tgz Message-ID: <12632.1124997894@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.codeforpeople.com/lib/ruby/open4/open4-0.1.0.tgz aab7035d09a19af38a7468d7f1cb93c9 open4-0.1.0.tgz Size: 2918 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 09:12:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: subversion-1.2.3.tar.bz2 Message-ID: <6823.1125040338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://subversion.tigris.org/tarballs/subversion-1.2.3.tar.bz2 a14bc6590241b6e5c2ff2b354cc184a1 subversion-1.2.3.tar.bz2 Size: 7238176 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:57:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: mdadm-2.0.tar.bz2 Message-ID: <15335.1125061047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 802f301ea67db14773f49d6bed4f2411 mdadm-2.0.tar.bz2 Size: 102270 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 20:25:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: mysql-4.1.14.tar.gz Message-ID: <8345.1124994338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.dataphone.se/Downloads/MySQL-4.1/mysql-4.1.14.tar.gz 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz Size: 17074439 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: openvpn-2.0.2.tar.gz Message-ID: <32021.1125001715@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.2.tar.gz 862f8788f080f669b1ae00a74ef68001 openvpn-2.0.2.tar.gz Size: 663246 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Fri Aug 26 05:55:56 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: cairo-1.0.0.tar.gz Message-ID: <19931.1125028556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://cairographics.org/releases/cairo-1.0.0.tar.gz f0ff35c91983b7bf226154e68b280be3 cairo-1.0.0.tar.gz Size: 1439299 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 15:01:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: mdadm-1.12.0.tar.bz2 Message-ID: <18114.1125061306@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 736705240e918294740929518477fc6f mdadm-1.12.0.tar.bz2 Size: 79934 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:49:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ERRORS: mdadm-1.12.0.tar.bz2 Message-ID: <9701.1125060558@distfiles.pld-linux.org> FATAL: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 md5 mismatch, needed 4de899ddb1ede1d2cafd183794874ce1, got 736705240e918294740929518477fc6f Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <23028.1124995811@distfiles.pld-linux.org> wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <23163.1124995818@distfiles.pld-linux.org> wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From jajcus at pld-linux.org Fri Aug 26 10:43:25 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <31468.1125045805@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 08:25:29 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ooo-build-1.9.124.tar.gz src680-m124-core.tar.bz2 src680-m124-system.tar.bz2 src680-m124-binfilter.tar.bz2 src680-m124-lang.tar.bz2 ooo_custom_images-13.tar.bz2 ooo_crystal_images-6.tar.bz2 extras-2.tar.bz2 libwpd-0.8.0.tar.gz mdbtools-0.6pre1.tar.gz ... Message-ID: <10770.1125037529@distfiles.pld-linux.org> Files fetched: 5 STORED: http://go-ooo.org/packages/SRC680/ooo-build-1.9.124.tar.gz a82488bad72ea7006c7b269ad0652660 ooo-build-1.9.124.tar.gz Size: 4031429 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-core.tar.bz2 1f79a23b6d6a1339b137d12b156583a6 src680-m124-core.tar.bz2 Size: 157886806 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-system.tar.bz2 db7079c78028378224aeb0f282cb051e src680-m124-system.tar.bz2 Size: 18886198 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-binfilter.tar.bz2 a11c3419e5be158056bfbe8f16bcc65a src680-m124-binfilter.tar.bz2 Size: 18513561 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-lang.tar.bz2 dc8bd51c89a032e9156a53a38039150d src680-m124-lang.tar.bz2 Size: 29036821 bytes ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2 2480af7f890c8175c7f9e183a1b39ed2 ooo_custom_images-13.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/extras-2.tar.bz2 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/libwpd/libwpd-0.8.0.tar.gz 98e59beecc112339bb78654863304c1c libwpd-0.8.0.tar.gz ALREADY GOT: http://go-ooo.org/packages/SRC680/mdbtools-0.6pre1.tar.gz 246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_01_unix.tgz 7da2aff674c2c84aba8b21ac2ab16bb6 helpcontent_01_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_31_unix.tgz c7e618e2d9b8bd25cae12954ef2548c9 helpcontent_31_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_33_unix.tgz 68d58bc30b485a77c0a0fba08af3aee3 helpcontent_33_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_34_unix.tgz 8696bbee3dc4d5b6fd60218123016e29 helpcontent_34_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_39_unix.tgz c2ae86d02f462d2b663d621190f5ef34 helpcontent_39_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_46_unix.tgz 7b013981edce2fabe4a8751ff64a8d58 helpcontent_46_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_49_unix.tgz a39f44ec40f452c963a4a187f31d1acb helpcontent_49_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_55_unix.tgz 804d3ce61e11335193a410aaf9603f8e helpcontent_55_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_81_unix.tgz 81b705057a0e14ebcbf02fac4762781a helpcontent_81_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_82_unix.tgz 3121fbd251176d7c7b6e33ecec744c65 helpcontent_82_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_86_unix.tgz aee37935139c5ccd4b6d8abdd2037c66 helpcontent_86_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_88_unix.tgz 3b00571318e45965dee0545d86306d65 helpcontent_88_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_90_unix.tgz 9521a01c5817e87178f356762f8cdab5 helpcontent_90_unix.tgz -- Virtually Yours: distfiles. From megabajt at pld-linux.org Fri Aug 26 16:53:24 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: GeoIP-1.3.13.tar.gz Message-ID: <27610.1125068004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.maxmind.com/download/geoip/api/c/GeoIP-1.3.13.tar.gz 59fc9a6adfbde13cee33c88668f3f400 GeoIP-1.3.13.tar.gz Size: 668577 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Fri Aug 26 17:05:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: passwd-HEAD-2005-08-26.tar.gz Message-ID: <2176.1125068758@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/passwd-HEAD-2005-08-26.tar.gz 95fbc7b902ed4c527b1d84bcddf3241b passwd-HEAD-2005-08-26.tar.gz Size: 903489 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Fri Aug 26 17:52:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: pecl_http-0.12.0.tgz Message-ID: <30445.1125071556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/pecl_http-0.12.0.tgz d180e5b95d22c911e40d8265f7c8fd96 pecl_http-0.12.0.tgz Size: 92002 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Fri Aug 26 18:50:55 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: msmtp-1.4.4.tar.bz2 Message-ID: <3807.1125075055@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/msmtp/msmtp-1.4.4.tar.bz2 34b31619a61462d9f2dd4f59720cf05e msmtp-1.4.4.tar.bz2 Size: 480904 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Fri Aug 26 19:13:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:09 2005 Subject: DISTFILES: ocaml-3.08.4.tar.gz ocaml-3.08-refman.html.tar.gz ocaml-3.08-refman.ps.gz camlp4-3.06-manual.html.tar.gz camlp4-3.06-manual.dvi.gz camlp4-3.06-tutorial.html.tar.gz camlp4-3.06-tutorial.dvi.gz pure-fun-1.0.4.tar.bz2 ds-contrib.tar.gz ocaml-3.08-refman.info.tar.gz Message-ID: <17171.1125076405@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.gz 105d192896bf945b660c4fb1ee486f57 ocaml-3.08.4.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz 0daee5643db6960682c1a7d84467885f ocaml-3.08-refman.html.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz 35a5d4318456c0982e72ee3f33364bf5 ocaml-3.08-refman.ps.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.html.tar.gz 21370bae4e7f6435b38aeb21db7ce8bb camlp4-3.06-manual.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.dvi.gz 035915d1a530aa7ec9b194d9a7d258eb camlp4-3.06-manual.dvi.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.html.tar.gz 96d8eb4ca5abd58c9a280ba59f73b192 camlp4-3.06-tutorial.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.dvi.gz fcd87c235109364242a0c9ccf176dff8 camlp4-3.06-tutorial.dvi.gz ALREADY GOT: http://www.ocaml.info/ocaml_sources/pure-fun-1.0.4.tar.bz2 567bc681b4cc1cfcbbfb6fa5f012019b pure-fun-1.0.4.tar.bz2 ALREADY GOT: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz 77fa1da7375dea1393cc0b6cd802d7e1 ds-contrib.tar.gz STORED: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz 49b68ec07ccd7ce45eb6bd3f3fdee140 ocaml-3.08-refman.info.tar.gz Size: 274899 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 19:40:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: kdebase.spec - rel 4 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:40:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 4 ---- Files affected: SPECS: kdebase.spec (1.458 -> 1.459) ---- Diffs: ================================================================ Index: SPECS/kdebase.spec diff -u SPECS/kdebase.spec:1.458 SPECS/kdebase.spec:1.459 --- SPECS/kdebase.spec:1.458 Tue Aug 16 19:26:31 2005 +++ SPECS/kdebase.spec Fri Aug 26 19:40:26 2005 @@ -27,7 +27,7 @@ Summary(zh_CN): KDE???? Name: kdebase Version: %{_ver} -Release: 3 +Release: 4 Epoch: 9 License: GPL Group: X11/Applications @@ -2803,6 +2803,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.459 2005/08/26 17:40:26 arekm +- rel 4 + Revision 1.458 2005/08/16 17:26:31 glen - move kwriteconfig to -desktop package (it's not kwrite related program) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.458&r2=1.459&f=u From arekm at pld-linux.org Fri Aug 26 19:42:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: kdepim.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:42:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: kdepim.spec (1.188 -> 1.189) ---- Diffs: ================================================================ Index: SPECS/kdepim.spec diff -u SPECS/kdepim.spec:1.188 SPECS/kdepim.spec:1.189 --- SPECS/kdepim.spec:1.188 Tue Aug 2 11:22:48 2005 +++ SPECS/kdepim.spec Fri Aug 26 19:42:04 2005 @@ -17,7 +17,7 @@ Summary(uk): ???????????? ???????????? (PIM) ??? KDE Name: kdepim Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: GPL Vendor: The KDE Team @@ -1338,6 +1338,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.189 2005/08/26 17:42:04 arekm +- rel 3 + Revision 1.188 2005/08/02 09:22:48 arekm - rel2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.188&r2=1.189&f=u From qboosh at pld-linux.org Fri Aug 26 19:43:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: drupal-themeengine-phptemplate.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:43:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-phptemplate.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-phptemplate.spec diff -u SPECS/drupal-themeengine-phptemplate.spec:1.1 SPECS/drupal-themeengine-phptemplate.spec:1.2 --- SPECS/drupal-themeengine-phptemplate.spec:1.1 Fri Aug 19 12:54:31 2005 +++ SPECS/drupal-themeengine-phptemplate.spec Fri Aug 26 19:43:31 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine phptemplate Summary: Drupal PHPTemplate theme engine +Summary(pl): Silnik motyw?w Drupala PHPTemplate Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.2 @@ -18,7 +19,7 @@ %description A theme engine that allows you to use template files written in pure -php. These template files do not need to be processed by the theme +PHP. These template files do not need to be processed by the theme engine, and as such execute a lot faster than most other template engines. Another major advantage to using PHP as your template language, is flexibility, as the advanced user can access any @@ -30,6 +31,21 @@ The 'default' template for this engine is box_grey by Adrian Simmons. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych w +czystym PHP. Te pliki szablon?w nie wymagaj? przetwarzania przez +silnik motyw?w i jako takie wykonuj? si? du?o szybciej ni? wi?kszo?? +innych silnik?w motyw?w. Inn? du?? zalet? u?ywania PHP jako j?zyka +szablon?w jest elastyczno??, jako ?e zaawansowany u?ytkownik mo?e +dosta? si? do ka?dej informacji/funkcjonalno?ci dost?pnej w API +Drupala i nie jest ograniczony do tego, na co pozwala mu silnik/j?zyk +szablon?w. + +Kilka najwi?kszych serwis?w opartych na Drupalu, takich jak Drupal.org +czy Spreadfirefox.com u?ywa motyw?w opartych na PHPTemplate. + +"Domy?lnym" szablonem dla tego silnika jest box_grey Adriana Simmonsa. + %prep %setup -q -n %{engine} rm -f LICENSE.txt # GPL v2 @@ -54,6 +70,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:43:31 qboosh +- pl + Revision 1.1 2005/08/19 10:54:31 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-phptemplate.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 19:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: drupal-themeengine-smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-smarty.spec diff -u SPECS/drupal-themeengine-smarty.spec:1.3 SPECS/drupal-themeengine-smarty.spec:1.4 --- SPECS/drupal-themeengine-smarty.spec:1.3 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-smarty.spec Fri Aug 26 19:45:11 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine smarty Summary: Drupal Smarty theme engine +Summary(pl): Silnik motyw?w Drupala Smarty Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.9 @@ -26,6 +27,13 @@ The 'default' template for this engine is box_grey_smarty, which is ported from the original box_grey theme. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych przy +u?yciu sk?adni silnika szablon?w Smarty. + +"Domy?lnym" szablonem dla tego silnika jest box_grey_smarty, kt?ry +jest sportowany z oryginalnego motywu box_grey. + %prep %setup -q -n %{engine} %patch0 -p1 @@ -60,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:45:11 qboosh +- pl + Revision 1.3 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-smarty.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 19:49:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: drupal-themeengine-wgsmarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:49:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-wgsmarty.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-wgsmarty.spec diff -u SPECS/drupal-themeengine-wgsmarty.spec:1.2 SPECS/drupal-themeengine-wgsmarty.spec:1.3 --- SPECS/drupal-themeengine-wgsmarty.spec:1.2 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-wgsmarty.spec Fri Aug 26 19:49:04 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine wgsmarty Summary: Drupal wgSmarty theme engine +Summary(pl): Silnik motyw?w Drupala wgSmarty Name: drupal-themeengine-%{engine} Version: 4.6.001 Release: 0.2 @@ -23,18 +24,37 @@ wgSmarty is an implementation of the Smarty template engine as a theme engine. -Advantages -- Template files are easier to create and maintain then with PHPtemplate +Advantages: +- Template files are easier to create and maintain then with + PHPtemplate - Templates are compiled into PHP to avoid speed and memory issues with search-and-replace template engines like XTemplate - wgSmarty is much more closely integrated with Drupal than the - existing smarty theme engine + existing Smarty theme engine -Disadvantages +Disadvantages: - wgSmarty is currently experimental and is only available in CVS - There is very little support for wgSmarty: even when it is released, it will still be poorly supported in comparison with PHPTemplate +%description -l pl +wgSmarty to implementacja silnika szablon?w Smarty jako silnika +motyw?w. + +Zalety: +- pliki szablon?w s? ?atwiejsze do tworzenia i utrzymywania ni? + PHPtemplate +- szablony s? kompilowane do PHP, aby zapobiec problemom z szybko?ci? + i pami?ci? z silnikami szablon?w podmieniaj?cymi ?a?cuchy, takimi + jak XTemplate +- wgSmarty jest du?o bli?ej zintegrowany z Drupalem ni? istniej?cy + silnik motyw?w Smarty + +Wady: +- wgSmarty jest aktualnie eksperymentalny i dost?pny tylko w CVS-ie +- jest bardzo ma?e wsparcie dla wgSmarty: nawet kiedy zostanie wydany, + nadal b?dzie kiepsko wspierany w por?wnaniu do PHPTemplate + %prep %setup -q -n %{engine} %patch0 -p1 @@ -61,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 17:49:04 qboosh +- pl + Revision 1.2 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-wgsmarty.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:37:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: drupal-theme-box_grey_smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:37:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey_smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey_smarty.spec diff -u SPECS/drupal-theme-box_grey_smarty.spec:1.3 SPECS/drupal-theme-box_grey_smarty.spec:1.4 --- SPECS/drupal-theme-box_grey_smarty.spec:1.3 Fri Aug 19 13:08:48 2005 +++ SPECS/drupal-theme-box_grey_smarty.spec Fri Aug 26 19:37:35 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey_smarty Summary: Drupal Theme Box_grey_smarty +Summary(pl): Motyw Box_grey_smarty dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.5 @@ -21,6 +22,9 @@ %description A port of the original box_grey theme for the Smarty template engine. +%description -l pl +Port oryginalnego motywu box_grey dla silnika szablon?w Smarty. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -54,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:37:35 qboosh +- pl + Revision 1.3 2005/08/19 11:08:48 glen - fix theme style being available ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey_smarty.spec?r1=1.3&r2=1.4&f=u From wolvverine at pld-linux.org Fri Aug 26 18:50:57 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: msmtp.spec - 1.4.4 - STBR In-Reply-To: References: Message-ID: Author: wolvverine Date: Fri Aug 26 16:50:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.4 - STBR ---- Files affected: SPECS: msmtp.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.48 SPECS/msmtp.spec:1.49 --- SPECS/msmtp.spec:1.48 Mon Jul 18 17:44:42 2005 +++ SPECS/msmtp.spec Fri Aug 26 18:50:52 2005 @@ -2,12 +2,12 @@ Summary: SMTP "plugin" for MUAs Summary(pl): "Wtyczka" SMTP dla klient?w pocztowych (MUA) Name: msmtp -Version: 1.4.3 +Version: 1.4.4 Release: 1 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/msmtp/%{name}-%{version}.tar.bz2 -# Source0-md5: f6614490834ad3c2c15559bf38c2f694 +# Source0-md5: 34b31619a61462d9f2dd4f59720cf05e Patch0: %{name}-home_etc.patch URL: http://msmtp.sourceforge.net/ BuildRequires: autoconf >= 2.50 @@ -34,7 +34,7 @@ %description -l pl msmtp to prosty program dzia?aj?cy jako "wtyczka SMTP" dla Mutta i -prawdopodobnie innych klient?w pocztowych (MUA - mail user agents). +innych klient?w pocztowych (MUA - mail user agents). Przekierowuje wiadomo?ci do serwera SMTP (na przyk?ad providera darmowych kont e-mail), kt?ry je dostarcza. Mo?liwo?ci obejmuj?: - obs?ug? SMTP AUTH - metod PLAIN, LOGIN i CRAM-MD5 @@ -47,7 +47,7 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym). +konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. %prep %setup -q @@ -98,6 +98,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/26 16:50:52 wolvverine +- 1.4.4 +- STBR + Revision 1.48 2005/07/18 15:44:42 saq - drop unpackaged info-dir - works, release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.48&r2=1.49&f=u From adamg at pld-linux.org Fri Aug 26 18:15:45 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: template-php-pecl.spec - conf.d support In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - conf.d support ---- Files affected: SPECS: template-php-pecl.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.10 SPECS/template-php-pecl.spec:1.11 --- SPECS/template-php-pecl.spec:1.10 Sat Aug 7 19:47:11 2004 +++ SPECS/template-php-pecl.spec Fri Aug 26 18:15:39 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php +%define extensionsdir $(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -13,13 +15,11 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php - %description In PECL status of this extension is: %{_status}. @@ -39,24 +39,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 16:15:39 adamg +- conf.d support + Revision 1.10 2004/08/07 17:47:11 adamg - ok, let's force php5 for pecl extensions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.10&r2=1.11&f=u From aflinta at pld-linux.org Fri Aug 26 12:39:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:09 2005 Subject: CVSROOT: users - new JID In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 10:39:21 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - new JID ---- Files affected: CVSROOT: users (1.385 -> 1.386) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.385 CVSROOT/users:1.386 --- CVSROOT/users:1.385 Mon Aug 22 17:16:05 2005 +++ CVSROOT/users Fri Aug 26 12:39:16 2005 @@ -5,7 +5,7 @@ adamg:adamg@biomerieux.pl:Adam Go??biowski:adamg@pld-linux.org adasi:adasi@grubno.da.ru:Witek Kr?cicki adgor:adgor@isn.pl:Adam Gorzkiewicz:adgor@pld-linux.org -aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@at.kernel.pl +aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@jabber.org agaran:agaran@ep09.pld-linux.org:Maciej 'Agaran' Pijanka:agaran@rulez.pl andree:andree@luch.eu.org:Andrzej Augustynowicz aniolek:michal@dominium.warszawa.pl:Michal Czwojdzinski:aniolek@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.385&r2=1.386&f=u From paszczus at pld-linux.org Fri Aug 26 16:37:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: ocaml-lablgl.spec - added -j1 option to make cause it fails... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:37:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -j1 option to make cause it fails with multiprocesor build ---- Files affected: SPECS: ocaml-lablgl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.19 SPECS/ocaml-lablgl.spec:1.20 --- SPECS/ocaml-lablgl.spec:1.19 Fri Aug 26 16:32:56 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:37:43 2005 @@ -156,7 +156,7 @@ s|^GLLIBS.*|GLLIBS = -L%{_prefix}/X11R6/%{_lib} -lGL -lGLU -lXmu|; s|^COPTS.*|COPTS = %{rpmcflags} -c -fPIC|;' \ Makefile.config.ex > Makefile.config -%{__make} all opt +%{__make} -j1 all opt %install rm -rf $RPM_BUILD_ROOT @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/26 14:37:43 paszczus +- added -j1 option to make cause it fails with multiprocesor build + Revision 1.19 2005/08/26 14:32:56 paszczus - rel up for rebuild with ocaml 3.08.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.19&r2=1.20&f=u From darekr at pld-linux.org Thu Aug 25 22:11:59 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:09 2005 Subject: SPECS: wormulon.spec - fixed Source0 and URL field - added ChangeL... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:11:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed Source0 and URL field - added ChangeLog to %dir ---- Files affected: SPECS: wormulon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/wormulon.spec diff -u SPECS/wormulon.spec:1.2 SPECS/wormulon.spec:1.3 --- SPECS/wormulon.spec:1.2 Wed May 26 18:57:13 2004 +++ SPECS/wormulon.spec Thu Aug 25 22:11:54 2005 @@ -6,9 +6,9 @@ Release: 0.1 License: GPL Group: Networking/Utilities -Source0: http://www.raisdorf.net/files/wormulon/%{name}-%{version}.tar.gz +Source0: http://www.wormulon.net/files/code/wormulon/%{name}-%{version}.tar.gz # Source0-md5: 2ec78110fae31ee7f3cc651334da6b0e -URL: http://www.raisdorf.net/wormulon/ +URL: http://www.wormulon.net/projects/wormulon/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -37,7 +37,7 @@ %files %defattr(644,root,root,755) -%doc README TODO +%doc ChangeLog README TODO %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -46,6 +46,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 20:11:54 darekr +- fixed Source0 and URL field +- added ChangeLog to %dir + Revision 1.2 2004/05/26 16:57:13 qboosh - pl fixes, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wormulon.spec?r1=1.2&r2=1.3&f=u From aredridel at pld-linux.org Fri Aug 26 05:55:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: cairo.spec - up to 1.0.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Fri Aug 26 03:55:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.0 ---- Files affected: SPECS: cairo.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.33 SPECS/cairo.spec:1.34 --- SPECS/cairo.spec:1.33 Thu Aug 25 10:04:57 2005 +++ SPECS/cairo.spec Fri Aug 26 05:55:49 2005 @@ -2,13 +2,12 @@ Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo -Version: 0.9.2 -Release: 3 +Version: 1.0.0 +Release: 1 License: LGPL v2.1 or MPL v1.1 Group: Libraries -Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz -# Source0-md5: 992095a5db597384a89b41e93737105d -Patch0: %{name}-bug4110.patch +Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz +# Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel BuildRequires: autoconf @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +108,11 @@ %{__automake} %configure \ --enable-gtk-doc \ + --enable-quartz \ + --enable-xcb \ + --enable-glitz \ + --enable-ps \ + --enable-pdf \ --with-html-dir=%{_gtkdocdir} %{__make} @@ -149,6 +152,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/26 03:55:49 aredridel +- up to 1.0.0 + Revision 1.33 2005/08/25 08:04:57 aflinta - avoid to link with external libpixman, rel 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.33&r2=1.34&f=u From arekm at pld-linux.org Thu Aug 25 23:05:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (DEVEL): php-lib64.patch - more complete fix In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 21:05:16 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - more complete fix ---- Files affected: SOURCES: php-lib64.patch (1.10.4.2 -> 1.10.4.3) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.2 SOURCES/php-lib64.patch:1.10.4.3 --- SOURCES/php-lib64.patch:1.10.4.2 Thu Aug 25 20:23:51 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 23:05:11 2005 @@ -1,6 +1,6 @@ diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 --- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 -+++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 23:03:43.002336568 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) @@ -10,6 +10,22 @@ MING_DIR=$i break fi +@@ -34,11 +34,11 @@ + ],[ + AC_MSG_ERROR([Ming library 0.2a or greater required.]) + ],[ +- -L$MING_DIR/lib ++ -L$MING_DIR/$PHP_LIBDIR + ]) + + PHP_ADD_INCLUDE($MING_INC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) + + AC_MSG_CHECKING([for destroySWFBlock]) + AC_TRY_RUN([ + + diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag --- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 +++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.2&r2=1.10.4.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:36:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: drupal-theme-box_grey.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:36:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey.spec diff -u SPECS/drupal-theme-box_grey.spec:1.1 SPECS/drupal-theme-box_grey.spec:1.2 --- SPECS/drupal-theme-box_grey.spec:1.1 Fri Aug 19 13:08:08 2005 +++ SPECS/drupal-theme-box_grey.spec Fri Aug 26 19:36:13 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey Summary: Drupal Theme Box_grey +Summary(pl): Motyw Box_grey dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.1 @@ -26,6 +27,14 @@ lastly has a neutral grey colour scheme which will hopefully encourage people to change it. +%description -l pl +Box_grey ma by? stosunkowo ?atwy do modyfikowania dla tych, kt?rzy nie +s? kompetentni w pozycjonowaniu css, ale mog? zarz?dza? kolorami, +t?ami i obramowaniami css (albo przynajmniej chc? spr?bowa?). Jest +zaprojektowany tak, aby by? stosunkowo bogaty w r??ne rozmiary tre?ci +i ostatecznie mie? neutralny szary schemat kolor?w, zach?caj?cy ludzi +do jego zmiany. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -59,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:36:13 qboosh +- pl + Revision 1.1 2005/08/19 11:08:08 glen - phptemplate based theme - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey.spec?r1=1.1&r2=1.2&f=u From arekm at pld-linux.org Fri Aug 26 09:11:49 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: subversion.spec - up to 1.2.3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 07:11:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.3 ---- Files affected: SPECS: subversion.spec (1.144 -> 1.145) ---- Diffs: ================================================================ Index: SPECS/subversion.spec diff -u SPECS/subversion.spec:1.144 SPECS/subversion.spec:1.145 --- SPECS/subversion.spec:1.144 Sun Jul 31 23:45:59 2005 +++ SPECS/subversion.spec Fri Aug 26 09:11:44 2005 @@ -16,19 +16,18 @@ Summary(pl): System kontroli wersji podobny, ale lepszy, ni? CVS Summary(pt_BR): Sistema de versionamento concorrente Name: subversion -Version: 1.2.1 -Release: 3 +Version: 1.2.3 +Release: 1 License: Apache/BSD Style Group: Development/Version Control Source0: http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2 -# Source0-md5: 0b546195ca794c327c6830f2e88661f7 +# Source0-md5: a14bc6590241b6e5c2ff2b354cc184a1 Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init Source4: %{name}-svnserve.sysconfig Patch0: %{name}-home_etc.patch -Patch1: %{name}-SWIGEXPORT.patch -Patch2: %{name}-po.pl.patch +Patch1: %{name}-po.pl.patch URL: http://subversion.tigris.org/ %if %{with net_client_only} %global apache_modules_api 0 @@ -270,7 +269,6 @@ %setup -q %patch0 -p0 %patch1 -p1 -%patch2 -p1 rm -rf apr-util{,/xml/expat}/autom4te.cache @@ -522,6 +520,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.145 2005/08/26 07:11:44 arekm +- up to 1.2.3 + Revision 1.144 2005/07/31 21:45:59 pluto - segfault fixed, release 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.144&r2=1.145&f=u From baggins at pld-linux.org Fri Aug 26 17:56:54 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - fix ip_conntra... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:56:54 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix ip_conntrack_amanda Oops ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.17 -> 1.1.2.18) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 Fri Aug 26 15:40:25 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 17:56:48 2005 @@ -7237,6 +7237,19 @@ + +module_init(init); +module_exit(fini); +Index: net/ipv4/netfilter/ip_conntrack_amanda.c +=================================================================== +--- net/ipv4/netfilter/ip_conntrack_amanda.c (.../branches/vanilla-2.6.12.x) (revision 6284) ++++ net/ipv4/netfilter/ip_conntrack_amanda.c (.../trunk) (revision 6284) +@@ -66,7 +66,7 @@ + + /* increase the UDP timeout of the master connection as replies from + * Amanda clients to the server can be quite delayed */ +- ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); ++ ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); + + /* No data? */ + dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); Index: net/ipv4/netfilter/ip_conntrack_core.c =================================================================== --- net/ipv4/netfilter/ip_conntrack_core.c (.../branches/vanilla-2.6.12.x) (revision 6284) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.17&r2=1.1.2.18&f=u From glen at pld-linux.org Fri Aug 26 17:05:50 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-26 snap In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 15:05:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-26 snap ---- Files affected: SPECS: horde-passwd.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.26 SPECS/horde-passwd.spec:1.27 --- SPECS/horde-passwd.spec:1.26 Thu Aug 25 12:13:07 2005 +++ SPECS/horde-passwd.spec Fri Aug 26 17:05:45 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-24 -%define _rel 2 +%define _snap 2005-08-26 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -14,9 +14,8 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz -# Source0-md5: 6638fad5170d5421bacf7e44868a7964 +# Source0-md5: 95fbc7b902ed4c527b1d84bcddf3241b Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -52,7 +51,6 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 -%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -144,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/26 15:05:45 glen +- updated to 2005-08-26 snap + Revision 1.26 2005/08/25 10:13:07 paszczus - unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Fri Aug 26 17:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: drupal-mod-blogtheme.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 15:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-mod-blogtheme.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-mod-blogtheme.spec diff -u SPECS/drupal-mod-blogtheme.spec:1.1 SPECS/drupal-mod-blogtheme.spec:1.2 --- SPECS/drupal-mod-blogtheme.spec:1.1 Thu Aug 18 16:19:10 2005 +++ SPECS/drupal-mod-blogtheme.spec Fri Aug 26 17:54:16 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define modname blogtheme Summary: Drupal Blog Theme Module +Summary(pl): Modu? Drupal Blog Theme Name: drupal-mod-%{modname} Version: 4.6.0 Release: 0.1 @@ -19,12 +20,21 @@ %description Blog theme allows users to have persistent themes for their blogs based on the theme they choose for their account. When others view -thier main blog page, or any node created by them, the reader will see -the authors theme instead of thier own. +their main blog page, or any node created by them, the reader will see +the author's theme instead of their own. The module works by using the hook_init function and setting the $custom_theme global variable to the node/blog owner's theme. +%description -l pl +Blog theme pozwala u?ytkownikom mie? trwa?e motywy dla swoich blog?w w +oparciu o motyw wybrany dla w?asnego konta. Kiedy inni ogl?daj? ich +g??wn? stron? bloga lub dowolny utworzony w?ze?, czytelnik zobaczy +motyw autora zamiast w?asnego. + +Modu? dzia?a poprzez u?ycie funkcji hook_init i ustawienie zmiennej +globalnej $custom_theme na motyw w?a?ciciela w?z?a/bloga. + %prep %setup -q -n %{modname} @@ -49,6 +59,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:54:16 qboosh +- pl + Revision 1.1 2005/08/18 14:19:10 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-mod-blogtheme.spec?r1=1.1&r2=1.2&f=u From paszczus at pld-linux.org Fri Aug 26 14:57:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (DEVEL): mdadm.spec - updated to 2.0 - added URL - changed S... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:57:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.0 - added URL - changed Source0 url to mirror on kernel.org (better) - changed bcond_without initrd to bcond_with initrd cause build fails with initrd - release 0.1 ---- Files affected: SPECS: mdadm.spec (1.26.2.2 -> 1.26.2.3) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.26.2.2 SPECS/mdadm.spec:1.26.2.3 --- SPECS/mdadm.spec:1.26.2.2 Sat Jan 8 15:33:04 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:57:22 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without initrd # don't build initrd version +%bcond_with initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc # %ifarch amd64 @@ -10,16 +10,17 @@ Summary: Tool for creating and maintaining software RAID devices Summary(pl): Narz?dzie do tworzenia i obs?ugi programowych macierzy RAID Name: mdadm -Version: 1.8.1 -Release: 1 +Version: 2.0 +Release: 0.1 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz -# Source0-md5: d6298c34590334cad3b951bc590e4007 +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 +# Source0-md5: 802f301ea67db14773f49d6bed4f2411 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-degraded.patch -Patch1: %{name}-mdassemble.patch +#Patch0: %{name}-degraded.patch +#Patch1: %{name}-mdassemble.patch +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ %if %{with initrd} %{!?with_uClibc:BuildRequires: glibc-static} %{?with_uClibc:BuildRequires: uClibc-static} @@ -56,8 +57,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +#%patch0 -p1 +#%patch1 -p1 %build %if %{with initrd} @@ -150,6 +151,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.3 2005/08/26 12:57:22 paszczus +- updated to 2.0 +- added URL +- changed Source0 url to mirror on kernel.org (better) +- changed bcond_without initrd to bcond_with initrd cause build fails with initrd +- release 0.1 + Revision 1.26.2.2 2005/01/08 14:33:04 qboosh - added mdassemble patch, fixed mdassemble build (on by default again) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.26.2.2&r2=1.26.2.3&f=u From adamg at pld-linux.org Fri Aug 26 17:52:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec - updated to 0.12.0... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 15:52:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.12.0 - switched to conf.d ---- Files affected: SPECS: php-pecl-http.spec (1.7 -> 1.8) , php4-pecl-http.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.7 SPECS/php-pecl-http.spec:1.8 --- SPECS/php-pecl-http.spec:1.7 Wed Jul 27 08:59:16 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.7 2005/07/27 06:59:16 adamg - updated to 0.10.1 ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.1 SPECS/php4-pecl-http.spec:1.2 --- SPECS/php4-pecl-http.spec:1.1 Wed Jul 27 09:04:39 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php4-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.1 2005/07/27 07:04:39 adamg - new (cp from php-pecl-http) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 21:19:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: pcre.spec - 6.3 fixes CAN-2005-2491 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 19:19:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 6.3 fixes CAN-2005-2491 ---- Files affected: SPECS: pcre.spec (1.64 -> 1.65) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.64 SPECS/pcre.spec:1.65 --- SPECS/pcre.spec:1.64 Mon Aug 22 14:16:57 2005 +++ SPECS/pcre.spec Thu Aug 25 21:19:18 2005 @@ -275,11 +275,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.65 2005/08/25 19:19:18 glen +- 6.3 fixes CAN-2005-2491 + Revision 1.64 2005/08/22 12:16:57 adamg - fixed previous changelog entry Revision 1.63 2005/08/22 12:11:35 adamg -- updated to 6.3 +- updated to 6.3 (fixes CAN-2005-2491) - -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.64&r2=1.65&f=u From arekm at pld-linux.org Thu Aug 25 21:55:44 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (DEVEL): php-mod_php.conf - fix for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:55:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fix for php 5.1 ---- Files affected: SOURCES: php-mod_php.conf (1.3.4.2 -> 1.3.4.2.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-mod_php.conf diff -u SOURCES/php-mod_php.conf:1.3.4.2 SOURCES/php-mod_php.conf:1.3.4.2.4.1 --- SOURCES/php-mod_php.conf:1.3.4.2 Fri Jul 16 21:44:02 2004 +++ SOURCES/php-mod_php.conf Thu Aug 25 21:55:39 2005 @@ -1,6 +1,6 @@ LoadModule php5_module modules/libphp5.so - + AddType application/x-httpd-php .php AddType application/x-httpd-php .php3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-mod_php.conf?r1=1.3.4.2&r2=1.3.4.2.4.1&f=u From baggins at pld-linux.org Fri Aug 26 15:40:31 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - shift sock opt... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 13:40:31 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - shift sock options for ipt_ACCOUNT to work (overlap with ip_tables.c) ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.16 -> 1.1.2.17) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 Mon Aug 1 16:25:15 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 15:40:25 2005 @@ -3937,11 +3937,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -+#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -+#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -+#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) ++#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) ++#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) +#define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES + /* CONTINUE verdict for targets */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.16&r2=1.1.2.17&f=u From paszczus at pld-linux.org Fri Aug 26 14:47:37 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: mdadm.spec - changed to mirror site, but there are more fil... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed to mirror site, but there are more files than on main site ---- Files affected: SPECS: mdadm.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.38 SPECS/mdadm.spec:1.39 --- SPECS/mdadm.spec:1.38 Tue Jun 28 10:24:13 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:47:29 2005 @@ -14,12 +14,12 @@ Release: 2 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ BuildRequires: groff BuildRequires: rpmbuild(macros) >= 1.213 %if %{with initrd} @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/26 12:47:29 paszczus +- changed to mirror site, but there are more files than on main site + Revision 1.38 2005/06/28 08:24:13 blues - don't require mdadm on _every_ system. Require strict version of mdadm-initrd in mdadm. Should be enought ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Fri Aug 26 10:51:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: builder - skip colourization if output is not terminal In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 08:51:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - skip colourization if output is not terminal ---- Files affected: SPECS: builder (1.325 -> 1.326) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.325 SPECS/builder:1.326 --- SPECS/builder:1.325 Tue Aug 23 21:41:39 2005 +++ SPECS/builder Fri Aug 26 10:50:55 2005 @@ -134,7 +134,7 @@ else wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" OUTFILEOPT="-O" @@ -1398,8 +1398,8 @@ if [ "`diff --brief $SPECFILE $tmpdir/$SPECFILE`" ] ; then diff -u $SPECFILE $tmpdir/$SPECFILE > $tmpdir/$SPECFILE.diff - diffcol $tmpdir/$SPECFILE.diff | less -r - ( + if [ -t 1 ]; then + diffcol $tmpdir/$SPECFILE.diff | less -r while : ; do echo -n "Accept? [yn] " read ans @@ -1415,7 +1415,9 @@ ;; esac done - ) + else + cat $tmpdir/$SPECFILE.diff + fi else echo "The SPEC is perfect ;)" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.325&r2=1.326&f=u From qboosh at pld-linux.org Fri Aug 26 13:44:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (RA-branch): clamav.spec - typo, proper error messages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:44:51 2005 GMT Module: SPECS Tag: RA-branch ---- Log message: - typo, proper error messages ---- Files affected: SPECS: clamav.spec (1.131.2.26 -> 1.131.2.27) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.131.2.26 SPECS/clamav.spec:1.131.2.27 --- SPECS/clamav.spec:1.131.2.26 Thu Jul 28 14:09:20 2005 +++ SPECS/clamav.spec Fri Aug 26 13:44:46 2005 @@ -52,7 +52,7 @@ Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig Requires: /usr/sbin/usermod -Requires: %{name}-libs = %{epoch}%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc Provides: group(clamav) Provides: user(clamav) @@ -226,7 +226,7 @@ %pre if [ -n "`/usr/bin/getgid clamav`" ]; then if [ "`/usr/bin/getgid clamav`" != 43 ]; then - echo "Warning: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 + echo "Error: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -235,7 +235,7 @@ fi if [ -n "`/bin/id -u clamav 2>/dev/null`" ]; then if [ "`/bin/id -u clamav`" != 43 ]; then - echo "Warning: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 + echo "Error: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -369,6 +369,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.131.2.27 2005/08/26 11:44:46 qboosh +- typo, proper error messages + Revision 1.131.2.26 2005/07/28 12:09:20 hawk - release 2 (1 was already built for AC) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.131.2.26&r2=1.131.2.27&f=u From arekm at pld-linux.org Fri Aug 26 11:02:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (DEVEL): php.spec - use libtool for installing apache DSOs; ... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:02:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - use libtool for installing apache DSOs; rel 0.x.2 ---- Files affected: SPECS: php.spec (1.467.2.5 -> 1.467.2.6) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.5 SPECS/php.spec:1.467.2.6 --- SPECS/php.spec:1.467.2.5 Fri Aug 26 10:55:18 2005 +++ SPECS/php.spec Fri Aug 26 11:02:09 2005 @@ -76,7 +76,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.%{_rc}.1%{?with_hardening:hardened} +Release: 0.%{_rc}.2%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1705,14 +1705,12 @@ # install apache1 DSO module %if %{with apache1} -# TODO: use libtool here -install sapi/apache/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so +libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/ %endif # install apache2 DSO module %if %{with apache2} -# TODO: use libtool here -install sapi/apache2handler/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so +libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/ %endif libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} @@ -2913,6 +2911,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.6 2005/08/26 09:02:09 arekm +- use libtool for installing apache DSOs; rel 0.x.2 + Revision 1.467.2.5 2005/08/26 08:55:18 arekm - add PDO (base compiled in; database drivers as shared modules) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.5&r2=1.467.2.6&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:49 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: ruby-open4.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 19:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ruby-open4.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u /dev/null SPECS/ruby-open4.spec:1.1 --- /dev/null Thu Aug 25 21:24:49 2005 +++ SPECS/ruby-open4.spec Thu Aug 25 21:24:44 2005 @@ -0,0 +1,61 @@ +# $Revision$, $Date$ +%define ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")') +%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') +%define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') +Summary: Ruby open3 with exit reporting +Name: ruby-open4 +Version: 0.1.0 +Release: 1 +License: GPL +Group: Development/Languages +Source0: http://www.codeforpeople.com/lib/ruby/open4/open4-%{version}.tgz +# Source0-md5: aab7035d09a19af38a7468d7f1cb93c9 +URL: http://www.codeforpeople.com/lib/ruby/open4/ +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: setup.rb +Requires: ruby +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ruby open3 with exit reporting. + +%prep +%setup -q -n open4-%{version} + +%build +cp /usr/share/setup.rb . +ruby setup.rb config \ + --rbdir=%{ruby_rubylibdir} \ + --sodir=%{ruby_archdir} + +rdoc --ri -o ri +rdoc -o rdoc + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{ruby_archdir} +install -d $RPM_BUILD_ROOT%{ruby_ridir} + +ruby setup.rb install --prefix=$RPM_BUILD_ROOT + +cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README* rdoc +%{ruby_ridir}/* +%{ruby_rubylibdir}/open4* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 19:24:44 aredridel +- added + ================================================================ From darekr at pld-linux.org Thu Aug 25 22:27:58 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: wondershaper.spec - proper License; sorted %verify flags - C... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:27:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License;sorted %verify flags - ChangeLog to %doc ---- Files affected: SPECS: wondershaper.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/wondershaper.spec diff -u SPECS/wondershaper.spec:1.3 SPECS/wondershaper.spec:1.4 --- SPECS/wondershaper.spec:1.3 Thu Aug 12 18:04:55 2004 +++ SPECS/wondershaper.spec Thu Aug 25 22:27:53 2005 @@ -4,15 +4,15 @@ Name: wondershaper Version: 1.1a Release: 1 -License: GPL +License: GPL v2 Group: Networking/Utilities Source0: http://lartc.org/wondershaper/%{name}-%{version}.tar.gz # Source0-md5: bbc5a3a4485ab286e337ce8550e7b990 Patch0: %{name}-conf.patch URL: http://lartc.org/wondershaper/ Requires: iproute2 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Many cablemodem and ADSL users experience horrifying latency while @@ -45,8 +45,8 @@ %files %defattr(644,root,root,755) -%doc README ChangeLog -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wshaper.conf +%doc ChangeLog README TODO +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wshaper.conf %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 20:27:53 darekr +- proper License;sorted %verify flags +- ChangeLog to %doc + Revision 1.3 2004/08/12 16:04:55 radek - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wondershaper.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 20:25:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: mysql.spec - updated to 4.1.14 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 18:25:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.14 ---- Files affected: SPECS: mysql.spec (1.295 -> 1.296) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.295 SPECS/mysql.spec:1.296 --- SPECS/mysql.spec:1.295 Wed Jul 27 15:51:06 2005 +++ SPECS/mysql.spec Thu Aug 25 20:25:11 2005 @@ -24,11 +24,11 @@ Summary(zh_CN): MySQL???????????? Name: mysql Group: Applications/Databases -Version: 4.1.13 +Version: 4.1.14 Release: 1 License: GPL + MySQL FLOSS Exception Source0: http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz -# Source0-md5: 49d7a7314a2c9cf49e34777e73e66562 +# Source0-md5: 98ba9caea24b0a48ee06bb242ff2e37f Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -551,11 +551,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}comp_err mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump -# not our OS -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.plist -# unuseful stuff -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.spec - # functionality in initscript / rpm rm $RPM_BUILD_ROOT%{_bindir}/mysql_create_system_tables rm $RPM_BUILD_ROOT%{_bindir}/mysql_install_db @@ -565,7 +560,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fill_help_tables.sql rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/{pre,post}install +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure rm $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid # in %doc @@ -877,6 +872,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.296 2005/08/25 18:25:11 glen +- updated to 4.1.14 + Revision 1.295 2005/07/27 13:51:06 glen - guide where are the help tables data (probably it should be instead in iniscript?) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.295&r2=1.296&f=u From arekm at pld-linux.org Thu Aug 25 21:25:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (DEVEL): php.spec - zts is enabled for all SAPIs; --enable-f... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:25:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN ---- Files affected: SPECS: php.spec (1.467.2.3 -> 1.467.2.4) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.3 SPECS/php.spec:1.467.2.4 --- SPECS/php.spec:1.467.2.3 Thu Aug 25 20:57:03 2005 +++ SPECS/php.spec Thu Aug 25 21:25:13 2005 @@ -75,7 +75,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.1%{?with_hardening:hardened} +Release: 0.%{_rc}.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1424,6 +1424,7 @@ fi PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL +# Apache SAPIs should be last one listed here sapis=" fcgi cgi cli %if %{with apache1} @@ -1440,13 +1441,13 @@ ` case $sapi in cgi) - echo --enable-discard-path + echo --enable-discard-path --enable-force-cgi-redirect ;; cli) echo --disable-cgi ;; fcgi) - echo --enable-fastcgi --with-fastcgi=/usr + echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect ;; apxs1) ver=%(rpm -q --qf '%%{version}' apache1-apxs) @@ -1454,7 +1455,7 @@ ;; apxs2) ver=%(rpm -q --qf '%%{version}' apache-apxs) - echo --with-apxs2=%{apxs2} --with-apache-version=$ver --enable-maintainer-zts + echo --with-apxs2=%{apxs2} --with-apache-version=$ver ;; esac ` \ @@ -1464,6 +1465,7 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ @@ -1570,9 +1572,6 @@ # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la -# for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -# -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1 -# -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1 %if %{with apache1} %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1 sed -i -e " @@ -1587,19 +1586,18 @@ s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la %endif -%{__make} sapi/cgi/php -f Makefile.fcgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1 -DHAVE_SYS_PARAM_H=1 -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1" +# FCGI +cp -af php_config.h.fcgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.fcgi cp -r sapi/cgi sapi/fcgi rm -rf sapi/cgi/.libs sapi/cgi/*.lo -# notes: -# -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common) -# -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 - -%{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" +# CGI +cp -af php_config.h.cgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.cgi # CLI +cp -af php_config.h.cli main/php_config.h %{__make} sapi/cli/php -f Makefile.cli %install @@ -2751,6 +2749,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.4 2005/08/25 19:25:13 arekm +- zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN + Revision 1.467.2.3 2005/08/25 18:57:03 arekm - -DFORCE_CGI_REDIRECT=1 for cgi version ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.3&r2=1.467.2.4&f=u From cvs at pld-linux.org Fri Aug 26 17:53:10 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6336@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:06 2005 New Revision: 6336 Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:06 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: openvpn.spec - 2.0.2 In-Reply-To: References: Message-ID: Author: areq Date: Thu Aug 25 20:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 ---- Files affected: SPECS: openvpn.spec (1.94 -> 1.95) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.94 SPECS/openvpn.spec:1.95 --- SPECS/openvpn.spec:1.94 Mon Aug 22 11:33:20 2005 +++ SPECS/openvpn.spec Thu Aug 25 22:28:30 2005 @@ -2,12 +2,12 @@ Summary: VPN Daemon Summary(pl): Serwer VPN Name: openvpn -Version: 2.0.1 +Version: 2.0.2 Release: 1 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz -# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 +# Source0-md5: 862f8788f080f669b1ae00a74ef68001 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.95 2005/08/25 20:28:30 areq +- 2.0.2 + Revision 1.94 2005/08/22 09:33:20 glen - simplify %prep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.94&r2=1.95&f=u From arekm at pld-linux.org Thu Aug 25 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (DEVEL): php-lib64.patch - update In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:23:57 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - update ---- Files affected: SOURCES: php-lib64.patch (1.10.4.1 -> 1.10.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.1 SOURCES/php-lib64.patch:1.10.4.2 --- SOURCES/php-lib64.patch:1.10.4.1 Thu Aug 25 19:26:19 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 20:23:51 2005 @@ -10,3 +10,16 @@ MING_DIR=$i break fi +diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag +--- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 ++++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 +@@ -4,7 +4,7 @@ + # + + phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpbuilddir = $(libdir)/php/build + + BUILD_FILES = \ + scripts/phpize.m4 \ + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.1&r2=1.10.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:38:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: siefs.spec - use _sbindir macro In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:38:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _sbindir macro ---- Files affected: SPECS: siefs.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/siefs.spec diff -u SPECS/siefs.spec:1.12 SPECS/siefs.spec:1.13 --- SPECS/siefs.spec:1.12 Tue Apr 5 20:52:00 2005 +++ SPECS/siefs.spec Thu Aug 25 22:38:34 2005 @@ -48,7 +48,6 @@ %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT%{_sbindir} %{__make} install \ @@ -65,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS README* ChangeLog COPYRIGHT.vmo2wav %attr(755,root,root) %{_bindir}/* -/sbin/mount.siefs +%{_sbindir}/mount.siefs %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/25 20:38:34 darekr +- use _sbindir macro + Revision 1.12 2005/04/05 18:52:00 saq - up to 0.5 - lots of various fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/siefs.spec?r1=1.12&r2=1.13&f=u From paszczus at pld-linux.org Fri Aug 26 14:49:19 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: mdadm.spec - use tar.bz2 compression In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:49:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use tar.bz2 compression ---- Files affected: SPECS: mdadm.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.39 SPECS/mdadm.spec:1.40 --- SPECS/mdadm.spec:1.39 Fri Aug 26 14:47:29 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:49:14 2005 @@ -14,7 +14,7 @@ Release: 2 License: GPL Group: Base -Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/26 12:49:14 paszczus +- use tar.bz2 compression + Revision 1.39 2005/08/26 12:47:29 paszczus - changed to mirror site, but there are more files than on main site ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.39&r2=1.40&f=u From havner at pld-linux.org Fri Aug 26 10:38:02 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atm patches commented out for now... In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 08:38:02 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atm patches commented out for now, update configs ---- Files affected: SPECS: kernel.spec (1.441.2.1166 -> 1.441.2.1167) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1166 SPECS/kernel.spec:1.441.2.1167 --- SPECS/kernel.spec:1.441.2.1166 Fri Aug 26 01:59:40 2005 +++ SPECS/kernel.spec Fri Aug 26 10:37:56 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -%patch115 -p1 -%patch116 -p1 +#%%patch115 -p1 +#%%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1167 2005/08/26 08:37:56 havner +- atm patches commented out for now, update configs + Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1166&r2=1.441.2.1167&f=u From cvs at pld-linux.org Fri Aug 26 15:46:15 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6334@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:46:11 2005 New Revision: 6334 Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:46:11 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From arekm at pld-linux.org Thu Aug 25 20:57:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (DEVEL): php.spec - -DFORCE_CGI_REDIRECT=1 for cgi version In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:57:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - -DFORCE_CGI_REDIRECT=1 for cgi version ---- Files affected: SPECS: php.spec (1.467.2.2 -> 1.467.2.3) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.2 SPECS/php.spec:1.467.2.3 --- SPECS/php.spec:1.467.2.2 Thu Aug 25 20:39:05 2005 +++ SPECS/php.spec Thu Aug 25 20:57:03 2005 @@ -1597,7 +1597,7 @@ # -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 %{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1" + CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" # CLI %{__make} sapi/cli/php -f Makefile.cli @@ -2751,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.3 2005/08/25 18:57:03 arekm +- -DFORCE_CGI_REDIRECT=1 for cgi version + Revision 1.467.2.2 2005/08/25 18:39:05 arekm - fix cli with readline; add xmlreader module; builds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.2&r2=1.467.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 13:46:15 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: clamav.spec - triggerpostun dep really differs from postun dep In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:46:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - triggerpostun dep really differs from postun dep ---- Files affected: SPECS: clamav.spec (1.170 -> 1.171) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.170 SPECS/clamav.spec:1.171 --- SPECS/clamav.spec:1.170 Thu Jul 28 14:18:51 2005 +++ SPECS/clamav.spec Fri Aug 26 13:46:10 2005 @@ -53,9 +53,9 @@ Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel -Requires(postun): sed >= 4.0 Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig +Requires(triggerpostun): sed >= 4.0 Requires: /usr/sbin/usermod Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc @@ -365,6 +365,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171 2005/08/26 11:46:10 qboosh +- triggerpostun dep really differs from postun dep + Revision 1.170 2005/07/28 12:18:51 hawk - release 3 (2 went to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.170&r2=1.171&f=u From darekr at pld-linux.org Thu Aug 25 22:01:20 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: words.spec - noreplace for %config - sorted %verify flags In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:01:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - noreplace for %config - sorted %verify flags ---- Files affected: SPECS: words.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/words.spec diff -u SPECS/words.spec:1.28 SPECS/words.spec:1.29 --- SPECS/words.spec:1.28 Sat Sep 25 13:20:55 2004 +++ SPECS/words.spec Thu Aug 25 22:01:14 2005 @@ -55,7 +55,7 @@ %files %defattr(644,root,root,755) %doc usr/dict/{README.linux.words*,README2.linux.words*} -%config %verify(not size mtime md5) %{_datadir}/dict/* +%config(noreplace) %verify(not md5 mtime size) %{_datadir}/dict/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -63,6 +63,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/25 20:01:14 darekr +- noreplace for %config +- sorted %verify flags + Revision 1.28 2004/09/25 11:20:55 radek - cosmetics (spaces -> tabs) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/words.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Thu Aug 25 20:05:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (DEVEL): php-readline.patch (NEW) - new In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:05:39 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - new ---- Files affected: SOURCES: php-readline.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php-readline.patch diff -u /dev/null SOURCES/php-readline.patch:1.1.2.1 --- /dev/null Thu Aug 25 20:05:39 2005 +++ SOURCES/php-readline.patch Thu Aug 25 20:05:34 2005 @@ -0,0 +1,12 @@ +diff -urN php-5.1.0RC1.org/sapi/cli/config.m4 php-5.1.0RC1/sapi/cli/config.m4 +--- php-5.1.0RC1.org/sapi/cli/config.m4 2005-08-25 19:54:02.051504000 +0200 ++++ php-5.1.0RC1/sapi/cli/config.m4 2005-08-25 19:54:28.699452976 +0200 +@@ -29,7 +29,7 @@ + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" + ;; + *) +- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" + ;; + esac + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" ================================================================ From arekm at pld-linux.org Thu Aug 25 19:59:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (DEVEL): php-nohttpd.patch - fixed In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:59:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed ---- Files affected: SOURCES: php-nohttpd.patch (1.1.4.1 -> 1.1.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1.4.1 SOURCES/php-nohttpd.patch:1.1.4.2 --- SOURCES/php-nohttpd.patch:1.1.4.1 Thu Aug 25 15:51:01 2005 +++ SOURCES/php-nohttpd.patch Thu Aug 25 19:59:11 2005 @@ -6,10 +6,10 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then ++ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1.4.1&r2=1.1.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:50:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: cpio.spec - defined _bindir - use it In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _bindir - use it ---- Files affected: SPECS: cpio.spec (1.60 -> 1.61) ---- Diffs: ================================================================ Index: SPECS/cpio.spec diff -u SPECS/cpio.spec:1.60 SPECS/cpio.spec:1.61 --- SPECS/cpio.spec:1.60 Mon Aug 8 13:37:20 2005 +++ SPECS/cpio.spec Thu Aug 25 22:50:16 2005 @@ -152,13 +152,13 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS TODO -%attr(755,root,root) /bin/cpio -%{_infodir}/cpio.info* -%{_mandir}/man1/cpio.1* +%attr(755,root,root) %{_bindir}/cpio %lang(es) %{_mandir}/es/man1/cpio.1* %lang(hu) %{_mandir}/hu/man1/cpio.1* %lang(ja) %{_mandir}/ja/man1/cpio.1* %lang(pt_BR) %{_mandir}/pt_BR/man1/cpio.1* +%{_infodir}/cpio.info* +%{_mandir}/man1/cpio.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.61 2005/08/25 20:50:16 darekr +- defined _bindir - use it + Revision 1.60 2005/08/08 11:37:20 baggins - release 3 - an lstat, we need or symbolic links copy we will not ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpio.spec?r1=1.60&r2=1.61&f=u From darekr at pld-linux.org Thu Aug 25 22:54:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: cpudyn.spec - defined _sbindir to /sbin In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:54:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _sbindir to /sbin ---- Files affected: SPECS: cpudyn.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpudyn.spec diff -u SPECS/cpudyn.spec:1.7 SPECS/cpudyn.spec:1.8 --- SPECS/cpudyn.spec:1.7 Sun May 15 14:28:23 2005 +++ SPECS/cpudyn.spec Thu Aug 25 22:54:17 2005 @@ -11,10 +11,12 @@ Source1: %{name}.init Source2: %{name}.conf URL: http://mnm.uib.es/~gallir/cpudyn/ -PreReq: rc-scripts +Requires: rc-scripts Requires(post,preun): /sbin/chkconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description This program control the speed in Intel SpeedStep, Pentium 4 Mobile and PowerPC machines with the cpufreq compiled in the kernel. @@ -45,12 +47,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/cpudynd install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cpudyn.conf -install cpudynd $RPM_BUILD_ROOT/sbin -install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install cpudynd $RPM_BUILD_ROOT%{_sbindir} +install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -58,8 +60,8 @@ %files %defattr(644,root,root,755) %doc README faq.html -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cpudyn.conf -%attr(755,root,root) /sbin/cpudynd +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cpudyn.conf +%attr(755,root,root) %{_sbindir}/cpudynd %attr(754,root,root) /etc/rc.d/init.d/cpudynd %{_mandir}/man8/* @@ -69,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:54:17 darekr +- defined _sbindir to /sbin + Revision 1.7 2005/05/15 12:28:23 aflinta - up to version 1.0.1, it doesn't require cpufreqd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpudyn.spec?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Fri Aug 26 08:18:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: openoffice.org.spec - up to 1.9.124 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 06:18:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.9.124 ---- Files affected: SPECS: openoffice.org.spec (1.546 -> 1.547) ---- Diffs: ================================================================ Index: SPECS/openoffice.org.spec diff -u SPECS/openoffice.org.spec:1.546 SPECS/openoffice.org.spec:1.547 --- SPECS/openoffice.org.spec:1.546 Sat Aug 13 16:32:34 2005 +++ SPECS/openoffice.org.spec Fri Aug 26 08:18:30 2005 @@ -21,9 +21,9 @@ %define ver 2.0 %define rel 0 -%define ooobver 1.9.123 +%define ooobver 1.9.124 %define snap SRC680 -%define bver m123 +%define bver m124 %define subver 680 %define fullver %{ver}.%{rel} @@ -35,20 +35,20 @@ Summary(pl): OpenOffice.org - pot??ny pakiet biurowy Name: openoffice.org Version: %{fullver} -Release: 0.6%{?with_vfs:vfs} +Release: 0.7%{?with_vfs:vfs} Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz -# Source0-md5: 7906dcfeb2074971bdc37019582b32f5 +# Source0-md5: a82488bad72ea7006c7b269ad0652660 Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-core.tar.bz2 -# Source1-md5: 4c566ccd4131ceb99fcf7395cbae3d9e +# Source1-md5: 1f79a23b6d6a1339b137d12b156583a6 Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-system.tar.bz2 -# Source2-md5: e223aa4452b2148f657c107392539343 +# Source2-md5: db7079c78028378224aeb0f282cb051e Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-binfilter.tar.bz2 -# Source3-md5: cc5799f480c530e21b2f030e194aae1f +# Source3-md5: a11c3419e5be158056bfbe8f16bcc65a Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-lang.tar.bz2 -# Source4-md5: ec7638b7b508b7da5aa8dcea52fd823a +# Source4-md5: dc8bd51c89a032e9156a53a38039150d Source10: http://go-ooo.org/packages/%{snap}/ooo_custom_images-13.tar.bz2 # Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2 Source11: http://go-ooo.org/packages/%{snap}/ooo_crystal_images-6.tar.bz2 @@ -1447,7 +1447,7 @@ %prep %setup -q -n ooo-build-%{ooobver} -%patch0 -p1 +#%patch0 -p1 install -d src # sources, icons, KDE_icons @@ -2068,6 +2068,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.547 2005/08/26 06:18:30 arekm +- up to 1.9.124 + Revision 1.546 2005/08/13 14:32:34 arekm - up to m123 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.546&r2=1.547&f=u From arekm at pld-linux.org Thu Aug 25 20:50:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: php-pecl-cpdf.spec (NEW), php-pecl-dio.spec (NEW) - nothing... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - nothing; not available yet ---- Files affected: SPECS: php-pecl-cpdf.spec (NONE -> 1.1) (NEW), php-pecl-dio.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u /dev/null SPECS/php-pecl-cpdf.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-cpdf.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,74 @@ +# $Revision$, $Date$ +%define _modname cpdf +%define _status stable + +Summary: %{_modname} - extension module for PHP +Summary(pl): %{_modname} - modu? dla php +Name: php-pecl-%{_modname} +Version: 2.0.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/cpdf/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +This is a dynamic shared object (DSO) for PHP that will add PDF +support through libcpdf library. + +In PECL status of this extension is: %{_status}. + +%description -l pl +Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ Index: SPECS/php-pecl-dio.spec diff -u /dev/null SPECS/php-pecl-dio.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-dio.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,71 @@ +# $Revision$, $Date$ +%define _modname dio +%define _status stable + +Summary: %{_modname} - Direct I/O functions +Name: php-pecl-%{_modname} +Version: not-yet +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/dio/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +PHP supports the direct io functions as described in the Posix +Standard (Section 6) for performing I/O functions at a lower level +than the C-Language stream I/O functions (fopen(), fread(),..). The +use of the DIO functions should be considered only when direct control +of a device is needed. In all other cases, the standard filesystem +functions are more than adequate. + +In PECL status of this extension is: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ From arekm at pld-linux.org Thu Aug 25 20:39:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (DEVEL): php.spec - fix cli with readline; add xmlreader mod... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:39:10 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix cli with readline; add xmlreader module; builds ---- Files affected: SPECS: php.spec (1.467.2.1 -> 1.467.2.2) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.1 SPECS/php.spec:1.467.2.2 --- SPECS/php.spec:1.467.2.1 Thu Aug 25 16:09:44 2005 +++ SPECS/php.spec Thu Aug 25 20:39:05 2005 @@ -111,6 +111,7 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch +Patch20: %{name}-readline.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -1280,6 +1281,24 @@ zwi?zanych z tymi plikami. Pozwala on tworzy? analizatory XML-a i nast?pnie definiowa? procedury obs?ugi dla r??nych zdarze? XML. +%package xmlreader +Summary: XML Reader extension module for PHP +Summary(pl): Modu? XML Reader dla PHP +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description xmlreader +This is a dynamic shared object (DSO) for PHP that will add XML Reader +support. The XMLReader extension is an XML Pull parser. The reader +acts as a cursor going forward on the document stream and stopping +at each node on the way. + +%description xmlreader -l pl +Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy +si? naka?dym w??le po drodze. + %package xmlrpc Summary: xmlrpc extension module for PHP Summary(pl): Modu? xmlrpc dla PHP @@ -1360,10 +1379,9 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch21 -p1 -%if "%{_lib}" == "lib64" %patch22 -p1 -%endif %patch23 -p1 %patch24 -p1 %patch25 -p1 @@ -1441,6 +1459,7 @@ esac ` \ --cache-file=config.cache \ + --with-libdir=%{_lib} \ --with-config-file-path=%{_sysconfdir} \ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ @@ -1475,11 +1494,11 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --with-xmlreader \ + --with-xmlreader=shared \ --with-bz2=shared \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ - --with-dbase=shared \ + --enable-dbase=shared \ %if %{with xmlrpc} --with-expat-dir=shared,/usr \ %else @@ -1626,7 +1645,7 @@ ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php -install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +sed -e 's#/usr/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini @@ -2130,6 +2149,12 @@ %postun xml %extension_postun +%post xmlreader +%extension_post + +%postun xmlreader +%extension_postun + %post xmlrpc %extension_post @@ -2367,13 +2392,14 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/phpextdist %attr(755,root,root) %{_bindir}/phpize %attr(755,root,root) %{_bindir}/php-config %attr(755,root,root) %{_libdir}/libphp_common.so %{_libdir}/libphp_common.la %{_includedir}/php %{_libdir}/php/build +%{_mandir}/man1/phpize* +%{_mandir}/man1/php-config* %files bcmath %defattr(644,root,root,755) @@ -2697,6 +2723,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xml.ini %attr(755,root,root) %{extensionsdir}/xml.so +%files xmlreader +%defattr(644,root,root,755) +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xmlreader.ini +%attr(755,root,root) %{extensionsdir}/xmlreader.so + %if %{with xmlrpc} %files xmlrpc %defattr(644,root,root,755) @@ -2720,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.2 2005/08/25 18:39:05 arekm +- fix cli with readline; add xmlreader module; builds + Revision 1.467.2.1 2005/08/25 14:09:44 arekm - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.1&r2=1.467.2.2&f=u From cvs at pld-linux.org Fri Aug 26 17:53:41 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6337@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:40 2005 New Revision: 6337 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:40 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From paszczus at pld-linux.org Fri Aug 26 15:01:47 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: mdadm.spec - md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 13:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - md5 ---- Files affected: SPECS: mdadm.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.40 SPECS/mdadm.spec:1.41 --- SPECS/mdadm.spec:1.40 Fri Aug 26 14:49:14 2005 +++ SPECS/mdadm.spec Fri Aug 26 15:01:42 2005 @@ -15,7 +15,7 @@ License: GPL Group: Base Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 -# Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 +# Source0-md5: 736705240e918294740929518477fc6f Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.41 2005/08/26 13:01:42 paszczus +- md5 + Revision 1.40 2005/08/26 12:49:14 paszczus - use tar.bz2 compression ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.40&r2=1.41&f=u From darekr at pld-linux.org Thu Aug 25 22:51:08 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: cpg.spec - gpm-friendly Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - gpm-friendly Source0 ---- Files affected: SPECS: cpg.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpg.spec diff -u SPECS/cpg.spec:1.7 SPECS/cpg.spec:1.8 --- SPECS/cpg.spec:1.7 Mon Aug 30 20:07:24 2004 +++ SPECS/cpg.spec Thu Aug 25 22:51:02 2005 @@ -6,7 +6,7 @@ Release: 1 License: distributable Group: Documentation -Source0: http://www.tldp.org/LDP/%{name}/Custom-Porting-Guide.html.tar.gz +Source0: http://www.tldp.org/LDP/cpg/Custom-Porting-Guide.html.tar.gz # Source0-md5: d3716f3750152305b10cd557e2bdbffd URL: http://www.tldp.org/LDP/cpg/html/index.html BuildArch: noarch @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:51:02 darekr +- gpm-friendly Source0 + Revision 1.7 2004/08/30 18:07:24 snurf - typo / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpg.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Fri Aug 26 14:52:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS (LINUX_2_6): kernel.spec - uncommented atm patches In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 12:52:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - uncommented atm patches ---- Files affected: SPECS: kernel.spec (1.441.2.1167 -> 1.441.2.1168) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1167 SPECS/kernel.spec:1.441.2.1168 --- SPECS/kernel.spec:1.441.2.1167 Fri Aug 26 10:37:56 2005 +++ SPECS/kernel.spec Fri Aug 26 14:52:05 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -#%%patch115 -p1 -#%%patch116 -p1 +%patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1168 2005/08/26 12:52:05 baggins +- uncommented atm patches + Revision 1.441.2.1167 2005/08/26 08:37:56 havner - atm patches commented out for now, update configs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1167&r2=1.441.2.1168&f=u From arekm at pld-linux.org Fri Aug 26 11:34:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES: kdebase-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:34:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdebase-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdebase-branch.diff diff -u SOURCES/kdebase-branch.diff:1.16 SOURCES/kdebase-branch.diff:1.17 --- SOURCES/kdebase-branch.diff:1.16 Sun Aug 7 10:30:42 2005 +++ SOURCES/kdebase-branch.diff Fri Aug 26 11:34:45 2005 @@ -1,20 +1,7 @@ -Index: kate/plugins/defaultproject/katedefaultproject.desktop -=================================================================== ---- kate/plugins/defaultproject/katedefaultproject.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/plugins/defaultproject/katedefaultproject.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) -@@ -58,7 +58,7 @@ - Name[tr]=??ntan??ml?? Kate Proje Eklentisi - Name[uk]=?????????????? ???????????? ?????????????? Kate - Name[uz]=Kate ???????????? ???????????? ?????????????? --Name[zh_CN]=Kate ?????????????????? -+Name[zh_CN]=Kat ?????????????????? - Comment=Default Plugin for Projects - Comment[af]=Standaard Inprop Module vir Projekte - Comment[ar]=????? ?????? ?????????????????? ????? ?????????? Index: kate/data/x-kate-project.desktop =================================================================== ---- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -58,7 +58,7 @@ Comment[tr]=Kate Proje Dosyas?? Comment[uk]=???????? ?????????????? Kate @@ -26,8 +13,17 @@ Type=QString Index: kdepasswd/kcm/kcm_useraccount.desktop =================================================================== ---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -23,7 +23,7 @@ + Name[es]=Contrase??a y cuenta de usuario + Name[et]=Parool ja kasutaja konto + Name[eu]=Pasahitza eta erabiltzaile kontua +-Name[fi]=Salasanat & k??ytt??j??tilit ++Name[fi]=Salasanat ja k??ytt??j??tilit + Name[fr]=Compte utilisateur et mot de passe + Name[fy]=Wachtwurd en br??kersbehear + Name[ga]=Focal Faire & Cuntas ??s??ideora @@ -41,7 +41,7 @@ Name[nds]=Passwoort & Brukerkonto Name[nl]=Wachtwoord en gebruikerbeheer @@ -48,8 +44,8 @@ Comment[pt_BR]=Informa????es do usu??rio tais como senha, nome e e-mail Index: kpersonalizer/kpersonalizer.desktop =================================================================== ---- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -47,7 +47,7 @@ Name[nl]=KDE's Configuratie Assistent Name[nn]=Vegvisar for skrivebordsoppsett @@ -59,6 +55,19 @@ Name[pl]=Asystent ustawie?? ??rodowiska Name[pt]=Assistente de Configura????o do Ambiente de Trabalho Name[pt_BR]=Assistente de Configura????es para a ??rea de Trabalho +Index: kcontrol/background/background.desktop +=================================================================== +--- kcontrol/background/background.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/background/background.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -125,7 +125,7 @@ + Comment[nso]=Fetosa dipeakanyo tsa bokamorago + Comment[pa]=???????????????????????? ?????????????????? ??????????????? + Comment[pl]=Ustawienia t??a +-Comment[pt]=alterar a configura????o do fundo ++Comment[pt]=Alterar a configura????o do fundo + Comment[pt_BR]=Muda as configura????es do fundo da tela + Comment[ro]=Configureaz?? set??rile fundalului + Comment[ru]=?????????????????? ???????? ???????????????? ?????????? Index: kcontrol/krdb/kcs/Windows2000.kcsrc =================================================================== Cannot display: file marked as a binary type. @@ -75,10 +84,14 @@ =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/x-kcsrc +Index: kcontrol/krdb/kcs/WhiteOnBlack.kcsrc +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-kcsrc Index: kcontrol/usbview/kcmusb.desktop =================================================================== ---- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -185,6 +185,7 @@ Keywords[nl]=USB,devices,viewer,control,weergaveprogramma Keywords[nn]=USB,einingar,visar,kontroll @@ -89,8 +102,8 @@ Keywords[pt_BR]=USB,dispositivos,visualizador,controle Index: kcontrol/taskbar/kcmtaskbar.desktop =================================================================== ---- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nn]=Oppg??velinje Name[nso]=Bar ya Mosongwana @@ -109,10 +122,31 @@ Comment[pl]=Konfiguracja paska zada?? panelu Comment[pt]=Configura????o da barra de tarefas do painel Comment[pt_BR]=Configura a barra de tarefas +Index: kcontrol/kcontrol/searchwidget.cpp +=================================================================== +--- kcontrol/kcontrol/searchwidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kcontrol/searchwidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -124,6 +124,7 @@ + + // get the modules keyword list + QStringList kw = module->keywords(); ++ kw << module->moduleName(); + + // loop through the keyword list to populate _keywords + for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it) Index: kcontrol/nics/nic.desktop =================================================================== ---- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=V??rguliidesed + Name[eu]=Sare interfazeak + Name[fa]=????????????????? ???????? +-Name[fi]=Verkkoliittym??t ++Name[fi]=Verkkoliitynn??t + Name[fr]=Interfaces r??seau + Name[fy]=Netwurkynterfaces + Name[ga]=Comh??adain L??onra @@ -52,7 +52,7 @@ Name[nl]=Netwerkinterfaces Name[nn]=Nettverksgrensesnitt @@ -131,10 +165,113 @@ Comment[pl]=Informacje o interfejsie sieciowym Comment[pt]=Informa????es sobre as interfaces de rede Comment[pt_BR]=Informa????es sobre rede +Index: kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +=================================================================== +--- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -216,6 +216,7 @@ + QString path; + QString ref; + QString query; ++ QString nameFilter; + + if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) { + path = cmd; +@@ -228,7 +229,8 @@ + // but not for "/tmp/a#b", if "a#b" is an existing file, + // or for "/tmp/a?b" (#58990) + if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed +- && QFile::exists(url.path()) ) ++ && QFile::exists(url.path()) ++ && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query + { + path = url.path(); + ref = url.ref(); +@@ -338,6 +340,24 @@ + if( isLocalFullPath && !exists ) + { + exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 ); ++ if ( !exists ) { ++ // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter ++ // If the app using this filter doesn't support it, well, it'll simply error out itself ++ int lastSlash = path.findRev( '/' ); ++ if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments ++ { ++ QString fileName = path.mid( lastSlash + 1 ); ++ QString testPath = path.left( lastSlash + 1 ); ++ if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) ++ && stat( QFile::encodeName(testPath).data(), &buff ) == 0 ) ++ { ++ nameFilter = fileName; ++ kdDebug() << "Setting nameFilter to " << nameFilter << endl; ++ path = testPath; ++ exists = true; ++ } ++ } ++ } + } + + //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl; +@@ -370,7 +390,9 @@ + // Open "uri" as file:/xxx if it is a non-executable local resource. + if( isDir || S_ISREG( buff.st_mode ) ) + { +- //kdDebug() << "Abs path as local file" << endl; ++ //kdDebug() << "Abs path as local file or directory" << endl; ++ if ( !nameFilter.isEmpty() ) ++ u.setFileName( nameFilter ); + setFilteredURI( data, u ); + setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE ); + return true; +Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop +=================================================================== +--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -55,7 +55,7 @@ + Name[uz]=Wikipedia - ?????????? ???????????????????????? + Name[vi]=Wikipedia -B??? t??? ??i???n b??ch khoa m?? n ph?? + Name[wa]=Wikipedia - Li libe eciclopedeye +-Name[zh_CN]=Wikipedia - ? ?????????????? ???? ++Name[zh_CN]=???????????? - ? ?????????????? ???? + Name[zh_TW]=Wikipedia - ? ??????? Encyclopedia + ServiceTypes=SearchProvider + Keys=wp +@@ -66,4 +66,5 @@ + Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[pa]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=????????? ++Query[zh_CN]=http://zh.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Charset=utf8 +Index: kcontrol/locale/default/entry.desktop +=================================================================== +--- kcontrol/locale/default/entry.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,7 +16,7 @@ + Name[es]=Ingl??s de EEUU + Name[et]=Inglise (US) + Name[eu]=EEBBetako ingelesa +-Name[fi]=US-englanti ++Name[fi]=Yhdysvaltain englanti + Name[fr]=Anglais US + Name[fy]=VS Ingelsk + Name[gl]=Ingl??s de EEUU +Index: kcontrol/locale/language.desktop +=================================================================== +--- kcontrol/locale/language.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/language.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=Riik/regioon ja keel + Name[eu]=Herrialdea eta hizkuntza + Name[fa]=????????/???????? ?? ? ???????? +-Name[fi]=Maa/alue ja kieli ++Name[fi]=Maa tai alue ja kieli + Name[fr]=Pays & langue + Name[fy]=L??n/regio en taal + Name[ga]=T??r/R??igi??n agus Teanga Index: kcontrol/smserver/kcmsmserver.desktop =================================================================== ---- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -55,7 +55,7 @@ Name[nl]=Sessiebeheer Name[nn]=??kthandsamar @@ -153,10 +290,22 @@ Comment[pl]=Konfiguracja mened??era sesji i ustawie?? wylogowania Comment[pt]=Configura????o do gestor de sess??es e das op????es de finaliza????o Comment[pt_BR]=Configura o gerenciador de sess??o e defini????es de logout +Index: kcontrol/konq/desktop.desktop +=================================================================== +--- kcontrol/konq/desktop.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktop.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,6 +16,7 @@ + Name[az]=Masa ??stl??ri + Name[bg]=?????????????? ?????????????? + Name[bn]=?????????????????? ????????????????????? ++Name[br]=Lies burev + Name[bs]=Vi??estruki desktopi + Name[ca]=M??ltiples escriptoris + Name[cs]=Virtu??ln?? plochy Index: kcontrol/konq/desktoppath.desktop =================================================================== ---- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -50,7 +50,7 @@ Name[nl]=Paden Name[nn]=Stiar @@ -186,8 +335,8 @@ Index: kcontrol/konq/webappearance.desktop =================================================================== ---- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -199,8 +348,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filebehavior.desktop =================================================================== ---- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,3 +181,4 @@ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,s??rskilt f??nster,visa f??nster,beteende,minnesanv??ndning,hemadress,n??tverks??tg??rder,f??rloppsdialogruta,papperskorg,ta bort,bekr??ftelse Keywords[ta]=???????????????????????????,?????????????????? ?????????????????????,kfm,?????????????????????????????????,?????????????????? ?????????????????????????????????,????????? ??????????????????,???????????????????????? ??????????????????,??????????????????,?????????????????? ????????????????????????,?????????????????? ????????????????????????????????????,???????????????????????????????????? ????????????????????????????????????, ????????????????????? ????????????????????????,??????????????????????????????????????????, ??????????????????,????????????????????????????????????????????? @@ -208,8 +357,8 @@ +Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,???????????????,??????,????????????,????????????,????????????,??????,?? ?????????,??? URL,????????????,???????????????,?????????,??????,?????? Index: kcontrol/konq/fileappearance.desktop =================================================================== ---- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -221,8 +370,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filepreviews.desktop =================================================================== ---- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,7 +46,7 @@ Name[nds]=V??ransichten & Meta-Daten Name[nl]=Voorbeelden en meta-data @@ -234,8 +383,8 @@ Name[pt_BR]=Pr??-visualiza????es & Metadados Index: kcontrol/kicker/kicker_config_appearance.desktop =================================================================== ---- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -247,8 +396,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/privacy/privacy.desktop =================================================================== ---- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -34,7 +34,7 @@ Comment[nds]=Privaatruum - Mit dit Moduul kannst Du dat Systeem vun de Sporen vun't Bruken reenmaken Comment[nl]=Privacy - een configuratiemodule waarmee u ongewenste sporen die gebruikers achterlaten kunt wissen. @@ -275,10 +424,23 @@ Name[pl]=Prywatno???? Name[pt]=Privacidade Name[pt_BR]=Privacidade +Index: kcontrol/kfontinst/thumbnail/FontThumbnail.cpp +=================================================================== +--- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- ThumbCreator *new_creator() ++ KDE_EXPORT ThumbCreator *new_creator() + { + return new KFI::CFontThumbnail; + } Index: kcontrol/kfontinst/lib/FcEngine.cpp =================================================================== ---- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -833,6 +833,7 @@ QString name(url.fileName()); int pos; @@ -289,8 +451,8 @@ if(-1==(pos=name.find(", "))) // No style information... Index: kcontrol/screensaver/testwin.h =================================================================== ---- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,9 +1,9 @@ #ifndef TESTWIN_H #define TESTWIN_H @@ -305,8 +467,8 @@ public: Index: kcontrol/screensaver/screensaver.desktop =================================================================== ---- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -117,7 +117,7 @@ Comment[nl]=Schermbeveiliging instellen Comment[nn]=Innstillingar for skjermsparar @@ -327,7 +489,7 @@ Index: kcontrol/screensaver/configure.in.in =================================================================== --- kcontrol/screensaver/configure.in.in (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,8 @@ +AC_HAVE_GL( + [ @@ -339,8 +501,8 @@ + ) Index: kcontrol/screensaver/kssmonitor.h =================================================================== ---- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,13 +1,12 @@ #ifndef KSSMONITOR_H #define KSSMONITOR_H @@ -361,7 +523,7 @@ Index: kcontrol/screensaver/kswidget.cpp =================================================================== --- kcontrol/screensaver/kswidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,40 @@ +#include + @@ -405,8 +567,8 @@ +#include "kswidget.moc" Index: kcontrol/screensaver/scrnsave.cpp =================================================================== ---- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,10 +46,7 @@ #include "scrnsave.h" @@ -422,7 +584,7 @@ Index: kcontrol/screensaver/kswidget.h =================================================================== --- kcontrol/screensaver/kswidget.h (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,13 @@ +#ifndef KSWIDGET_H +#define KSWIDGET_H @@ -439,8 +601,8 @@ +#endif Index: kcontrol/screensaver/Makefile.am =================================================================== ---- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,11 +1,12 @@ -AM_CPPFLAGS = $(all_includes) @@ -459,8 +621,8 @@ noinst_HEADERS = scrnsave.h Index: kcontrol/screensaver/testwin.cpp =================================================================== ---- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -4,7 +4,7 @@ class QXEmbed; @@ -472,8 +634,8 @@ KWin::setState( winId(), NET::StaysOnTop ); Index: kcontrol/kio/lanbrowser.desktop =================================================================== ---- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -49,7 +49,7 @@ Name[nl]=Lokaal netwerk Name[nn]=Lokalt nettverk @@ -493,8 +655,8 @@ Keywords[pt_BR]=samba,smb,windows,rede Index: kcontrol/kio/proxy.desktop =================================================================== ---- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -40,7 +40,7 @@ Name[nb]=Mellomtjener Name[nn]=Mellomtenar @@ -514,8 +676,8 @@ Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy Index: kcontrol/kio/cookies.desktop =================================================================== ---- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,7 +181,7 @@ Keywords[ven]=Cookies,Burousini.Inithenete,WWW> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Fri Aug 26 18:15:01 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec, template-php4-pecl... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - move %define calls to the top of the file ---- Files affected: SPECS: php-pecl-http.spec (1.8 -> 1.9) , php4-pecl-http.spec (1.2 -> 1.3) , template-php4-pecl.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.8 SPECS/php-pecl-http.spec:1.9 --- SPECS/php-pecl-http.spec:1.8 Fri Aug 26 17:52:28 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.8 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.2 SPECS/php4-pecl-http.spec:1.3 --- SPECS/php4-pecl-http.spec:1.2 Fri Aug 26 17:52:28 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %(php4-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.2 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.3 SPECS/template-php4-pecl.spec:1.4 --- SPECS/template-php4-pecl.spec:1.3 Thu Aug 25 10:31:34 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,7 @@ %define _modname - %define _status - %define _sysconfdir /etc/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -19,8 +20,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description In PECL status of this extension is: %{_status}. @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.3 2005/08/25 08:31:34 glen - typo, merge installs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.3&r2=1.4&f=u From twittner at pld-linux.org Fri Aug 26 19:13:19 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: ocaml.spec - added ocaml-doc-info subpkg (but info page suf... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 17:13:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ocaml-doc-info subpkg (but info page suffer from lack of index). - moved html docs in separate subpkgs: ocaml-doc-html, ocaml-camlp4-doc-html. Updated descriptions. - replace (by editing Makefiles by sed) hardcoded `-O', `-pg', `-DPROFILING' with $(CFLAGS). Allow passing CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 - rel. 2 ---- Files affected: SPECS: ocaml.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/ocaml.spec diff -u SPECS/ocaml.spec:1.98 SPECS/ocaml.spec:1.99 --- SPECS/ocaml.spec:1.98 Mon Aug 15 17:59:03 2005 +++ SPECS/ocaml.spec Fri Aug 26 19:13:12 2005 @@ -16,7 +16,7 @@ Summary(pl): Kompilator OCamla (Objective Caml) oraz ?rodowisko programistyczne Name: ocaml Version: 3.08.4 -Release: 1 +Release: 2 Epoch: 1 License: distributable Vendor: Group of implementors @@ -39,6 +39,8 @@ # Source7-md5: 567bc681b4cc1cfcbbfb6fa5f012019b Source8: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz # Source8-md5: 77fa1da7375dea1393cc0b6cd802d7e1 +Source9: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz +# Source9-md5: 49b68ec07ccd7ce45eb6bd3f3fdee140 Patch0: %{name}-build.patch Patch1: %{name}-db3.patch Patch2: %{name}-objinfo.patch @@ -51,6 +53,7 @@ %{!?with_db3:BuildRequires: db-devel >= 4.1} %{?with_tk:BuildRequires: tk-devel} %if %{with emacs} +BuildRequires: sed >= 4.0 BuildRequires: xemacs BuildRequires: xemacs-common BuildRequires: xemacs-fsf-compat-pkg @@ -78,17 +81,38 @@ pracy, narz?dzia do tworzenia analizator?w leksykalnych oraz sk?adniowych (ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i biblioteki. +%package doc-html +Summary: HTML documentation for OCaml +Summary(pl): Dokumentacja dla OCamla w formacie HTML +Group: Development/Tools + +%description doc-html +HTML documentation for OCaml. + +%description doc-html -l pl +Dokumentacja dla OCamla w formacie HTML. + %package doc-ps Summary: PostScript documentation for OCaml Summary(pl): Dokumentacja dla OCamla w formacie PostScript Group: Development/Tools %description doc-ps -PostScript documentation for OCaml. HTML documentation is in main package. +PostScript documentation for OCaml. %description doc-ps -l pl -Dokumentacja dla OCamla w formacie PostScript. Dokumentacja HTML jest -w g??wnym pakiecie. +Dokumentacja dla OCamla w formacie PostScript. + +%package doc-info +Summary: Info documentation for OCaml +Summary(pl): Dokumentacja info dla OCamla +Group: Development/Tools + +%description doc-info +Info documentation for OCaml. + +%description doc-info -l pl +Dokumentacja info dla OCamla. %package emacs Summary: Emacs mode for OCaml @@ -215,6 +239,17 @@ poprawionej sk?adni OCamla. Potrafi tak?e t?umaczy? programy z jednej sk?adni na drug?. +%package camlp4-doc-html +Summary: Objective Caml Preprocessor - HTML documentation +Summary(pl): Preprocesor OCamla - dokumentacja HTML +Group: Development/Languages + +%description camlp4-doc-html +Objective Caml Preprocessor - HTML documentation. + +%description camlp4-doc-html -l pl +Preprocesor OCamla - dokumentacja HTML. + %package compiler-objects Summary: Compiled parts of OCaml compiler Summary(pl): Skompilowane cz??ci kompilatora OCamla @@ -278,9 +313,9 @@ mkdir examples tar xjf %{SOURCE7} -C examples tar xzf %{SOURCE8} -C examples +tar xzf %{SOURCE9} # order mess with docs somewhat -mkdir docs -mkdir docs/html +mkdir -p docs/html mv htmlman docs/html/ocaml cp %{SOURCE2} docs/ocaml.ps.gz mv camlp4-%{p4ver}-manual.html docs/html/camlp4 @@ -293,10 +328,18 @@ #%patch3 -p1 %patch4 -p1 -%build +# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS) +Makefiles=$(find . -type f -name Makefile\*) +%{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles +%{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles +%{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles +%{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile +%{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile + +%build cp -f /usr/share/automake/config.sub config/gnu ./configure \ - -cc "%{__cc} %{rpmcflags}" \ + -cc "%{__cc}" \ -bindir %{_bindir} \ -libdir %{_libdir}/%{name} \ -mandir %{_mandir}/man1 \ @@ -305,12 +348,12 @@ -with-pthread \ -x11lib /usr/X11R6/%{_lib} -%{__make} world bootstrap opt.opt -%{__make} -C tools objinfo +%{__make} world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall" +%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_examplesdir}/%{name}-{labltk-,}%{version}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}} %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ @@ -360,9 +403,18 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man3 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp} +# install info pages +cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir} + %clean rm -rf $RPM_BUILD_ROOT +%post doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + +%postun doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + %files runtime %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/ocamlrun @@ -378,7 +430,6 @@ %files %defattr(644,root,root,755) %doc LICENSE Changes README Upgrading -%doc docs/html/ocaml %attr(755,root,root) %{_bindir}/ocaml* %{!?_without_tk:%exclude %{_bindir}/ocamlbrowser} %exclude %{_bindir}/ocamlrun @@ -423,7 +474,6 @@ %files camlp4 %defattr(644,root,root,755) -%doc docs/html/camlp4* %attr(755,root,root) %{_bindir}/*camlp4* %attr(755,root,root) %{_bindir}/ocpp # Not installed since 3.05, is is needed? @@ -432,6 +482,10 @@ %{_mandir}/man*/*camlp4* %{_mandir}/man*/*ocpp* +%files camlp4-doc-html +%defattr(644,root,root,755) +%doc docs/html/camlp4* + %if %{with tk} %files labltk-devel %defattr(644,root,root,755) @@ -472,16 +526,34 @@ %{_libdir}/%{name}/ocamldoc/*.cm* %{_libdir}/%{name}/ocamldoc/*.a +%files doc-html +%defattr(644,root,root,755) +%doc docs/html/ocaml/* + %files doc-ps %defattr(644,root,root,755) %doc docs/*.ps.gz +%files doc-info +%defattr(644,root,root,755) +%{_infodir}/ocaml.info* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/26 17:13:12 twittner +- added ocaml-doc-info subpkg (but info page suffer from + lack of index). +- moved html docs in separate subpkgs: ocaml-doc-html, + ocaml-camlp4-doc-html. Updated descriptions. +- replace (by editing Makefiles by sed) hardcoded `-O', + `-pg', `-DPROFILING' with $(CFLAGS). Allow passing + CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 +- rel. 2 + Revision 1.98 2005/08/15 15:59:03 qboosh - updated to 3.08.4, removed outdated gcc-pr21291-workaround patch - updated pure-fun and ds-contrib source URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml.spec?r1=1.98&r2=1.99&f=u From baggins at pld-linux.org Fri Aug 26 12:51:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES (LINUX_2_6): kernel-alpha-smp.config, kernel-alpha.config, ... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 10:51:18 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_ATM_DD=m ---- Files affected: SOURCES: kernel-alpha-smp.config (1.33.10.152 -> 1.33.10.153) , kernel-alpha.config (1.30.6.3.2.144 -> 1.30.6.3.2.145) , kernel-i386-smp.config (1.59.10.103 -> 1.59.10.104) , kernel-i386.config (1.82.10.108 -> 1.82.10.109) , kernel-ia64-smp.config (1.1.2.21 -> 1.1.2.22) , kernel-ia64.config (1.1.2.20 -> 1.1.2.21) , kernel-sparc-smp.config (1.9.2.6.2.80 -> 1.9.2.6.2.81) , kernel-sparc.config (1.37.2.109 -> 1.37.2.110) , kernel-sparc64-smp.config (1.48.2.95 -> 1.48.2.96) , kernel-sparc64.config (1.48.2.82 -> 1.48.2.83) , kernel-x86_64-smp.config (1.1.2.87 -> 1.1.2.88) , kernel-x86_64.config (1.1.2.87 -> 1.1.2.88) , kernel-xen0-x86_32-2.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_32-3.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_64-3.0.config (1.1.2.8 -> 1.1.2.9) , kernel-xenU-x86_32-3.0.config (1.1.2.2 -> 1.1.2.3) , kernel-xenU-x86_64-3.0.config (1.1.2.2 -> 1.1.2.3) ---- Diffs: ================================================================ Index: SOURCES/kernel-alpha-smp.config diff -u SOURCES/kernel-alpha-smp.config:1.33.10.152 SOURCES/kernel-alpha-smp.config:1.33.10.153 --- SOURCES/kernel-alpha-smp.config:1.33.10.152 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha-smp.config Fri Aug 26 12:51:12 2005 @@ -1020,6 +1020,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-alpha.config diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.144 SOURCES/kernel-alpha.config:1.30.6.3.2.145 --- SOURCES/kernel-alpha.config:1.30.6.3.2.144 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha.config Fri Aug 26 12:51:12 2005 @@ -1034,6 +1034,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.103 SOURCES/kernel-i386-smp.config:1.59.10.104 --- SOURCES/kernel-i386-smp.config:1.59.10.103 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386-smp.config Fri Aug 26 12:51:12 2005 @@ -1406,6 +1406,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.108 SOURCES/kernel-i386.config:1.82.10.109 --- SOURCES/kernel-i386.config:1.82.10.108 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386.config Fri Aug 26 12:51:12 2005 @@ -1422,6 +1422,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64-smp.config diff -u SOURCES/kernel-ia64-smp.config:1.1.2.21 SOURCES/kernel-ia64-smp.config:1.1.2.22 --- SOURCES/kernel-ia64-smp.config:1.1.2.21 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64-smp.config Fri Aug 26 12:51:12 2005 @@ -1024,6 +1024,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64.config diff -u SOURCES/kernel-ia64.config:1.1.2.20 SOURCES/kernel-ia64.config:1.1.2.21 --- SOURCES/kernel-ia64.config:1.1.2.20 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64.config Fri Aug 26 12:51:12 2005 @@ -1039,6 +1039,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc-smp.config diff -u SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 SOURCES/kernel-sparc-smp.config:1.9.2.6.2.81 --- SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc-smp.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc.config diff -u SOURCES/kernel-sparc.config:1.37.2.109 SOURCES/kernel-sparc.config:1.37.2.110 --- SOURCES/kernel-sparc.config:1.37.2.109 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc64-smp.config diff -u SOURCES/kernel-sparc64-smp.config:1.48.2.95 SOURCES/kernel-sparc64-smp.config:1.48.2.96 --- SOURCES/kernel-sparc64-smp.config:1.48.2.95 Wed Aug 17 18:46:48 2005 +++ SOURCES/kernel-sparc64-smp.config Fri Aug 26 12:51:12 2005 @@ -848,6 +848,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc64.config diff -u SOURCES/kernel-sparc64.config:1.48.2.82 SOURCES/kernel-sparc64.config:1.48.2.83 --- SOURCES/kernel-sparc64.config:1.48.2.82 Thu Aug 18 14:06:12 2005 +++ SOURCES/kernel-sparc64.config Fri Aug 26 12:51:12 2005 @@ -849,6 +849,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64-smp.config diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.87 SOURCES/kernel-x86_64-smp.config:1.1.2.88 --- SOURCES/kernel-x86_64-smp.config:1.1.2.87 Thu Aug 18 14:10:18 2005 +++ SOURCES/kernel-x86_64-smp.config Fri Aug 26 12:51:12 2005 @@ -1181,6 +1181,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64.config diff -u SOURCES/kernel-x86_64.config:1.1.2.87 SOURCES/kernel-x86_64.config:1.1.2.88 --- SOURCES/kernel-x86_64.config:1.1.2.87 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-x86_64.config Fri Aug 26 12:51:13 2005 @@ -1184,6 +1184,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-2.0.config diff -u SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-2.0.config Fri Aug 26 12:51:13 2005 @@ -1421,6 +1421,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-3.0.config diff -u SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -1325,6 +1325,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_64-3.0.config diff -u SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.9 --- SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -1293,6 +1293,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xenU-x86_32-3.0.config diff -u SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -609,6 +609,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ Index: SOURCES/kernel-xenU-x86_64-3.0.config diff -u SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -797,6 +797,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-alpha-smp.config?r1=1.33.10.152&r2=1.33.10.153&f=u http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.144&r2=1.30.6.3.2.145&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.103&r2=1.59.10.104&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.108&r2=1.82.10.109&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64-smp.config?r1=1.1.2.21&r2=1.1.2.22&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64.config?r1=1.1.2.20&r2=1.1.2.21&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc-smp.config?r1=1.9.2.6.2.80&r2=1.9.2.6.2.81&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.109&r2=1.37.2.110&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64-smp.config?r1=1.48.2.95&r2=1.48.2.96&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.82&r2=1.48.2.83&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-2.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-3.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_64-3.0.config?r1=1.1.2.8&r2=1.1.2.9&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_32-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_64-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:59:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:10 2005 Subject: SPECS: msmtp.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:59:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: msmtp.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.49 SPECS/msmtp.spec:1.50 --- SPECS/msmtp.spec:1.49 Fri Aug 26 18:50:52 2005 +++ SPECS/msmtp.spec Fri Aug 26 19:59:31 2005 @@ -47,7 +47,8 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. +konfiguracyjnym) lub zrobienie dowi?zania symbolicznego do +/usr/sbin/sendmail. %prep %setup -q @@ -98,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/26 17:59:31 qboosh +- pl fix + Revision 1.49 2005/08/26 16:50:52 wolvverine - 1.4.4 - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.49&r2=1.50&f=u From glen at pld-linux.org Fri Aug 26 01:04:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES: mozillaOrgPerson.schema - it's actually v0.6.4 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:04:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - it's actually v0.6.4 ---- Files affected: SOURCES: mozillaOrgPerson.schema (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u SOURCES/mozillaOrgPerson.schema:1.1 SOURCES/mozillaOrgPerson.schema:1.2 --- SOURCES/mozillaOrgPerson.schema:1.1 Fri Aug 26 01:02:28 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:04:29 2005 @@ -1,5 +1,5 @@ # -# mozillaOrgPerson schema v. 0.6.3 +# mozillaOrgPerson schema v. 0.6.4 # # req. core @@ -174,4 +174,4 @@ mozillaCustom4 ) ) # not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' -# \ No newline at end of file +# ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mozillaOrgPerson.schema?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 01:02:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:10 2005 Subject: SOURCES: mozillaOrgPerson.schema (NEW) - saved v0.6.3 from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:02:33 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved v0.6.3 from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaOrgPerson.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u /dev/null SOURCES/mozillaOrgPerson.schema:1.1 --- /dev/null Fri Aug 26 01:02:33 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:02:28 2005 @@ -0,0 +1,177 @@ +# +# mozillaOrgPerson schema v. 0.6.3 +# + +# req. core +# req. cosine +# req. inetorgperson + +# attribute defs + +attributetype ( 1.3.6.1.4.1.13769.2.1.1 + NAME ( 'mozillaNickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.2 + NAME ( 'mozillaUseHtmlMail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.3 + NAME 'mozillaSecondEmail' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.4 + NAME 'mozillaHomeLocalityName' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.5 + NAME 'mozillaPostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.6 + NAME 'mozillaHomePostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.7 + NAME ( 'mozillaHomeState' ) SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.8 + NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.9 + NAME ( 'mozillaHomeCountryName' ) + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.10 + NAME ( 'mozillaHomeFriendlyCountryName' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.11 + NAME ( 'mozillaHomeUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.12 + NAME ( 'mozillaWorkUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# un-comment for all LDAP server NOT supporting SYNTAX 2.16.840.1.113730.3.7.1 +attributetype ( 1.3.6.1.4.1.13769.2.1.13 + NAME ( 'nsAIMid' ) + DESC 'AOL Instant Messenger (AIM) Identity' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.14 NAME ( 'mozillaHomeStreet' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +# un-comment for Netscape 6.x and all other LDAP server supporting SYNTAX 2.16.840.1.113730.3.7.1 +# attributeTypes ( 2.16.840.1.113730.3.1.2013 +# NAME ( 'nsAIMid' ) +# DESC 'AOL Instant Messenger (AIM) Identity' +# SYNTAX 2.16.840.1.113730.3.7.1 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.96 + NAME ( 'mozillaCustom1' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.97 + NAME ( 'mozillaCustom2' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.98 + NAME ( 'mozillaCustom3' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.99 + NAME ( 'mozillaCustom4' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# defined in "A Summary of the X.500(96) User Schema for use with LDAPv3" - RFC 2256 +# +# attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' ) +# DESC 'RFC2256: ISO-3166 country 2-letter code' +# SUP name SINGLE-VALUE ) + +# defined in "The COSINE and Internet X.500 Schema" - RFC 1274 +# +# attributetype ( 0.9.2342.19200300.100.1.43 +# NAME ( 'co' 'friendlyCountryName' ) +# DESC 'RFC1274: friendly country name' +# EQUALITY caseIgnoreMatch +# SUBSTR caseIgnoreSubstringsMatch +# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +# objectClass defs + +objectclass ( 1.3.6.1.4.1.13769.2.2.1 + NAME 'mozillaOrgPerson' + SUP top + AUXILIARY + MAY ( + sn $ + givenName $ + cn $ + displayName $ + mozillaNickname $ + title $ + telephoneNumber $ + facsimileTelephoneNumber $ + mobile $ + pager $ + homePhone $ + street $ + postalCode $ + mozillaPostalAddress2 $ + mozillaHomeStreet $ + mozillaHomePostalAddress2 $ + l $ + mozillaHomeLocalityName $ + st $ + mozillaHomeState $ + mozillaHomePostalCode $ + c $ + mozillaHomeCountryName $ + co $ + mozillaHomeFriendlyCountryName $ + ou $ + o $ + mail $ + mozillaSecondEmail $ + mozillaUseHtmlMail $ + nsAIMid $ + mozillaHomeUrl $ + mozillaWorkUrl $ + description $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 ) ) + +# not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' +# \ No newline at end of file ================================================================ From havner at pld-linux.org Fri Aug 26 16:07:08 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:14:10 2005 Subject: CVSROOT: users - ares's mail change (on his request) In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 14:07:08 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - ares's mail change (on his request) ---- Files affected: CVSROOT: users (1.386 -> 1.387) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.386 CVSROOT/users:1.387 --- CVSROOT/users:1.386 Fri Aug 26 12:39:16 2005 +++ CVSROOT/users Fri Aug 26 16:07:03 2005 @@ -14,7 +14,7 @@ arekm:miskiewicz@beep.pl:Arkadiusz Mi?kiewicz:arekm@jabber.bnet.pl arekmat:arekmat@amba.bydg.pdi.net:Arkadiusz Grz?dzicki areq:areq@areq.eu.org:Arkadiusz Patyk -ares:ares@betanet.pl:Piotr Siwicki +ares:p.siwicki@mpoczta.net:Piotr Siwicki arturs:arturs@linuxpl.org:Artur Skura averne:averne@pld-dc.org:Marcin Doli?ski:averne@kamp.pl baggins:baggins@sith.mimuw.edu.pl:Jan R?korajski ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.386&r2=1.387&f=u From glen at pld-linux.org Fri Aug 26 00:31:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: mozillaAddressBookEntry.schema (NEW) - saved from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 22:31:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaAddressBookEntry.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaAddressBookEntry.schema diff -u /dev/null SOURCES/mozillaAddressBookEntry.schema:1.1 --- /dev/null Fri Aug 26 00:31:11 2005 +++ SOURCES/mozillaAddressBookEntry.schema Fri Aug 26 00:31:06 2005 @@ -0,0 +1,147 @@ +# Mozilla: @VERSION@ +# +# mozillaAddressBookEntry +# +# This file contains LDAPv3 schema for use with the Mozilla Address Book +# and is intended to ... + +# Depends upon +# Definition of an X.500 Attribute Type and an Object Class to Hold +# Uniform Resource Identifiers (URIs) [RFC2079], and A Summary of +# the X.500(96) User Schema for use with LDAPv3 [RFC2256] (core.schema) +# +# The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema) +# +# The InetOrgPerson Schema [RFC2798] (inetorgperson.schema) + +# 1.3.6.1.4.1.13769.4.x - Mozilla AB 'Other' tab + +attributetype ( 1.3.6.1.4.1.13769.4.1 NAME 'mozillaCustom1' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.2 NAME 'mozillaCustom2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.3 NAME 'mozillaCustom3' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.4 NAME 'mozillaCustom4' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + + +# 1.3.6.1.4.1.13769.3.x - Mozilla AB 'Address' tab + +attributetype ( 1.3.6.1.4.1.13769.3.1 NAME 'mozillaHomeStreet' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.2 NAME 'mozillaHomeStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.3 NAME 'mozillaHomeLocalityName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.4 NAME 'mozillaHomeState' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.5 NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.6 NAME 'mozillaHomeCountryName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.7 NAME 'mozillaHomeUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.8 NAME 'mozillaWorkStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.9 NAME 'mozillaWorkUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +# 1.3.6.1.4.1.13769.2.x - Mozilla AB 'Contact' tab + +attributetype ( 1.3.6.1.4.1.13769.2.1 + NAME ( 'mozillaNickname' 'xmozillanickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.2 + NAME ( 'mozillaSecondEmail' 'xmozillasecondemail' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.3 + NAME ( 'mozillaUseHtmlMail' 'xmozillausehtmlmail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) + +# AOL Instant Messenger (AIM) Identity +attributetype ( 1.3.6.1.4.1.13769.2.4 + NAME ( 'nsAIMid' 'nscpaimscreenname' ) + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +# 1.3.6.1.4.1.13769.9 - Mozilla AB objectclasses + +# The mozillaAddressBookEntry object class is used to define entries +# representing Cards in the Mozilla Address Book. The commonName attribute +# is used for naming entries of this object class, but may not be unique. + +objectclass ( 1.3.6.1.4.1.13769.9.1 NAME 'mozillaAddressBookEntry' + SUP top AUXILIARY + MUST ( cn ) + MAY( c $ + department $ + description $ + fax $ + givenName $ + homeTelephoneNumber $ + l $ + mail $ + mobile $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 $ + mozillaHomeCountryName $ + mozillaHomeLocalityName $ + mozillaHomePostalCode $ + mozillaHomeState $ + mozillaHomeStreet $ + mozillaHomeStreet2 $ + mozillaHomeUrl $ + mozillaNickname $ + mozillaSecondeMail $ + mozillaUseHtmlMail $ + mozillaWorkStreet2 $ + mozillaWorkUrl $ + nsAIMid $ + o $ + ou $ + pager $ + postalCode $ + postOfficeBox $ + sn $ + st $ + street $ + telephoneNumber $ + title ) ) + ================================================================ From arekm at pld-linux.org Fri Aug 26 18:07:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: kdelibs.spec - rel 3; rebuild In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 16:07:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3; rebuild ---- Files affected: SPECS: kdelibs.spec (1.415 -> 1.416) ---- Diffs: ================================================================ Index: SPECS/kdelibs.spec diff -u SPECS/kdelibs.spec:1.415 SPECS/kdelibs.spec:1.416 --- SPECS/kdelibs.spec:1.415 Thu Aug 11 11:46:18 2005 +++ SPECS/kdelibs.spec Fri Aug 26 18:07:07 2005 @@ -21,7 +21,7 @@ Summary(uk): K Desktop Environment - ?????????? Name: kdelibs Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: LGPL Group: X11/Libraries @@ -959,6 +959,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.416 2005/08/26 16:07:07 arekm +- rel 3; rebuild + Revision 1.415 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.415&r2=1.416&f=u From jajcus at pld-linux.org Fri Aug 26 10:43:12 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: Zope3.spec (NEW) - new, based on Zope.spec, NFY In-Reply-To: References: Message-ID: Author: jajcus Date: Fri Aug 26 08:43:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new, based on Zope.spec, NFY ---- Files affected: SPECS: Zope3.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u /dev/null SPECS/Zope3.spec:1.1 --- /dev/null Fri Aug 26 10:43:12 2005 +++ SPECS/Zope3.spec Fri Aug 26 10:43:05 2005 @@ -0,0 +1,255 @@ +# $Revision$, $Date$ + +Summary: An application server and portal toolkit for building Web sites +Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web +Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW +Summary(pt_BR): Um servidor de aplica??es e um conjunto de ferramentas para constru??o de sites Web +Name: Zope3 +Version: 3.1.0 +%define sub_ver c1 +Release: 0.%{sub_ver}.0.1 +License: Zope Public License (ZPL) +Group: Networking/Daemons +Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz +# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +Source1: %{name}.init +Source2: %{name}.sysconfig +Source3: %{name}.logrotate +URL: http://dev.zope.org/Zope3 +BuildRequires: python-devel >= 1:2.4.1 +BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.213 +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(post,preun): /sbin/chkconfig +Requires: expat >= 1.95.7 +Requires: logrotate +Requires: python >= 2.4.1 +Requires: python-modules >= 2.4.1 +Requires: python-libs >= 2.4.1 +Requires: python-zope-interface = %{epoch}:%{version}-%{release} +%pyrequires_eq python +Provides: group(zope) +Provides: user(zope) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define zope_dir /usr/lib/zope3 + +%description +The Z Object Programming Environment (Zope) is a free, Open Source +Python-based application server for building high-performance, dynamic +web sites, using a powerful and simple scripting object model and +high-performance, integrated object database. + +This project is a redesign of Zope 2 and seeks to improve the Zope development +experience through the use of Interfaces and Components. + +%description -l es +Zope es una aplicaci?n basada en Python, Open Source[tm], para la +construcci?n de sitios din?micos, usa un modelo de escritura de +guiones poderoso y sencillo. Para instalar la aplicaci?n Zope, instale +ese paquete y despu?s, Zope-server, para un servidor HTTP integrado +simple, Zope-pcgi, para uso con el servidor Apache. Si desea instalar +solamente algunas partes de la aplicaci?n Zope, est?n diponibles otros +subpaquetes, usted debe instalar ?stos en vez de ese RPM. + +%description -l pl +Zope (Z Object Programming Environment - Obiektowe ?rodowisko +Programistyczne Z) jest opartym o Pythona serwerem aplikacji do +tworzenia wysoko wydajnych, dynamicznych serwis?w WWW, przy u?yciu +u?ytecznego i prostego modelu obiektowego skrypt?w oraz wysoko +wydajnej zintegrowanej obiektowej bazy danych. + +%description -l pt_BR +Zope ? uma aplica??o baseada em Python, Open Source[tm], para +constru??o de sites din?micos, usando um modelo de scripting poderoso +e simples Para instalar o Zope, instale esse pacote e depois, ou o +Zope-server, para um servidor HTTP integrado simples, ou Zope-pcgi, +para uso com o Apache. Se voc? quiser instalar apenas algumas partes +do Zope, outros sub-pacotes est?o dispon?veis, e voc? deveria instalar +eles ao inv?s desse RPM. + +%package -n python-zope +Summary: Python packages developed as part of the Zope 3 project. +Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Group: Development/Tools +Obsoletes: ZopeInterface +Provides: ZopeInterface +Provides: python-zope-cachedescriptors +Provides: python-zope-component +Provides: python-zope-configuration +Provides: python-zope-deprecation +Provides: python-zope-documenttemplate +Provides: python-zope-event +Provides: python-zope-exceptions +Provides: python-zope-hookable +Provides: python-zope-i18n +Provides: python-zope-i18nmessageid +Provides: python-zope-index +Provides: python-zope-interface +Provides: python-zope-modulealias +Provides: python-zope-pagetemplate +Provides: python-zope-proxy +Provides: python-zope-publisher +Provides: python-zope-schema +Provides: python-zope-security +Provides: python-zope-server +Provides: python-zope-structuredtext +Provides: python-zope-tal +Provides: python-zope-tales +Provides: python-zope-testing +Provides: python-zope-thread + +%description -n python-zope +The "zope" package is a pure namespace package holding packages developed as +part of the Zope 3 project. + +Generally, the immediate subpackages of the "zope" package should be useful and +usable outside of the Zope application server. Subpackages of the "zope" +package should have minimal interdependencies, although most depend on +"zope.interface". + +%prep +%setup -q -n Zope-%{version}%{sub_ver} + +%build +./configure \ + --prefix=%{zope_dir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT{%{py_sitedir},%{_sbindir}} \ + $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ + $RPM_BUILD_ROOT{/var/lib/zope3/main,/var/run/zope3,/var/log/zope3/main} \ + $RPM_BUILD_ROOT%{_sysconfdir}/zope3/main + +python install.py -q install --skip-build --home "%{zope_dir}" --root "$RPM_BUILD_ROOT" +mv $RPM_BUILD_ROOT%{zope_dir}/lib/python/zope $RPM_BUILD_ROOT%{py_sitedir} + +find $RPM_BUILD_ROOT%{py_sitedir}/zope -name '*.txt' -o -name '*.cfg' | xargs rm + +%py_comp $RPM_BUILD_ROOT%{py_sitedir}/zope +%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/zope + +ln -sf %{zope_dir}/bin/mkzopeinstance $RPM_BUILD_ROOT%{_sbindir}/mkzope3instance +for f in zconfig zconfig_schema2html zopetest ; do + ln -sf %{zope_dir}/bin/"$f" $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done +for f in mkzeoinst runzeo zdctl zdrun zeoctl zeopasswd ; do + ln -sf %{zope_dir}/bin/"$f".py $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done + +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/zope3 +install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/zope3 +install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/zope3 + +touch $RPM_BUILD_ROOT/var/log/zope3/main/event.log +touch $RPM_BUILD_ROOT/var/log/zope3/main/Z2.log + + +#install -d $RPM_BUILD_ROOT{/var/lib/zope/main,/var/run/zope,/var/log/zope/main} \ +# $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ +# $RPM_BUILD_ROOT{%{_sysconfdir}/zope/main,%{_sbindir}} \ +# $RPM_BUILD_ROOT%{zope_dir}/bin +# +#ln -sfn /usr/bin/python $RPM_BUILD_ROOT%{zope_dir}/bin/python +# +#%{__make} install \ +# INSTALL_FLAGS="--root $RPM_BUILD_ROOT" +# +#mv $RPM_BUILD_ROOT%{zope_dir}/bin/zpasswd.py $RPM_BUILD_ROOT%{_sbindir}/zpasswd +#mv $RPM_BUILD_ROOT%{zope_dir}/skel $RPM_BUILD_ROOT%{_sysconfdir}/zope +#mv $RPM_BUILD_ROOT{%{zope_dir}/import/*,%{_sysconfdir}/zope/skel/import} +# +#rm -rf $RPM_BUILD_ROOT%{zope_dir}/doc +#rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/log +#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/bin/{runzope.bat,zopeservice.py}.in +# +#install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/mkzopeinstance +#install %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}/mkzeoinstance +#install %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/runzope +#install %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/zopectl +#install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/installzopeproduct +# + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +%groupadd -g 112 zope +%useradd -u 112 -d /var/lib/zope/main -s /bin/false -c "Zope User" -g zope zope + +%post +/sbin/chkconfig --add zope +if [ ! -f /etc/zope/main/zope.conf ] ; then + echo "Creating initial 'main' instance..." + /usr/sbin/mkzope3instance main zope:zope + echo "Instance created. Listening on 127.0.0.1:8080, initial user: 'zope' with password: 'zope'" +fi + +%preun +if [ "$1" = "0" ]; then + if [ -f /var/lock/subsys/zope ]; then + /etc/rc.d/init.d/zope stop + fi + /sbin/chkconfig --del zope +fi + +%postun +if [ "$1" = "0" ] ; then + %userremove zope + %groupremove zope +fi + +%files +%defattr(644,root,root,755) +%doc Zope/doc/* +%attr(754,root,root) /etc/rc.d/init.d/zope3 +%attr(755,root,root) %{_sbindir}/* +%dir %{zope_dir} +%dir %{zope_dir}/bin +%attr(755,root,root) %{zope_dir}/bin/* +%{zope_dir}/include +%{zope_dir}/lib +%dir %{zope_dir}/zopeskel +%dir %{zope_dir}/zopeskel/bin +%attr(755,root,root) %{zope_dir}/zopeskel/bin/* +%{zope_dir}/zopeskel/etc +%{zope_dir}/zopeskel/lib +%{zope_dir}/zopeskel/log +%{zope_dir}/zopeskel/var +%{zope_dir}/zopeskel/README.txt +%{py_sitedir}/zope/app +%attr(775,zope,zope) %dir /var/run/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3/main +%attr(775,zope,zope) %dir /var/log/zope3 +%attr(775,zope,zope) %dir /var/log/zope3/main +%attr(640,root,root) %dir /etc/zope3 +%attr(640,root,root) %dir /etc/zope3/main +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/zope3 +%attr(640,root,root) /etc/sysconfig/zope3 +%ghost /var/log/zope3/main/event.log +%ghost /var/log/zope3/main/Z2.log + +%files -n python-zope +%defattr(644,root,root,755) +%{py_sitedir}/zope +%exclude %{py_sitedir}/zope/app + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/26 08:43:05 jajcus +- new, based on Zope.spec, NFY + ================================================================ From baggins at pld-linux.org Fri Aug 26 17:54:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES (LINUX_2_6): kernel-netfilter.config CONFIG_IP_NF_PPTP dis... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:54:53 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_IP_NF_PPTP disabled as it's sure to cause Oops ---- Files affected: SOURCES: kernel-netfilter.config (1.34.2.43 -> 1.34.2.44) ---- Diffs: ================================================================ Index: SOURCES/kernel-netfilter.config diff -u SOURCES/kernel-netfilter.config:1.34.2.43 SOURCES/kernel-netfilter.config:1.34.2.44 --- SOURCES/kernel-netfilter.config:1.34.2.43 Thu Jul 28 22:33:41 2005 +++ SOURCES/kernel-netfilter.config Fri Aug 26 17:54:48 2005 @@ -77,8 +77,8 @@ CONFIG_IP_NF_NAT_H323=m CONFIG_IP_NF_H323=m CONFIG_IP_NF_CT_PROTO_GRE=m -CONFIG_IP_NF_PPTP=m -CONFIG_IP_NF_NAT_PPTP=m +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_NAT_PPTP is not set CONFIG_IP_NF_NAT_PROTO_GRE=m CONFIG_IP_NF_MATCH_IPV4OPTIONS=m CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP=m ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.43&r2=1.34.2.44&f=u From paszczus at pld-linux.org Fri Aug 26 16:33:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: ocaml-lablgl.spec - rel up for rebuild with ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:33:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel up for rebuild with ocaml 3.08.4 ---- Files affected: SPECS: ocaml-lablgl.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.18 SPECS/ocaml-lablgl.spec:1.19 --- SPECS/ocaml-lablgl.spec:1.18 Thu Mar 17 09:36:09 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:32:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Wi?zania OpenGL dla OCamla Name: ocaml-lablgl Version: 1.01 -Release: 3 +Release: 4 License: BSD Group: Libraries Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/26 14:32:56 paszczus +- rel up for rebuild with ocaml 3.08.4 + Revision 1.18 2005/03/17 08:36:09 paszczus - release up for rebuild with ocaml ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.18&r2=1.19&f=u From adamg at pld-linux.org Fri Aug 26 18:25:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:14:11 2005 Subject: admin: distfiles/README, distfiles/file-fetcher.pl - Don't check t... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:25:17 2005 GMT Module: admin Tag: HEAD ---- Log message: - Don't check the server certificate against the available certificate authorities (wget 1.10 refused to download lkcp sources) ---- Files affected: admin/distfiles: README (1.2 -> 1.3) , file-fetcher.pl (1.38 -> 1.39) ---- Diffs: ================================================================ Index: admin/distfiles/README diff -u admin/distfiles/README:1.2 admin/distfiles/README:1.3 --- admin/distfiles/README:1.2 Tue May 27 03:33:29 2003 +++ admin/distfiles/README Fri Aug 26 18:25:12 2005 @@ -1,6 +1,8 @@ Skrypty w tym katalogu zawieraj? automatyczny zasysacz plik?w do repozytorium distfiles. +Wymagania: wget >= 1.10 + Jak to dzia?a? S? dwie cz??ci: ================================================================ Index: admin/distfiles/file-fetcher.pl diff -u admin/distfiles/file-fetcher.pl:1.38 admin/distfiles/file-fetcher.pl:1.39 --- admin/distfiles/file-fetcher.pl:1.38 Thu Feb 3 18:20:47 2005 +++ admin/distfiles/file-fetcher.pl Fri Aug 26 18:25:12 2005 @@ -212,8 +212,8 @@ my $all_out = ""; my $bn = basename($url); my $local = "$tmp_dir/$md5/$bn"; - my $cmd = "wget -nv -O $local \"$url\""; - my $cmd2 = "wget -nv --passive-ftp -O $local \"$url\""; + my $cmd = "wget -nv --no-check-certificate -O $local \"$url\""; + my $cmd2 = "wget -nv --no-check-certificate --passive-ftp -O $local \"$url\""; push @files, $bn; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/admin/distfiles/README?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/admin/distfiles/file-fetcher.pl?r1=1.38&r2=1.39&f=u From mguevara at pld-linux.org Fri Aug 26 01:59:46 2005 From: mguevara at pld-linux.org (mguevara) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS (LINUX_2_6): kernel.spec - patch 145 linux-2.6-cx88-blackbir... In-Reply-To: References: Message-ID: Author: mguevara Date: Thu Aug 25 23:59:46 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) - rel 0.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1165 -> 1.441.2.1166) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1165 SPECS/kernel.spec:1.441.2.1166 --- SPECS/kernel.spec:1.441.2.1165 Thu Aug 25 19:09:47 2005 +++ SPECS/kernel.spec Fri Aug 26 01:59:40 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.3 +%define _rel 0.4 %define _netfilter_snap 20050801 @@ -260,6 +260,9 @@ # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch +# derived from http://www.spinics.net/lists/vfl/msg15217.html +Patch145: linux-2.6-cx88-blackbird.patch + # derived from http://www.grsecurity.net/grsecurity-2.1.5-2.6.11.7-200504111924.patch.gz Patch200: grsecurity-2.1.5-2.6.11.7-200504111924.patch # http://openmosix.snarc.org/files/releases/2.6/ @@ -698,6 +701,7 @@ %if %{with abi} %patch135 -p1 %endif +%patch145 -p0 %endif %if %{with grsecurity} @@ -1486,6 +1490,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara +- patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird + based tv tuner cards (Winfast PVR2000) +- rel 0.4 + Revision 1.441.2.1165 2005/08/25 17:09:47 baggins - ATM TODO done ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1165&r2=1.441.2.1166&f=u From glen at pld-linux.org Fri Aug 26 01:05:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec (NEW) - created In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:05:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u /dev/null SPECS/openldap-schema-mozillaorgperson.spec:1.1 --- /dev/null Fri Aug 26 01:05:12 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Fri Aug 26 01:05:07 2005 @@ -0,0 +1,82 @@ +# $Revision$, $Date$ +Summary: Mozilla LDAP schema +Name: openldap-schema-mozillaorgperson +Version: 0.6.3 +Release: 0.2 +Epoch: 0 +License: ? +Group: Networking/Daemons +Source0: mozillaOrgPerson.schema +URL: https://bugzilla.mozilla.org/show_bug.cgi?id=116692 +Requires(post,postun): sed >= 4.0 +Requires: openldap-servers +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define schemadir /usr/share/openldap/schema + +%description +This package contains LDAPv3 schema for use with the Mozilla Address +Book. + +%prep +%setup -q -c -T +cp %{SOURCE0} . + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{schemadir} + +install *.schema $RPM_BUILD_ROOT%{schemadir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if ! grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*local.schema/{ + i\ +include %{schemadir}/mozillaOrgPerson.schema + } + + # enable dependant schemas: cosine, inetorgperson and core + /^#include.*\(cosine\|inetorgperson\|core\)\.schema/{ + s/^#// + } + ' /etc/openldap/slapd.conf +fi + +if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : +fi + +%postun +if [ "$1" = "0" ]; then + if grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*\/usr\/share\/openldap\/schema\/mozillaOrgPerson\.schema/d + + # for symmetry it would be nice if we disable enabled schemas in post, + # but we really can not do that, it would break something else. + ' /etc/openldap/slapd.conf + fi + + if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : + fi +fi + +%files +%defattr(644,root,root,755) +%{schemadir}/*.schema + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 23:05:07 glen +- created + ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:18:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: pcre-cxx.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:18:31 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pcre-cxx.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From andree at pld-linux.org Fri Aug 26 20:19:30 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: clamsmtp.spec - updated to 1.5 In-Reply-To: References: Message-ID: Author: andree Date: Fri Aug 26 18:19:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5 ---- Files affected: SPECS: clamsmtp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/clamsmtp.spec diff -u SPECS/clamsmtp.spec:1.14 SPECS/clamsmtp.spec:1.15 --- SPECS/clamsmtp.spec:1.14 Fri May 13 01:25:48 2005 +++ SPECS/clamsmtp.spec Fri Aug 26 20:19:22 2005 @@ -2,12 +2,12 @@ Summary: clamav-based antivirus SMTP-level gateway Summary(pl): Oparta na clamavie bramka antywirusowa SMTP Name: clamsmtp -Version: 1.4.1 +Version: 1.5 Release: 1 License: BSD Group: Applications/Networking Source0: http://memberwebs.com/nielsen/software/clamsmtp/%{name}-%{version}.tar.gz -# Source0-md5: 4eb6311f5f46bf76e9b7490247ba59ed +# Source0-md5: 521e43f5872cab8e53c21285041a759f Source1: %{name}.init Patch0: %{name}-config.patch URL: http://memberwebs.com/nielsen/software/clamsmtp/ @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/26 18:19:22 andree +- updated to 1.5 + Revision 1.14 2005/05/12 23:25:48 zbyniu - up to 1.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamsmtp.spec?r1=1.14&r2=1.15&f=u From andree at pld-linux.org Fri Aug 26 20:19:42 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:14:11 2005 Subject: DISTFILES: clamsmtp-1.5.tar.gz Message-ID: <4034.1125080382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-1.5.tar.gz 521e43f5872cab8e53c21285041a759f clamsmtp-1.5.tar.gz Size: 148067 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 20:20:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: evolution-data-server.spec - pl for openldap-schema- In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:20:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for openldap-schema- ---- Files affected: SPECS: evolution-data-server.spec (1.54 -> 1.55) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.54 SPECS/evolution-data-server.spec:1.55 --- SPECS/evolution-data-server.spec:1.54 Sat Aug 20 14:36:25 2005 +++ SPECS/evolution-data-server.spec Fri Aug 26 20:20:52 2005 @@ -56,12 +56,16 @@ %package -n openldap-schema-evolutionperson Summary: evolutionperson LDAP schema +Summary(pl): Schemat LDAP evolutionperson Group: Networking/Daemons Requires(post,postun): sed >= 4.0 Requires: openldap-servers %description -n openldap-schema-evolutionperson -This package contains evolutionperson.schema for openldap. +This package contains evolutionperson.schema for openldap server. + +%description -n openldap-schema-evolutionperson -l pl +Ten pakiet zawiera evolutionperson.schema dla serwera openldap. %package devel Summary: Evolution data server development files @@ -180,7 +184,7 @@ fi if [ -f /var/lock/subsys/ldap ]; then - /etc/rc.d/init.d/ldap restart >&2 + /etc/rc.d/init.d/ldap restart >&2 fi %postun -n openldap-schema-evolutionperson @@ -243,6 +247,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.55 2005/08/26 18:20:52 qboosh +- pl for openldap-schema- + Revision 1.54 2005/08/20 12:36:25 glen - created openldap-schema-evolutionperson subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.54&r2=1.55&f=u From arekm at pld-linux.org Thu Aug 25 19:26:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES (DEVEL): php-lib64.patch - up for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:26:25 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for php 5.1 ---- Files affected: SOURCES: php-lib64.patch (1.10 -> 1.10.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10 SOURCES/php-lib64.patch:1.10.4.1 --- SOURCES/php-lib64.patch:1.10 Tue Mar 15 18:38:12 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 19:26:19 2005 @@ -1,455 +1,12 @@ -diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4 ---- php-5.0.4RC1.orig/acinclude.m4 2005-03-15 18:21:05.158404416 +0100 -+++ php-5.0.4RC1/acinclude.m4 2005-03-15 18:22:03.101595712 +0100 -@@ -1723,6 +1723,9 @@ - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib - fi -+ if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then -+ OPENSSL_LIBDIR=$i/lib64 -+ fi - test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break - done - -diff -burN php-5.0.4RC1.orig/ext/cpdf/config.m4 php-5.0.4RC1/ext/cpdf/config.m4 ---- php-5.0.4RC1.orig/ext/cpdf/config.m4 2005-03-15 18:21:04.537498808 +0100 -+++ php-5.0.4RC1/ext/cpdf/config.m4 2005-03-15 18:23:06.693928208 +0100 -@@ -4,7 +4,7 @@ - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then -+ if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then - CPDF_JPEG_DIR=$i - break; - fi -@@ -13,11 +13,11 @@ - AC_MSG_ERROR([libjpeg.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_JPEG_DIR/lib -+ -L$CPDF_JPEG_DIR/lib64 - ]) - ],) - ]) -@@ -26,7 +26,7 @@ - AC_ARG_WITH(tiff-dir, - [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then -+ if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then - CPDF_TIFF_DIR=$i - break; - fi -@@ -35,11 +35,11 @@ - AC_MSG_ERROR([libtiff.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ -- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_TIFF_DIR/lib -+ -L$CPDF_TIFF_DIR/lib64 - ]) - ],) - ]) -@@ -65,13 +65,13 @@ - ], [ - AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - -- PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD) - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) - break -diff -burN php-5.0.4RC1.orig/ext/dba/config.m4 php-5.0.4RC1/ext/dba/config.m4 ---- php-5.0.4RC1.orig/ext/dba/config.m4 2005-03-15 18:21:04.484506864 +0100 -+++ php-5.0.4RC1/ext/dba/config.m4 2005-03-15 18:22:03.103595408 +0100 -@@ -21,7 +21,7 @@ - dnl Assign INCLUDE/LFLAGS from PREFIX - AC_DEFUN([PHP_DBA_STD_ASSIGN],[ - if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then -- THIS_LFLAGS=$THIS_PREFIX/lib -+ THIS_LFLAGS=$THIS_PREFIX/lib64 - fi - ]) - -@@ -120,7 +120,7 @@ - AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) - THIS_LIBS=gdbm -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - fi - - PHP_DBA_STD_ASSIGN -@@ -152,7 +152,7 @@ - AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_NDBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -170,8 +170,8 @@ - dnl parameters(version, library list, function) - AC_DEFUN([PHP_DBA_DB_CHECK],[ - for LIB in $2; do -- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then -- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ -+ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then -+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ - AC_TRY_LINK([ - #include "$THIS_INCLUDE" - ],[ -@@ -366,7 +366,7 @@ - fi - AC_DEFINE(DBA_DBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -408,7 +408,7 @@ - AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_CDB, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -diff -burN php-5.0.4RC1.orig/ext/gd/config.m4 php-5.0.4RC1/ext/gd/config.m4 ---- php-5.0.4RC1.orig/ext/gd/config.m4 2005-03-15 18:21:04.469509144 +0100 -+++ php-5.0.4RC1/ext/gd/config.m4 2005-03-15 18:22:03.104595256 +0100 -@@ -51,7 +51,7 @@ - if test "$PHP_JPEG_DIR" != "no"; then - - for i in $PHP_JPEG_DIR /usr/local /usr; do -- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break -+ test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break - done - - if test -z "$GD_JPEG_DIR"; then -@@ -61,11 +61,11 @@ - PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, - [ - PHP_ADD_INCLUDE($GD_JPEG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_JPEG_DIR/lib -+ -L$GD_JPEG_DIR/lib64 - ]) - else - AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) -@@ -76,7 +76,7 @@ - if test "$PHP_PNG_DIR" != "no"; then - - for i in $PHP_PNG_DIR /usr/local /usr; do -- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break -+ test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break - done - - if test -z "$GD_PNG_DIR"; then -@@ -94,12 +94,12 @@ - PHP_CHECK_LIBRARY(png,png_write_image, - [ - PHP_ADD_INCLUDE($GD_PNG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) - ],[ -- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib -+ -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64 - ]) - - else -@@ -111,7 +111,7 @@ - if test "$PHP_XPM_DIR" != "no"; then - - for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do -- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break -+ test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break - done - - if test -z "$GD_XPM_DIR"; then -@@ -129,12 +129,12 @@ - PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, - [ - PHP_ADD_INCLUDE($GD_XPM_INC) -- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_XPM_DIR/lib -lX11 -+ -L$GD_XPM_DIR/lib64 -lX11 - ]) - else - AC_MSG_RESULT(If configure fails try --with-xpm-dir=) -@@ -163,7 +163,7 @@ - fi - if test -n "$TTF_DIR" ; then - AC_DEFINE(HAVE_LIBTTF,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD) - fi - if test -z "$TTF_INC_DIR"; then - TTF_INC_DIR=$TTF_DIR/include -@@ -188,7 +188,7 @@ - done - - if test -n "$FREETYPE2_DIR" ; then -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD) - PHP_ADD_INCLUDE($FREETYPE2_DIR/include) - PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) - AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -@@ -216,11 +216,11 @@ - [ - AC_DEFINE(HAVE_LIBT1,1,[ ]) - PHP_ADD_INCLUDE($GD_T1_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_T1_DIR/lib -+ -L$GD_T1_DIR/lib64 - ]) - fi - ]) -@@ -365,7 +365,7 @@ - done - - dnl Library path -- for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do -+ for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do - test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" - done - -diff -burN php-5.0.4RC1.orig/ext/imap/config.m4 php-5.0.4RC1/ext/imap/config.m4 ---- php-5.0.4RC1.orig/ext/imap/config.m4 2005-03-15 18:21:04.545497592 +0100 -+++ php-5.0.4RC1/ext/imap/config.m4 2005-03-15 18:22:03.105595104 +0100 -@@ -148,13 +148,13 @@ - - if test -r "$IMAP_DIR/c-client/c-client.a"; then - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -+ elif test -r "$IMAP_DIR/lib64/c-client.a"; then -+ ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1 - fi - - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib -- IMAP_LIB_CHK(lib) -+ IMAP_LIB_CHK(lib64) - IMAP_LIB_CHK(c-client) - done - -diff -burN php-5.0.4RC1.orig/ext/ldap/config.m4 php-5.0.4RC1/ext/ldap/config.m4 ---- php-5.0.4RC1.orig/ext/ldap/config.m4 2005-03-15 18:21:04.551496680 +0100 -+++ php-5.0.4RC1/ext/ldap/config.m4 2005-03-15 18:22:03.107594800 +0100 -@@ -6,15 +6,15 @@ - if test -f $1/include/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/include/umich-ldap/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include/umich-ldap -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/ldap/public/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/ldap/public -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - fi - ]) - -diff -burN php-5.0.4RC1.orig/ext/ming/config.m4 php-5.0.4RC1/ext/ming/config.m4 ---- php-5.0.4RC1.orig/ext/ming/config.m4 2005-03-15 18:21:04.555496072 +0100 -+++ php-5.0.4RC1/ext/ming/config.m4 2005-03-15 18:22:03.108594648 +0100 +diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 +--- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) for i in $PHP_MING /usr/local /usr; do - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then -+ if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then ++ if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libming.a; then MING_DIR=$i break fi -@@ -34,11 +34,11 @@ - ],[ - AC_MSG_ERROR([Ming library 0.2a or greater required.]) - ],[ -- -L$MING_DIR/lib -+ -L$MING_DIR/lib64 - ]) - - PHP_ADD_INCLUDE($MING_INC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) - - AC_MSG_CHECKING([for destroySWFBlock]) - AC_TRY_RUN([ -diff -burN php-5.0.4RC1.orig/ext/mssql/config.m4 php-5.0.4RC1/ext/mssql/config.m4 ---- php-5.0.4RC1.orig/ext/mssql/config.m4 2005-03-15 18:21:04.646482240 +0100 -+++ php-5.0.4RC1/ext/mssql/config.m4 2005-03-15 18:22:03.108594648 +0100 -@@ -32,12 +32,12 @@ - fi - fi - -- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then -- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) -+ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then -+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so]) - fi - - MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include -- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib -+ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 - - PHP_ADD_INCLUDE($MSSQL_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) -diff -burN php-5.0.4RC1.orig/ext/mysql/config.m4 php-5.0.4RC1/ext/mysql/config.m4 ---- php-5.0.4RC1.orig/ext/mysql/config.m4 2005-03-15 18:21:04.649481784 +0100 -+++ php-5.0.4RC1/ext/mysql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -17,7 +17,7 @@ - /var/run/mysqld/mysqld.sock \ - /var/tmp/mysql.sock \ - /var/run/mysql/mysql.sock \ -- /var/lib/mysql/mysql.sock \ -+ /var/lib64/mysql/mysql.sock \ - /var/mysql/mysql.sock \ - /usr/local/mysql/var/mysql.sock \ - /Private/tmp/mysql.sock \ -@@ -84,7 +84,7 @@ - Note that the MySQL client library is not bundled anymore.]) - fi - -- for i in lib lib/mysql; do -+ for i in lib64 lib64/mysql; do - MYSQL_LIB_CHK($i) - done - -@@ -100,9 +100,9 @@ - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ - AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) - ], [ -- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR -+ -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR - ]) -- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" -+ MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" - else - PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ -diff -burN php-5.0.4RC1.orig/ext/pgsql/config.m4 php-5.0.4RC1/ext/pgsql/config.m4 ---- php-5.0.4RC1.orig/ext/pgsql/config.m4 2005-03-15 18:21:04.658480416 +0100 -+++ php-5.0.4RC1/ext/pgsql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -44,7 +44,7 @@ - fi - done - -- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do -+ for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi -diff -burN php-5.0.4RC1.orig/ext/xml/config.m4 php-5.0.4RC1/ext/xml/config.m4 ---- php-5.0.4RC1.orig/ext/xml/config.m4 2005-03-15 18:21:04.530499872 +0100 -+++ php-5.0.4RC1/ext/xml/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -30,7 +30,7 @@ - dnl - if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR; do -- if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then -+ if test -f "$i/lib64/libexpat.a" -o -f "$i/lib64/libexpat.$SHLIB_SUFFIX_NAME"; then - EXPAT_DIR=$i - break - fi -@@ -41,7 +41,7 @@ - fi - - PHP_ADD_INCLUDE($EXPAT_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - fi - -diff -burN php-5.0.4RC1.orig/ext/xmlrpc/config.m4 php-5.0.4RC1/ext/xmlrpc/config.m4 ---- php-5.0.4RC1.orig/ext/xmlrpc/config.m4 2005-03-15 18:21:04.902443328 +0100 -+++ php-5.0.4RC1/ext/xmlrpc/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -23,9 +23,9 @@ - - testval=no - for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then -+ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then - AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) - PHP_ADD_INCLUDE($i/include) - testval=yes - break -@@ -90,6 +90,6 @@ - PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) - XMLRPC_MODULE_TYPE=external - PHP_ADD_INCLUDE($XMLRPC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) - fi - -diff -burN php-5.0.4RC1.orig/php.ini php-5.0.4RC1/php.ini ---- php-5.0.4RC1.orig/php.ini 2005-03-15 18:21:05.162403808 +0100 -+++ php-5.0.4RC1/php.ini 2005-03-15 18:22:03.111594192 +0100 -@@ -514,7 +514,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "/usr/lib/php" -+extension_dir = "/usr/lib64/php" - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -diff -burN php-5.0.4RC1.orig/scripts/Makefile.frag php-5.0.4RC1/scripts/Makefile.frag ---- php-5.0.4RC1.orig/scripts/Makefile.frag 2005-03-15 18:21:05.145406392 +0100 -+++ php-5.0.4RC1/scripts/Makefile.frag 2005-03-15 18:22:03.112594040 +0100 -@@ -4,7 +4,7 @@ - # - - phpincludedir = $(includedir)/php --phpbuilddir = $(prefix)/lib/php/build -+phpbuilddir = $(libdir)/php/build - - BUILD_FILES = \ - scripts/phpize.m4 \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10&r2=1.10.4.1&f=u From cvs at pld-linux.org Fri Aug 26 15:47:01 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:14:11 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6335@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:47:00 2005 New Revision: 6335 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:47:00 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From megabajt at pld-linux.org Fri Aug 26 16:53:18 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: GeoIP.spec - up to 1.3.13 In-Reply-To: References: Message-ID: Author: megabajt Date: Fri Aug 26 14:53:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.3.13 ---- Files affected: SPECS: GeoIP.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/GeoIP.spec diff -u SPECS/GeoIP.spec:1.20 SPECS/GeoIP.spec:1.21 --- SPECS/GeoIP.spec:1.20 Mon Jul 25 11:10:57 2005 +++ SPECS/GeoIP.spec Fri Aug 26 16:53:12 2005 @@ -2,12 +2,12 @@ Summary: Library to find what country an IP address or hostnames originate from Summary(pl): Biblioteka do sprawdzenia z jakiego kraju pochodzi adres IP lub domena Name: GeoIP -Version: 1.3.12 +Version: 1.3.13 Release: 1 License: GPL v2 Group: Libraries Source0: http://www.maxmind.com/download/geoip/api/c/%{name}-%{version}.tar.gz -# Source0-md5: a22ae6197c3bbe280dbc4055cc29ec1f +# Source0-md5: 59fc9a6adfbde13cee33c88668f3f400 # note: "c" is a filename, do not add '/' URL: http://www.maxmind.com/app/c BuildRequires: autoconf @@ -119,6 +119,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/26 14:53:12 megabajt +- up to 1.3.13 + Revision 1.20 2005/07/25 09:10:57 blekot - up to 1.3.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GeoIP.spec?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Fri Aug 26 11:43:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: kdepim-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:43:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdepim-branch.diff (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SOURCES/kdepim-branch.diff diff -u SOURCES/kdepim-branch.diff:1.8 SOURCES/kdepim-branch.diff:1.9 --- SOURCES/kdepim-branch.diff:1.8 Tue Aug 2 08:09:29 2005 +++ SOURCES/kdepim-branch.diff Fri Aug 26 11:43:22 2005 @@ -1,7 +1,56 @@ +Index: akregator/src/pageviewer.cpp +=================================================================== +--- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -361,7 +361,7 @@ + if (copylinkaddress) + { + copylinkaddress->plug( &popup); +- popup.insertSeparator(); ++ //popup.insertSeparator(); + } + } + else // we are not on a link +Index: kresources/egroupware/kabc_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kabc_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kabc_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/knotes_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/knotes_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/knotes_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/kcal_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kcal_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kcal_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) Index: kresources/exchange/exchange.desktop =================================================================== ---- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -17,6 +17,7 @@ Name[et]=Exchange 2000 server Name[eu]=Exchange 2000 zerbitzaria @@ -12,8 +61,8 @@ Name[is]=Exchange 2000 ??j??nn Index: kresources/slox/kcal_slox.desktop =================================================================== ---- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -24,8 +73,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/slox/webdavhandler.cpp =================================================================== ---- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,8 @@ #endif #endif @@ -55,8 +104,8 @@ } Index: kresources/slox/kabc_slox.desktop =================================================================== ---- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -67,8 +116,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/groupdav/kabc_groupdav.desktop =================================================================== ---- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -79,8 +128,8 @@ Name[it]=Server GroupDAV (per es. OpenGroupware) Index: kresources/groupdav/kcal_groupdav.desktop =================================================================== ---- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -89,10 +138,46 @@ Name[hu]=GroupDAV-kiszolg??l?? (pl. OpenGroupware) Name[is]=GroupDAV ??j??nn (t.d. OpenGroupware) Name[it]=Server GroupDAV (per es. OpenGroupware) +Index: kresources/kolab/kabc/kolab.desktop +=================================================================== +--- kresources/kolab/kabc/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Aadressiraamat IMAP-serveril (KMaili vahendusel) + Name[eu]=Helbide-liburua IMAP zerbitzarian KMail-en bidez + Name[fr]=Carnet d'adresse sur serveur IMAP (via KMail) ++Name[ga]=Leabhar Seolta?? ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt c??mjegyz??k a KMailen kereszt??l + Name[is]=Vistfangaskr?? ?? IMAP ??j??ni gegnum KMail + Name[it]=Rubrica indirizzi su server IMAP via KMail +Index: kresources/kolab/knotes/kolabresource.desktop +=================================================================== +--- kresources/kolab/knotes/kolabresource.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/knotes/kolabresource.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=IMAP-server (KMaili vahendusel) + Name[eu]=IMAP zerbitzaria KMail-en bidez + Name[fr]=Serveur IMAP (via KMail) ++Name[ga]=Freastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l?? a KMailen kereszt??l + Name[is]=IMAP ??j??nn gegnum KMail + Name[it]=Server IMAP via KMail +Index: kresources/kolab/kcal/kolab.desktop +=================================================================== +--- kresources/kolab/kcal/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Kalender IMAP-serveril (KMaili vahendusel) + Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez + Name[fr]=Agenda sur serveur IMAP (via KMail) ++Name[ga]=F??ilire ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt napt??r a KMailen kereszt??l + Name[is]=Dagatal ?? IMAP ??j??ni gegnum KMail + Name[it]=Calendario su server IMAP via KMail Index: kresources/kolab/kcal/resourcekolab.cpp =================================================================== ---- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -487,10 +487,18 @@ mUidMap[ uid ] = StorageReference( subResource, sernum ); } else { @@ -116,8 +201,8 @@ /* Add to the cache if the add didn't come from KOrganizer, in which case Index: kresources/groupware/kabc_groupware.desktop =================================================================== ---- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -128,8 +213,8 @@ Name[is]=Groupware ??j??nn Index: kresources/groupware/kcal_groupware.desktop =================================================================== ---- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -140,8 +225,8 @@ Name[is]=Groupware ??j??nn Index: kresources/remote/remote.desktop =================================================================== ---- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -15,6 +15,7 @@ Name[eu]=Egutegia urruneko fitxategi batean Name[fi]=Kalenteri et??tiedostossa @@ -150,10 +235,22 @@ Name[hi]=??????????????? ??????????????? ????????? ???????????????????????? Name[hu]=T??voli f??jlban t??rolt napt??r Name[is]=Dagatal ?? fjarl??gri skr?? +Index: kresources/newexchange/kcal_newexchange_final.desktop +=================================================================== +--- kresources/newexchange/kcal_newexchange_final.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/newexchange/kcal_newexchange_final.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -13,6 +13,7 @@ + Name[et]=Kalender Exchange-serveril + Name[eu]=Egutegia Exchange zerbitzari batean + Name[fr]=Agenda sur un serveur Exchange ++Name[ga]=F??ilire ar Fhreastala?? Exchange + Name[hu]=Exchange 2000-kiszolg??l?? napt??ra + Name[is]=Dagatal ?? Exchange ??j??ni + Name[it]=Calendario su un server Exchange Index: kmail/kmailicalifaceimpl.cpp =================================================================== ---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -848,7 +848,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum ) @@ -163,10 +260,23 @@ return; // kdDebug(5006) << "KMailICalIfaceImpl::slotIncidenceAdded" << endl; +Index: kmail/kmail_config_composer.desktop +=================================================================== +--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -109,7 +109,7 @@ + Keywords[he]=kmail,???????? + Keywords[hi]=??????-?????????,???????????????????????? + Keywords[hu]=kmail,szerkeszt?? +-Keywords[is]=kmail,composer,ritill ++Keywords[is]=kmail,ritill + Keywords[it]=kmail,compositore + Keywords[lt]=kmail,composer,redaktorius + Keywords[nb]=kmail,komposer Index: kmail/partNode.cpp =================================================================== ---- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -36,6 +36,7 @@ #include "kmmimeparttree.h" #include @@ -184,10 +294,74 @@ return this; if( mChild ) found = mChild->findNodeForDwPart( part ); +Index: kmail/eventsrc +=================================================================== +--- kmail/eventsrc (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -10,6 +10,7 @@ + [new-mail-arrived] + Name=New Mail Arrived + Name[bg]=?????????? ???????? ?????????? ++Name[br]=Deuet eo ur postel nevez + Name[bs]=Stigla vam je nova po??ta + Name[ca]=Ha arribat correu nou + Name[cs]=P??i??la nov?? po??ta +Index: kmail/avscripts/kmail_sav.sh +=================================================================== +--- kmail/avscripts/kmail_sav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_sav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_fprot.sh +=================================================================== +--- kmail/avscripts/kmail_fprot.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_fprot.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_antivir.sh +=================================================================== +--- kmail/avscripts/kmail_antivir.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_antivir.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_clamav.sh +=================================================================== +--- kmail/avscripts/kmail_clamav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_clamav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE Index: kmail/keyresolver.cpp =================================================================== ---- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -1171,6 +1171,17 @@ for ( uint i = 0; i < items.size(); ++i ) { ContactPreferences& pref = lookupContactPreferences( items[i].address ); @@ -208,8 +382,8 @@ } Index: kmail/kmsender.cpp =================================================================== ---- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -519,8 +519,10 @@ .arg(mCurrentMsg->subject())); if (!mSendProc->send(mCurrentMsg)) @@ -246,10 +420,46 @@ mCurrentMsg = 0; mFailedMessages++; // Sending of message failed. +Index: knode/knode_config_identity.desktop +=================================================================== +--- knode/knode_config_identity.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -58,6 +58,7 @@ + Comment=Personal Information + Comment[be]=???????????????????????? ???????????????????? + Comment[bg]=???????????????????? ???? ?????????????? ???????????????????? ++Comment[br]=Titouro?? diouzhin + Comment[bs]=Li??ne informacije + Comment[ca]=Informaci?? personal + Comment[cs]=Osobn?? informace +Index: knode/knode_config_cleanup.desktop +=================================================================== +--- knode/knode_config_cleanup.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,6 +25,7 @@ + Name[eu]=Garbiketa + Name[fi]=Siivoaminen + Name[fr]=Nettoyage ++Name[ga]=Glan + Name[gl]=Limpeza + Name[hi]=????????????-???????????? + Name[hu]=Tiszt??t??s +Index: knode/knarticlewidget.cpp +=================================================================== +--- knode/knarticlewidget.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knarticlewidget.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include Index: kalarm/alarmcalendar.h =================================================================== ---- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -46,7 +46,7 @@ void startUpdate(); void endUpdate(); @@ -262,7 +472,7 @@ Index: Makefile.cvs =================================================================== --- Makefile.cvs (.../tags/KDE/3.4.2/kdepim) (revision 0) -+++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 442272) ++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -0,0 +1,16 @@ + +all: @@ -288,8 +498,8 @@ Index: libemailfunctions/email.cpp =================================================================== ---- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -697,14 +697,24 @@ // and outside of quoted text behind the trailing '>'. bInComment = false; @@ -329,10 +539,22 @@ break; default: if( ' ' != c ) +Index: korn/KOrn.desktop +=================================================================== +--- korn/KOrn.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ korn/KOrn.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + GenericName[eu]=Mail abisua + GenericName[fi]=Saapuneen s??hk??postin ilmoitus + GenericName[fr]=Surveillance du courrier ??lectronique ++GenericName[ga]=F??gairt R??omhphoist + GenericName[gl]=Alerta de Correo-e + GenericName[hi]=????????? ??????????????? + GenericName[hr]=Upozorenje na nove poruke Index: kmailcvt/filters.hxx =================================================================== ---- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -85,6 +85,57 @@ }; @@ -394,8 +616,8 @@ -// vim: ts=2 sw=2 et Index: kmailcvt/filter_thunderbird.cxx =================================================================== ---- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -198,7 +198,7 @@ tmp.close(); first_msg = false; @@ -407,8 +629,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_evolution_v2.cxx =================================================================== ---- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -201,7 +201,7 @@ tmp.close(); first_msg = false; @@ -420,8 +642,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_outlook.cxx =================================================================== ---- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -52,7 +52,7 @@ info->addLog(i18n("Importing new mail files...")); info->addLog(i18n("No files found for import.")); @@ -433,8 +655,8 @@ QStringList files = importDir.entryList("*.[pP][sS][tT]", QDir::Files, QDir::Name); Index: kmailcvt/filter_pmail.cxx =================================================================== ---- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -320,13 +320,13 @@ QString FilterPMail::getFolderName(QString ID) { @@ -454,8 +676,8 @@ if(_ID == search) { Index: kmailcvt/filter_oe.cxx =================================================================== ---- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -138,7 +138,7 @@ folderName = "OE-" + mailfileinfo.baseName(TRUE); if(parsedFolder) { @@ -513,8 +735,8 @@ } Index: kmailcvt/filter_mbox.cxx =================================================================== ---- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -69,8 +69,9 @@ while ( ! mbox.atEnd() ) { @@ -544,8 +766,8 @@ first_msg = false; Index: kmailcvt/filter_pmail.hxx =================================================================== ---- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -50,8 +50,18 @@ QDir dir; /** pointer to the info */ @@ -569,8 +791,8 @@ bool folderParsed; Index: kmailcvt/filter_oe.hxx =================================================================== ---- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -61,8 +61,17 @@ bool parsedFolder; /** true if the current parsing file is the folder file */ @@ -590,10 +812,73 @@ /** name of the current folder */ QString folderName; +Index: kaddressbook/interfaces/kaddressbook_xxport.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_xxport.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -21,7 +21,7 @@ + Comment[he]=???????? ??????????/???????? ???????? ???????? ?????????????? + Comment[hi]=??????-??????????????????-????????? ????????????/????????????????????? ?????????????????? + Comment[hu]=KAddressBook import??l??si/export??l??si b??v??t??modul +-Comment[is]=??forrit til a?? f??ra inn ??/??t ??r KAddressbook ++Comment[is]=KAddressbook flytja inn/??t ??forrit + Comment[it]=Plugin importa/esporta di KAddressbook + Comment[ja]=KAddressbook ???????????????/????????????????????????????????? + Comment[lt]=KAddressBook importo/eksporto priedas +Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -17,7 +17,7 @@ + Comment[fr]=Module d'??dition de contacts de KAddressBook + Comment[hi]=??????-??????????????????-????????? ????????????????????? ?????????????????? ??????????????? ?????????????????? + Comment[hu]=KAddressBook n??vjegyszerkeszt?? b??v??t??modul +-Comment[is]=KAddressbook tengili??aritils-??forrit ++Comment[is]=KAddressbook tengili??aritils ??forrit + Comment[it]=Plugin editor dei contatti di KAddressbook + Comment[ja]=KAddressbook ??????????????? ???????????? ?????????????????? ??????????????? + Comment[lt]=KAddressBook kontakt?? redaktoriaus valdikli?? priedas +Index: kaddressbook/csv-templates/yahoo.desktop +=================================================================== +--- kaddressbook/csv-templates/yahoo.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/csv-templates/yahoo.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,7 +25,7 @@ + Name[he]=???????? ?????????? ???? Yahoo! + Name[hi]=????????????! ????????? ???????????????????????? + Name[hu]=Yahoo! c??mjegyz??k +-Name[is]=Yahoo! P??stfangaskr?? ++Name[is]=Yahoo! p??stfangaskr?? + Name[it]=Rubrica indirizzi Yahoo! + Name[ja]=Yahoo! ??????????????? + Name[lt]=Yahoo! Adres?? knygut?? +Index: kaddressbook/editors/protocols/smsprotocol.desktop +=================================================================== +--- kaddressbook/editors/protocols/smsprotocol.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/editors/protocols/smsprotocol.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -19,6 +19,7 @@ + Comment[eu]=SMS protokoloa + Comment[fi]=SMS-protokolla + Comment[fr]=Protocole SMS ++Comment[ga]=Pr??tacal SMS + Comment[gl]=Protocolo SMS + Comment[he]=???????????????? SMS + Comment[hi]=?????????????????? ??????????????????????????? +Index: kaddressbook/features/distributionlist.desktop +=================================================================== +--- kaddressbook/features/distributionlist.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/features/distributionlist.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -4,6 +4,7 @@ + Name=KAB Distribution List Plugin + Name[ar]=? ?????? ??????? ?? ?????????? KAB + Name[be]=?????????????????????? KAB "?????????? ????????????????????????????????" ++Name[br]=Lugent roll ingaladur evit KAB + Name[bs]=KAB dodatak za distribucione liste + Name[ca]=Endollable de la llista de distribuci?? KAB + Name[cs]=Modul distribu??n??ho seznamu Index: libkdepim/komposer/plugins/default/defaulteditor.desktop =================================================================== ---- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,7 @@ Name[et]=Komposeri redaktor <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Fri Aug 26 10:55:23 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS (DEVEL): php.spec - add PDO (base compiled in; database driv... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 08:55:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - add PDO (base compiled in; database drivers as shared modules) ---- Files affected: SPECS: php.spec (1.467.2.4 -> 1.467.2.5) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.4 SPECS/php.spec:1.467.2.5 --- SPECS/php.spec:1.467.2.4 Thu Aug 25 21:25:13 2005 +++ SPECS/php.spec Fri Aug 26 10:55:18 2005 @@ -13,15 +13,16 @@ # - make additional headers added by mail patch configurable # - apply -hardened patch by default ? # - ftp module needs to be linked with -lssl if openssl module is enabled +# - shared pdo base # # Conditional build: %bcond_with db3 # use db3 packages instead of db (4.x) for Berkeley DB support -%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib) +%bcond_with fdf # with FDF (PDF forms) module (BR:proprietary lib) %bcond_with hardening # build with hardening patch applied (http://www.hardened-php.net/) -%bcond_with hwapi # with Hw API support (BR: proprietary libs) -%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) -%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) -%bcond_with oracle # with oracle extension module (BR: proprietary libs) +%bcond_with hwapi # with Hw API support (BR:proprietary libs) +%bcond_with interbase_inst # use InterBase install., not Firebird (BR:proprietary libs) +%bcond_with oci8 # with Oracle oci8 extension module (BR:proprietary libs) +%bcond_with oracle # with oracle extension module (BR:proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) %bcond_without curl # without CURL extension module %bcond_without imap # without IMAP extension module @@ -267,7 +268,7 @@ Summary: PHP DSO module for apache 1.3.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 1.3.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires(post,preun): %{apxs1} Requires(post,preun): %{__perl} Requires: apache1(EAPI) >= 1.3.33-2 @@ -289,7 +290,7 @@ Summary: PHP DSO module for apache 2.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 2.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: apache >= 2.0.52-2 Requires: apache(modules-api) = %{apache_modules_api} Provides: %{name} = %{epoch}:%{version}-%{release} @@ -309,7 +310,7 @@ Summary: php as FastCGI program Summary(pl): php jako program FastCGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description fcgi @@ -322,7 +323,7 @@ Summary: php as CGI program Summary(pl): php jako program CGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cgi @@ -335,7 +336,7 @@ Summary: php as CLI interpreter Summary(pl): php jako interpreter dzia?aj?cy z linii polece? Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cli @@ -976,6 +977,81 @@ Modu? PHP umo?liwiaj?cy korzystanie z perlowych wyra?e? regularnych (Perl Compatible Regular Expressions) +%package pdo-dblib +Summary: PHP Data Objects (PDO) FreeTDS support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do FreeTDS +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-dblib +This is a dynamic shared object (DSO) for PHP that will add PDO +FreeTDS support. + +%description pdo-dblib -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych FreeTDS za po?rednictwem +interfejsu PDO. + +%package pdo-mysql +Summary: PHP Data Objects (PDO) MySQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do MySQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-mysql +This is a dynamic shared object (DSO) for PHP that will add PDO MySQL +support. + +%description pdo-mysql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych MySQL za po?rednictwem +interfejsu PDO. + +%package pdo-odbc +Summary: PHP Data Objects (PDO) ODBC support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do ODBC +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-odbc +This is a dynamic shared object (DSO) for PHP that will add PDO ODBC +support. + +%description pdo-odbc -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych ODBC za po?rednictwem +interfejsu PDO. + +%package pdo-pgsql +Summary: PHP Data Objects (PDO) PostgreSQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do PostgreSQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-pgsql +This is a dynamic shared object (DSO) for PHP that will add PDO +PostgreSQL support. + +%description pdo-pgsql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych PostgreSQL za +po?rednictwem interfejsu PDO. + +%package pdo-sqlite +Summary: PHP Data Objects (PDO) SQLite support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do SQLite +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-sqlite +This is a dynamic shared object (DSO) for PHP that will add PDO SQLite +support. + +%description pdo-sqlite -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych SQLite za po?rednictwem +interfejsu PDO. + %package pgsql Summary: PostgreSQL database module for PHP Summary(pl): Modu? bazy danych PostgreSQL dla PHP @@ -1140,22 +1216,24 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} %description sqlite -SQLite is a C library that implements an embeddable SQL database engine. -Programs that link with the SQLite library can have SQL database access -without running a separate RDBMS process. - -SQLite is not a client library used to connect to a big database server. -SQLite is the server. The SQLite library reads and writes directly to -and from the database files on disk. +SQLite is a C library that implements an embeddable SQL database +engine. Programs that link with the SQLite library can have SQL +database access without running a separate RDBMS process. + +SQLite is not a client library used to connect to a big database +server. SQLite is the server. The SQLite library reads and writes +directly to and from the database files on disk. %description sqlite -l pl SQLite jest napisan? w C bibliotek? implementuj?c? osadzalny silnik bazodanowy SQL. Program linkuj?cy si? z bibliotek? SQLite mo?e mie? -dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu RDBMS. +dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu +RDBMS. SQLite to nie klient baz danych - biblioteka nie ??czy si? z serwerami -baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i zapisuje -dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na dysku. +baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i +zapisuje dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na +dysku. %package sybase Summary: Sybase DB extension module for PHP @@ -1167,8 +1245,9 @@ %description sybase This is a dynamic shared object (DSO) for PHP that will add Sybase and -MS SQL databases support through SYBDB library. Currently Sybase module -is not maintained. Using Sybase-CT module is recommended instead. +MS SQL databases support through SYBDB library. Currently Sybase +module is not maintained. Using Sybase-CT module is recommended +instead. %description sybase -l pl Modu? PHP dodaj?cy obs?ug? baz danych Sybase oraz MS SQL poprzez @@ -1252,8 +1331,8 @@ Summary: wddx extension module for PHP Summary(pl): Modu? wddx dla PHP Group: Libraries -PreReq: %{name}-session = %{epoch}:%{version}-%{release} -PreReq: %{name}-xml = %{epoch}:%{version}-%{release} +Requires: %{name}-session = %{epoch}:%{version}-%{release} +Requires: %{name}-xml = %{epoch}:%{version}-%{release} Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -1291,13 +1370,13 @@ %description xmlreader This is a dynamic shared object (DSO) for PHP that will add XML Reader support. The XMLReader extension is an XML Pull parser. The reader -acts as a cursor going forward on the document stream and stopping -at each node on the way. +acts as a cursor going forward on the document stream and stopping at +each node on the way. %description xmlreader -l pl Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik -dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy -si? naka?dym w??le po drodze. +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i +zatrzymuj?cy si? naka?dym w??le po drodze. %package xmlrpc Summary: xmlrpc extension module for PHP @@ -1465,12 +1544,15 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-zend-multibyte \ --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ + --with-inifile \ + --with-flatfile \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1481,6 +1563,18 @@ --enable-mbstring=shared,all \ --enable-mbregex \ --enable-pcntl=shared \ + --enable-pdo \ +%if %{with mssql} || %{with sybase} || %{with sybase_ct} + --with-pdo-dblib=shared \ +%endif +%if %{with interbase} && %{without interbase_inst} + --with-pdo-firebird=shared \ +%endif + --with-pdo-mysql=shared \ + %{?with_oracle:--with-pdo-oci=shared} \ + %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ + %{?with_pgsql:--with-pdo-pgsql=shared} \ + %{?with_sqlite:--with-pdo-sqlite=shared} \ --enable-posix=shared \ --enable-session \ --enable-shared \ @@ -1624,7 +1718,7 @@ libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} # install the apache modules' files -make install-headers install-build install-modules install-programs \ +%{__make} install-headers install-build install-modules install-programs \ INSTALL_ROOT=$RPM_BUILD_ROOT # install CGI @@ -2018,6 +2112,36 @@ %postun pcre %extension_postun +%post pdo-dblib +%extension_post + +%postun pdo-dblib +%extension_postun + +%post pdo-mysql +%extension_post + +%postun pdo-mysql +%extension_postun + +%post pdo-odbc +%extension_post + +%postun pdo-odbc +%extension_postun + +%post pdo-pgsql +%extension_post + +%postun pdo-pgsql +%extension_postun + +%post pdo-sqlite +%extension_post + +%postun pdo-sqlite +%extension_postun + %post pgsql %extension_post @@ -2341,8 +2465,8 @@ %if %{with apache1} %files -n apache1-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini %attr(755,root,root) %{_libdir}/apache1/libphp5.so /home/services/apache/icons/* %endif @@ -2350,8 +2474,8 @@ %if %{with apache2} %files -n apache-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini %attr(755,root,root) %{_libdir}/apache/libphp5.so /home/services/httpd/icons/* %endif @@ -2359,18 +2483,18 @@ %files fcgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.fcgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi-fcgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini %files cgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini %files cli %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cli %attr(755,root,root) %{_bindir}/php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini %{_mandir}/man1/php.1* %files common @@ -2382,7 +2506,7 @@ %dir %{_sysconfdir} %dir %{_sysconfdir}/conf.d -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini %attr(770,root,http) %dir %verify(not group mode) /var/run/php %attr(755,root,root) %{_sbindir}/php-module-install %attr(755,root,root) %{_libdir}/libphp_common-*.so @@ -2401,168 +2525,168 @@ %files bcmath %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bcmath.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini %attr(755,root,root) %{extensionsdir}/bcmath.so %files bzip2 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bz2.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini %attr(755,root,root) %{extensionsdir}/bz2.so %files calendar %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so %files ctype %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini %attr(755,root,root) %{extensionsdir}/ctype.so %if %{with curl} %files curl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/curl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini %attr(755,root,root) %{extensionsdir}/curl.so %endif %files dba %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dba.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini %attr(755,root,root) %{extensionsdir}/dba.so %files dbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so %files dom %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so %if %{with fdf} %files fdf %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fdf.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fdf.ini %attr(755,root,root) %{extensionsdir}/fdf.so %endif %files exif %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/exif.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini %attr(755,root,root) %{extensionsdir}/exif.so %files filepro %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/filepro.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filepro.ini %attr(755,root,root) %{extensionsdir}/filepro.so %files ftp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ftp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini %attr(755,root,root) %{extensionsdir}/ftp.so %files gd %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gd.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini %attr(755,root,root) %{extensionsdir}/gd.so %files gettext %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gettext.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini %attr(755,root,root) %{extensionsdir}/gettext.so %files gmp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gmp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini %attr(755,root,root) %{extensionsdir}/gmp.so %if %{with hwapi} %files hwapi %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/hwapi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hwapi.ini %attr(755,root,root) %{extensionsdir}/hwapi.so %endif %files iconv %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/iconv.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini %attr(755,root,root) %{extensionsdir}/iconv.so %if %{with imap} %files imap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/imap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini %attr(755,root,root) %{extensionsdir}/imap.so %endif %if %{with interbase} %files interbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/interbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini %attr(755,root,root) %{extensionsdir}/interbase.so %endif %if %{with ldap} %files ldap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ldap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini %attr(755,root,root) %{extensionsdir}/ldap.so %endif %files mbstring %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mbstring.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini %attr(755,root,root) %{extensionsdir}/mbstring.so %files mcrypt %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mcrypt.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini %attr(755,root,root) %{extensionsdir}/mcrypt.so %if %{with mhash} %files mhash %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mhash.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mhash.ini %attr(755,root,root) %{extensionsdir}/mhash.so %endif %files mime_magic %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mime_magic.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini %attr(755,root,root) %{extensionsdir}/mime_magic.so %if %{with ming} %files ming %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ming.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ming.ini %attr(755,root,root) %{extensionsdir}/ming.so %endif %if %{with msession} %files msession %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/msession.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini %attr(755,root,root) %{extensionsdir}/msession.so %endif %if %{with mssql} %files mssql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mssql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mssql.ini %attr(755,root,root) %{extensionsdir}/mssql.so %endif %files mysql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini %attr(755,root,root) %{extensionsdir}/mysql.so %if %{with mysqli} %files mysqli %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysqli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini %attr(755,root,root) %{extensionsdir}/mysqli.so %endif @@ -2573,28 +2697,28 @@ %if %{with oci8} %files oci8 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oci8.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini %attr(755,root,root) %{extensionsdir}/oci8.so %endif %if %{with odbc} %files odbc %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/odbc.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini %attr(755,root,root) %{extensionsdir}/odbc.so %endif %if %{with openssl} %files openssl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/openssl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini %attr(755,root,root) %{extensionsdir}/openssl.so %endif %if %{with oracle} %files oracle %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oracle.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oracle.ini %attr(755,root,root) %{extensionsdir}/oracle.so %endif @@ -2605,26 +2729,66 @@ %if %{with pcre} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.4&r2=1.467.2.5&f=u From twittner at pld-linux.org Fri Aug 26 18:26:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: man.spec - moved R: FHS >= 2.3-12 i proper place - newest F... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:26:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - moved R: FHS >= 2.3-12 i proper place - newest FHS is required only by man-man2html-cgi package ---- Files affected: SPECS: man.spec (1.105 -> 1.106) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.105 SPECS/man.spec:1.106 --- SPECS/man.spec:1.105 Tue Aug 23 22:10:58 2005 +++ SPECS/man.spec Fri Aug 26 18:26:40 2005 @@ -41,7 +41,6 @@ Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk -Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less @@ -168,6 +167,7 @@ Group: Applications/System Requires: %{name}-whatis = %{version}-%{release} Requires: man2html = %{version}-%{release} +Requires: FHS >= 2.3-12 %description -n man2html-cgi These scripts allows read man pages throught WWW browser. It uses @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106 2005/08/26 16:26:40 twittner +- moved R: FHS >= 2.3-12 i proper place - newest FHS is required only + by man-man2html-cgi package + Revision 1.105 2005/08/23 20:10:58 twittner - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.105&r2=1.106&f=u From twittner at pld-linux.org Fri Aug 26 18:34:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: kdevelop.spec - added `BuildConflicts: star'. gnutar (which... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:34:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks builds: gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ ChangeLog INSTALL NEWS README TODO No such file or directory. Cannot stat 'ChangeLog'. gnutar: No such file or directory. Cannot stat 'INSTALL'. [...] with gtar (tar pkg) everything goes OK. ---- Files affected: SPECS: kdevelop.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/kdevelop.spec diff -u SPECS/kdevelop.spec:1.101 SPECS/kdevelop.spec:1.102 --- SPECS/kdevelop.spec:1.101 Thu Jul 28 20:45:06 2005 +++ SPECS/kdevelop.spec Fri Aug 26 18:34:36 2005 @@ -42,6 +42,7 @@ BuildRequires: subversion-devel >= 1.2.0-4 #BuildRequires: unsermake >= 040511 BuildRequires: zlib-devel +BuildConflicts: star Requires: kdebase-core >= 9:%{_kdever} Requires: kdesdk-libcvsservice >= 3:%{_kdever} Requires: kdoc @@ -191,6 +192,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/26 16:34:36 twittner +- added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks + builds: + gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ + ChangeLog INSTALL NEWS README TODO + No such file or directory. Cannot stat 'ChangeLog'. + gnutar: No such file or directory. Cannot stat 'INSTALL'. + [...] + with gtar (tar pkg) everything goes OK. + Revision 1.101 2005/07/28 18:45:06 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdevelop.spec?r1=1.101&r2=1.102&f=u From arekm at pld-linux.org Fri Aug 26 11:38:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: kdelibs-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:38:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdelibs-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdelibs-branch.diff diff -u SOURCES/kdelibs-branch.diff:1.16 SOURCES/kdelibs-branch.diff:1.17 --- SOURCES/kdelibs-branch.diff:1.16 Tue Aug 2 08:02:29 2005 +++ SOURCES/kdelibs-branch.diff Fri Aug 26 11:38:27 2005 @@ -1,7 +1,7 @@ Index: libkscreensaver/kscreensaver.cpp =================================================================== ---- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -65,6 +65,7 @@ if ( w == 0 ) w = 600; if ( h == 0 ) h = 420; @@ -26,8 +26,8 @@ bool KScreenSaver::eventFilter( QObject *o, QEvent *e ) Index: kate/part/katesearch.cpp =================================================================== ---- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -130,6 +130,7 @@ searchFlags.replace = false; searchFlags.finished = false; @@ -44,10 +44,23 @@ searchFlags.backward = searchFlags.backward != back; searchFlags.fromBeginning = false; +Index: mimetypes/audio/x-scpls.desktop +=================================================================== +--- mimetypes/audio/x-scpls.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/audio/x-scpls.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -31,7 +31,7 @@ + Comment[hu]=MP3 ShoutCast-lej??tsz??si lista + Comment[id]=Playlist MP3 ShoutCast + Comment[is]=Mp3 ShoutCast lagalisti +-Comment[it]=Playlist MP3 ShoutCast ++Comment[it]=Scaletta MP3 ShoutCast + Comment[ja]=MP3 ShoutCast ?????????????????? + Comment[ko]=MP3 ?????????????????? ?????? ?????? + Comment[lt]=MP3 ShoutCast gaidara??tis Index: mimetypes/application/x-gettext.desktop =================================================================== ---- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -6,6 +6,7 @@ Comment[az]=GNU Gettext ??smar???? Kataloqu Comment[bg]=?????????????????? ???? ???????????? (GNU Gettext) @@ -56,10 +69,130 @@ Comment[bs]=GNU Gettext katalog poruka Comment[ca]=Cat??leg de missatges Gettext de GNU Comment[cs]=Katalog zpr??v (Gettext) +Index: mimetypes/application/xsd.desktop +=================================================================== +--- mimetypes/application/xsd.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/xsd.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -3,6 +3,7 @@ + Comment=W3C XML Schema + Comment[af]=W3C XML Skema + Comment[bg]=??? ?????? W3C XML ++Comment[br]=Steu??v XML W3C + Comment[bs]=W3C XML ??ema + Comment[ca]=Esquema XML W3C + Comment[cs]=W3C XML sch??ma +Index: mimetypes/application/x-executable.desktop +=================================================================== +--- mimetypes/application/x-executable.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -6,6 +6,7 @@ + Comment[az]=??cra???? Fayl + Comment[bg]=???????????????? ???????? + Comment[bn]=???????????????????????????????????? ???????????? ++Comment[br]=Restr sevenadus + Comment[bs]=Izvr??na datoteka + Comment[ca]=Fitxer executable + Comment[cs]=Spustiteln?? soubor +Index: mimetypes/application/x-executable-script.desktop +=================================================================== +--- mimetypes/application/x-executable-script.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable-script.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Comment[af]=Skrip (moontlik uitvoerbaar) + Comment[bg]=???????????? (???????????????? ????????????????) + Comment[bn]=??????????????????????????? (?????????????????? ????????????????????????????????????) ++Comment[br]=Urzhiaoueg (marteze ur sevenadus) + Comment[bs]=Skripta (mo??da izvr??iva) + Comment[ca]=Gui?? (possiblement executable) + Comment[cs]=Pravd??podobn?? spustiteln?? skript +Index: mimetypes/application/vnd.stardivision.writer-global.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.writer-global.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.writer-global.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -8,6 +8,7 @@ + Comment[af]=StarOffice skrywer Meester Dokument + Comment[bg]=???????????? ???????????????? ???? StarOffice Writer + Comment[bn]=???????????????-?? ????????? ?????????????????? ????????????????????? ????????? ++Comment[br]=Teul mestr StarOffice Writer + Comment[bs]=StarOffice Writer glavni dokument + Comment[ca]=Document mestre de l'StarOffice Writer + Comment[cs]=Hlavn?? dokument aplikace StarOffice Writer +Index: mimetypes/application/vnd.stardivision.draw.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.draw.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.draw.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[be]=?????????????? StarOffice + Comment[bg]=?????????????????????? ???? StarOffice Drawing + Comment[bn]=???????????????-?? ????????? ?????????????????? ++Comment[br]=Tresaner StarOffice + Comment[bs]=StarOffice crte?? + Comment[ca]=Dibuix de StarOffice + Comment[cs]=Kreslen?? aplikace StarOffice Draw +Index: kioslave/file/file.cc +=================================================================== +--- kioslave/file/file.cc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/file/file.cc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -1445,7 +1445,7 @@ + QString pmountProg = KGlobal::dirs()->findExe("pmount", path); + + if (pmountProg.isEmpty()) +- pmountProg = "pmount"; ++ return false; + + QCString buffer; + buffer.sprintf( "%s %s", QFile::encodeName(pmountProg).data(), +Index: kioslave/http/kcookiejar/kcookiejar.cpp +=================================================================== +--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -773,14 +773,24 @@ + while ((*cookieStr == ';') || (*cookieStr == ' ')) + { + cookieStr++; +- ++ + // Name-Value pair follows + cookieStr = parseNameValue(cookieStr, Name, Value); + + QCString cName = Name.lower().latin1(); + if (cName == "domain") + { +- lastCookie->mDomain = Value.lower(); ++ QString dom = Value.lower(); ++ // RFC2965 3.2.2: If an explicitly specified value does not ++ // start with a dot, the user agent supplies a leading dot ++ if(dom.length() && dom[0] != '.') ++ dom.prepend("."); ++ // remove a trailing dot ++ if(dom.length() > 2 && dom[dom.length()-1] == '.') ++ dom = dom.left(dom.length()-1); ++ ++ if(dom.contains('.') > 1 || dom == ".local") ++ lastCookie->mDomain = dom; + } + else if (cName == "max-age") + { +Index: kioslave/http/kcookiejar/tests/cookie_rfc.test +=================================================================== +--- kioslave/http/kcookiejar/tests/cookie_rfc.test (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/tests/cookie_rfc.test (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,6 +38,11 @@ + COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=; Version=1; Path="/"; Max-Age=0 + CHECK http://w.y.z/ Cookie: $Version=1; some_value2=foobar; $Path="/" + CLEAR COOKIES ++## Check if we prepend domain with a dot ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value2; Version=1; Path="/"; Domain=.y.z; Max-Age=3600 ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Domain=y.z.; Max-Age=3600 ++CHECK http://w.y.z/ Cookie: $Version=1; some_value=value3; $Path="/"; $Domain=".y.z" ++CLEAR COOKIES + ## Check if multiple cookies on a single line work + ## FIXME + #COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Max-Age=3600, some_value2=foobar; Version=1; Path="/"; Max-Age=3600 Index: kioslave/ftp/ftp.protocol =================================================================== ---- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -10,6 +10,7 @@ writing=true makedir=true @@ -68,10 +201,45 @@ ProxiedBy=http Icon=ftp maxInstances=2 +Index: kimgio/psd.h +=================================================================== +--- kimgio/psd.h (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kimgio/psd.h (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -10,11 +10,13 @@ + #ifndef KIMG_PSD_H + #define KIMG_PSD_H + ++#include ++ + class QImageIO; + + extern "C" { +-void kimgio_psd_read( QImageIO * ); +-void kimgio_psd_write( QImageIO * ); ++KDE_EXPORT void kimgio_psd_read( QImageIO * ); ++KDE_EXPORT void kimgio_psd_write( QImageIO * ); + } + + #endif +Index: kio/kio/connection.cpp +=================================================================== +--- kio/kio/connection.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/connection.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -252,6 +252,10 @@ + kdError(7017) << "Data read failed, errno=" << errno << endl; + return -1; + } ++ if ( !n ) { // 0 indicates end of file ++ kdError(7017) << "Connection ended unexpectedly (" << n << "/" << bytesToGo << ")" << endl; ++ return -1; ++ } + + bytesRead += n; + bytesToGo -= n; Index: kio/kio/kmimemagic.cpp =================================================================== ---- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2262,6 +2262,15 @@ tmp += "src"; r->setMimeType(tmp); @@ -90,8 +258,8 @@ KMimeMagicResult * Index: kio/misc/kpac/eventsrc =================================================================== ---- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -77,7 +77,7 @@ Name[cy]=Sgript dirprwy annilys Name[da]=Ugyldigt proxy-script @@ -110,10 +278,254 @@ Comment[eo]=La ??ar??ita prokuragordoskript estas nevalida Comment[es]=El procedimiento descargado para la configuraci??n del proxy es inv??lido Comment[et]=Alla laaditud proxy seadistuse skript on vigane +Index: kstyles/themes/light-v2.themerc +=================================================================== +--- kstyles/themes/light-v2.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v2.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 2-ci burax??l???? + Name[bn]=???????????? ??????????????????, ????????????????????? ????????????????????? ++Name[br]=Giz sklerijenn, eil stumm + Name[bs]=Light stil, druga revizija + Name[ca]=Estil Light, 2ona revisi?? + Name[cs]=Light Style, druh?? verze +Index: kstyles/themes/light-v3.themerc +=================================================================== +--- kstyles/themes/light-v3.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v3.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 3-c?? burax??l???? + Name[bn]=???????????? ??????????????????, ??????????????? ????????????????????? ++Name[br]=Giz sklerijenn, trede stumm + Name[bs]=Light stil, tre??a revizija + Name[ca]=Estil Light, 3era revisi?? + Name[cs]=Light Style, t??et?? verze +Index: kstyles/themes/highcolor.themerc +=================================================================== +--- kstyles/themes/highcolor.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/highcolor.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -62,6 +62,7 @@ + Comment[az]=Klassik t??rzin z??ngin r??ngli burax??l?????? + Comment[bg]=???????????????????? ???????? ???? ?????? ?? ???????????? ???????????????? ???? ?????????????????? + Comment[bn]=????????????????????? ???????????????????????? ?????????-??????????????? ????????????????????? ++Comment[br]=Stumm livio?? uhel ar c'hiz da gustum + Comment[bs]=Highcolor verzija klasi??nog stila + Comment[ca]=Versi?? Highcolor de l'estil cl??ssic + Comment[cs]=Mnohobarevn?? verze klasick??ho stylu +Index: kstyles/themes/beos.themerc +=================================================================== +--- kstyles/themes/beos.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/beos.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[az]=??rt??ks??z BeOS b??nz??ri t??rz + Comment[be]=?????????? ?????????????? ???? BeOS (?????? ??????) + Comment[bg]=???????? ?????? ????????, ?????????????? ???? BeOS ++Comment[br]=Giz evel BeOS anwisket + Comment[bs]=Stil bez teme, sli??an Beos-u + Comment[ca]=Estil del tipus BeOS sense temes + Comment[cs]=Styl podobn?? BeOS (bez motivu) +Index: kstyles/web/web.themerc +=================================================================== +--- kstyles/web/web.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/web/web.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -73,6 +73,7 @@ + Comment[az]=Veb p??nc??r??cik t??rzi + Comment[bg]=????????, ???????????????? ???? ?????? ???????????????? ???????????? + Comment[bn]=???????????? ??????????????? ?????????????????? ++Comment[br]=Giz widget gwiad + Comment[bs]=Stil ukrasa na webu + Comment[ca]=Estil d'objectes web + Comment[cs]=Styl prvk?? webu +Index: kabc/formats/binaryformat.cpp +=================================================================== +--- kabc/formats/binaryformat.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kabc/formats/binaryformat.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- FormatPlugin *format() ++ KDE_EXPORT FormatPlugin *format() + { + return new BinaryFormat; + } +Index: knewstuff/downloaddialog.cpp +=================================================================== +--- knewstuff/downloaddialog.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ knewstuff/downloaddialog.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -50,6 +50,7 @@ + { + QString m_providerlist; + QWidget *m_page; ++ KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; + }; + + class NumSortListViewItem : public KListViewItem +@@ -206,7 +207,6 @@ + KTabCtl *ctl; + QWidget *w_d, *w_r, *w_l; + QWidget *w2; +- KListView *lvtmp_r, *lvtmp_d, *lvtmp_l; + QTextBrowser *rt; + QString tmp; + int ret; +@@ -244,27 +244,27 @@ + QHBoxLayout *box = new QHBoxLayout(frame); + box->add(ctl); + +- lvtmp_r = new KListView(w_r); +- lvtmp_r->addColumn(i18n("Name")); +- lvtmp_r->addColumn(i18n("Version")); +- lvtmp_r->addColumn(i18n("Rating")); +- lvtmp_r->setSorting(2, false); ++ d->m_lvtmp_r = new KListView(w_r); ++ d->m_lvtmp_r->addColumn(i18n("Name")); ++ d->m_lvtmp_r->addColumn(i18n("Version")); ++ d->m_lvtmp_r->addColumn(i18n("Rating")); ++ d->m_lvtmp_r->setSorting(2, false); + +- lvtmp_d = new KListView(w_d); +- lvtmp_d->addColumn(i18n("Name")); +- lvtmp_d->addColumn(i18n("Version")); +- lvtmp_d->addColumn(i18n("Downloads")); +- lvtmp_d->setSorting(2, false); ++ d->m_lvtmp_d = new KListView(w_d); ++ d->m_lvtmp_d->addColumn(i18n("Name")); ++ d->m_lvtmp_d->addColumn(i18n("Version")); ++ d->m_lvtmp_d->addColumn(i18n("Downloads")); ++ d->m_lvtmp_d->setSorting(2, false); + +- lvtmp_l = new KListView(w_l); +- lvtmp_l->addColumn(i18n("Name")); +- lvtmp_l->addColumn(i18n("Version")); +- lvtmp_l->addColumn(i18n("Release Date")); +- lvtmp_l->setSorting(2, false); ++ d->m_lvtmp_l = new KListView(w_l); ++ d->m_lvtmp_l->addColumn(i18n("Name")); ++ d->m_lvtmp_l->addColumn(i18n("Version")); ++ d->m_lvtmp_l->addColumn(i18n("Release Date")); ++ d->m_lvtmp_l->setSorting(2, false); + +- connect(lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); + + rt = new QTextBrowser(frame); + rt->setMinimumWidth(150); +@@ -285,14 +285,14 @@ + connect(de, SIGNAL(clicked()), SLOT(slotDetails())); + + QVBoxLayout *box2 = new QVBoxLayout(w_r); +- box2->add(lvtmp_r); ++ box2->add(d->m_lvtmp_r); + QVBoxLayout *box3 = new QVBoxLayout(w_d); +- box3->add(lvtmp_d); ++ box3->add(d->m_lvtmp_d); + QVBoxLayout *box4 = new QVBoxLayout(w_l); +- box4->add(lvtmp_l); ++ box4->add(d->m_lvtmp_l); + + QValueList *v = new QValueList; +- *v << lvtmp_r << lvtmp_d << lvtmp_l; ++ *v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l; + m_map[frame] = v; + m_rts[frame] = rt; + QValueList *vb = new QValueList; +@@ -300,7 +300,7 @@ + m_buttons[frame] = vb; + m_providers[frame] = p; + +- kdDebug() << "addProvider()/end; lvtmp_r = " << lvtmp_r << endl; ++ kdDebug() << "addProvider()/end; d->m_lvtmp_r = " << d->m_lvtmp_r << endl; + + if(m_engine) slotPage(frame); + +@@ -353,7 +353,7 @@ + QDate date; + QString datestring; + int installed; +- ++ + kapp->config()->setGroup("KNewStuffStatus"); + datestring = kapp->config()->readEntry(entry->name()); + if(datestring.isNull()) installed = 0; +@@ -456,6 +456,9 @@ + { + Entry *e = getEntry(); + if(!e) return; ++ d->m_lvtmp_r->setEnabled( false ); ++ d->m_lvtmp_l->setEnabled( false ); ++ d->m_lvtmp_d->setEnabled( false ); + + kdDebug() << "download entry now" << endl; + +@@ -467,9 +470,7 @@ + else + { + m_s = new KNewStuffGeneric(e->type(), this); +- + m_entry = e; +- + KURL source = e->payload(); + KURL dest = KURL(m_s->downloadDestination(e)); + +@@ -492,7 +493,7 @@ + m_entryitem = lv_l->findItem(m_entryname, 0); + if(m_entryitem) m_entryitem->setPixmap(0, pix); + +- ++ + QPushButton *in; + in = *(m_buttons[d->m_page]->at(0)); + if(in) in->setEnabled(false); +@@ -502,7 +503,6 @@ + { + bool ret = (job->error() == 0); + KIO::FileCopyJob *cjob; +- + if(ret) + { + cjob = static_cast(job); +@@ -520,6 +520,9 @@ + KMessageBox::information(this, i18n("Installation successful."), i18n("Installation")); + } + else KMessageBox::error(this, i18n("Installation failed."), i18n("Installation")); ++ d->m_lvtmp_r->setEnabled( true ); ++ d->m_lvtmp_l->setEnabled( true ); ++ d->m_lvtmp_d->setEnabled( true ); + + delete m_s; + } +Index: kdecore/eventsrc +=================================================================== +--- kdecore/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kdecore/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -625,7 +625,7 @@ + Comment[cy]=Methu agor y ffeil penodol i'w ddarllen neu i'w ysgrifennu. + Comment[da]=Den valgte fil kan ikke ??bnes til l??sning eller skrivning + Comment[de]=Die gew??hlte Datei kann nicht zum Lesen oder Schreiben ge??ffnet werden. +-Comment[el]=???? ???????????????????? ???????????? ???? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? ++Comment[el]=???? ???????????????????? ???????????? ?????? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? + Comment[eo]=La elektita dosiero ne estas malfermebla por legado a?? skribado + Comment[es]=El archivo seleccionado no se puede abrir para leer o escribir. + Comment[et]=Valitud faili pole v??imalik avada lugemiseks v??i kirjutamiseks. +@@ -1605,6 +1605,7 @@ + Name[be]=?????????????????????????? ?????????????????????????? + Name[bg]=???????????????????? + Name[bn]=?????????????????????????????? ++Name[br]=Kemennad a titouro?? + Name[bs]=Informativna poruka + Name[ca]=Missatge informatiu + Name[cs]=Informa??n?? zpr??va Index: khtml/khtmlview.cpp =================================================================== ---- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2238,7 +2238,9 @@ guard = node; } @@ -126,8 +538,8 @@ emit m_part->nodeActivated(Node(node)); Index: khtml/html/html_formimpl.cpp =================================================================== ---- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -954,16 +954,15 @@ if (!evt->defaultHandled() && m_render && m_render->isWidget()) { @@ -151,8 +563,8 @@ } Index: khtml/ecma/kjs_events.cpp =================================================================== ---- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -635,6 +635,9 @@ return Boolean(static_cast(event).metaKey()); case Button: @@ -165,8 +577,8 @@ int domButton = static_cast(event).button(); Index: khtml/rendering/render_list.cpp =================================================================== ---- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -402,7 +402,7 @@ m_markerWidth = m_width = 0; @@ -178,8 +590,8 @@ m_width = m_markerWidth; Index: khtml/rendering/render_object.cpp =================================================================== ---- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -1697,21 +1697,22 @@ { // vertical align for table cells has a different meaning @@ -209,8 +621,8 @@ int fontheight = ref->lineHeight( firstLine ); Index: khtml/rendering/render_replaced.cpp =================================================================== ---- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -513,7 +513,7 @@ QWidget* const w = ::qt_cast(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { @@ -226,8 +638,8 @@ svn:mime-type = application/x-jar Index: kresources/kresources.desktop =================================================================== ---- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -14,6 +14,7 @@ Name[af]=KDE Hulpbronne Name[bg]=???????????????? ?????????????? @@ -244,10 +656,201 @@ Comment[bs]=Podesite KDE resurse Comment[ca]=Configura els recursos KDE Comment[cs]=Nastaven?? zdroj?? KDE +Index: dcop/dcopsignals.cpp +=================================================================== +--- dcop/dcopsignals.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ dcop/dcopsignals.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -154,7 +154,7 @@ + + list->append( current ); + conn->signalConnectionList()->append(current); +- if (senderConn) ++ if (senderConn && senderConn != conn) + senderConn->signalConnectionList()->append(current); + return true; + #else //!Q_OS_UNIX +Index: pics/crystalsvg/cr64-action-player_play.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = image/png + +Property changes on: pics/crystalsvg/cr64-action-player_play.png +___________________________________________________________________ +Name: svn:mime-type + + image/png + +Index: kdoctools/customization/pl/user.entities +=================================================================== +--- kdoctools/customization/pl/user.entities (.../tags/KDE/3.4.2/kdelibs) (revision 453462) <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Fri Aug 26 20:33:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: cairo-bug4110.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:33:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: cairo-bug4110.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:46:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: cairo.spec - updated deps (ac/am, freetype for ps/pdf backe... In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:46:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) and xcb backend (on bcond - requires not released yet xcb) - -devel doesn't obsolete standalone libpixman-devel ---- Files affected: SPECS: cairo.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.34 SPECS/cairo.spec:1.35 --- SPECS/cairo.spec:1.34 Fri Aug 26 05:55:49 2005 +++ SPECS/cairo.spec Fri Aug 26 20:46:28 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with xcb # enable XCB backend (XCB not released yet) +# Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo @@ -10,16 +14,16 @@ # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 2.54 +BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel -BuildRequires: freetype-devel >= 2.1.0 +BuildRequires: freetype-devel >= 2.1.4 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig -#BuildRequires: xcb-devel (http://freedesktop.org/software/xcb - CVS only, not released yet) +%{?with_xcb:BuildRequires: xcb-devel} BuildRequires: xrender-devel >= 0.6 BuildRequires: zlib-devel Requires: freetype >= 2.1.0 @@ -73,11 +77,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: fontconfig-devel -Requires: freetype-devel >= 2.1.0 +Requires: freetype-devel >= 2.1.4 Requires: glitz-devel >= 0.4.4 Requires: libpng-devel +%{?with_xcb:Requires: xcb-devel} Requires: xrender-devel >= 0.6 -Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -108,8 +112,7 @@ %{__automake} %configure \ --enable-gtk-doc \ - --enable-quartz \ - --enable-xcb \ + %{?with_xcb:--enable-xcb} \ --enable-glitz \ --enable-ps \ --enable-pdf \ @@ -152,6 +155,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/26 18:46:28 qboosh +- updated deps (ac/am, freetype for ps/pdf backends) +- don't try to enable quartz backend (not available on Linux) + and xcb backend (on bcond - requires not released yet xcb) +- -devel doesn't obsolete standalone libpixman-devel + Revision 1.34 2005/08/26 03:55:49 aredridel - up to 1.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Fri Aug 26 20:54:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: gnome-bluetooth-pygtk.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:54:28 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: gnome-bluetooth-pygtk.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:09:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: grabcartoons.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:09:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: grabcartoons.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u SPECS/grabcartoons.spec:1.1 SPECS/grabcartoons.spec:1.2 --- SPECS/grabcartoons.spec:1.1 Mon Aug 22 08:52:36 2005 +++ SPECS/grabcartoons.spec Fri Aug 26 21:09:36 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: commic-summarizing utility +Summary(pl): Narz?dzie do streszczania komiks?w Name: grabcartoons Version: 1.11 Release: 0.1 @@ -16,6 +17,10 @@ GrabCartoons is a comic-summarizing utility. It is modular, and it is very easy to write modules for new comics. +%description -l pl +GrabCartoons to narz?dzie do streszczania komiks?w. Jest modularne i +?atwo do niego dopisywa? modu?y do nowych komiks?w. + %prep %setup -q %patch0 -p1 @@ -33,7 +38,7 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -/usr/lib/grabcartoons +%{_prefix}/lib/grabcartoons %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -41,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:09:36 qboosh +- pl + Revision 1.1 2005/08/22 06:52:36 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grabcartoons.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:20:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: gsutil.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:20:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: gsutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/gsutil.spec diff -u SPECS/gsutil.spec:1.1 SPECS/gsutil.spec:1.2 --- SPECS/gsutil.spec:1.1 Fri Aug 19 09:39:35 2005 +++ SPECS/gsutil.spec Fri Aug 26 21:20:51 2005 @@ -1,29 +1,32 @@ # $Revision$, $Date$ Summary: A utility to save, restore and reboot Grandstream Budgetone phones +Summary(pl): Narz?dzie do zapisywania, odtwarzania i restartowania telefon?w Grandstream Budgetone Name: gsutil Version: 2.1 Release: 1 +License: GPL Group: Applications/System Source0: http://www.pkts.ca/%{name}-%{version}.tar.gz # Source0-md5: 28010ee2e2881dd6597e27659174ee6a -License: GPL URL: http://www.pkts.ca/gsutil.shtml -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -BuildArch: noarch Requires: perl Requires: perl-libwww Provides: gsutil +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A utility to dump and restore the configuration of the Grandstream Budgetone VOIP telephone, up to and including version 1.0.6.7 of the firmware. +%description -l pl +Narz?dzie do zrzucania i odtwarzania konfiguracji telefon?w VOIP +Grandstream Budgetone do wersji firmware'u 1.0.6.7 w??cznie. + %prep %setup -q -%build - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_bindir} @@ -34,8 +37,8 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/gsutil %doc README Changelog +%attr(755,root,root) %{_bindir}/gsutil %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -43,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:20:51 qboosh +- pl, unified + Revision 1.1 2005/08/19 07:39:35 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsutil.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: DISTFILES: xprobe2-0.3.tar.gz Message-ID: <16445.1125084444@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xprobe/xprobe2-0.3.tar.gz 3ebb89ed9380038d368327816e34ec54 xprobe2-0.3.tar.gz Size: 533636 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: xprobe2.spec - updated URLs In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:27:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URLs ---- Files affected: SPECS: xprobe2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.9 SPECS/xprobe2.spec:1.10 --- SPECS/xprobe2.spec:1.9 Fri Aug 19 10:08:34 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:27:18 2005 @@ -6,10 +6,10 @@ Release: 0.1 License: GPL Group: Networking -Source0: http://www.sys-security.com/archive/tools/xprobe2/%{name}-%{version}.tar.gz +Source0: http://dl.sourceforge.net/xprobe/%{name}-%{version}.tar.gz # Source0-md5: 3ebb89ed9380038d368327816e34ec54 Patch0: %{name}-paths.patch -URL: http://www.sys-security.com/html/projects/X.html +URL: http://www.sys-security.com/index.php?page=xprobe BuildRequires: autoconf BuildRequires: libpcap-devel BuildRequires: libstdc++-devel @@ -61,7 +61,7 @@ %doc README CHANGELOG docs/modules_howto.txt %attr(755,root,root) %{_bindir}/xprobe2 %{_mandir}/man1/* -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xprobe2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xprobe2.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/26 19:27:18 qboosh +- updated URLs + Revision 1.9 2005/08/19 08:08:34 grzegorz - ups md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.9&r2=1.10&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: xprobe2.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: xprobe2.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.10 SPECS/xprobe2.spec:1.11 --- SPECS/xprobe2.spec:1.10 Fri Aug 26 21:27:18 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:28:05 2005 @@ -33,7 +33,7 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 %build cp -f /usr/share/automake/config.sub cfg-scripts/config.sub @@ -49,7 +49,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT install -D etc/xprobe2.conf $RPM_BUILD_ROOT%{_sysconfdir}/xprobe2.conf @@ -69,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 19:28:05 qboosh +- cosmetics + Revision 1.10 2005/08/26 19:27:18 qboosh - updated URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SOURCES: xprobe2-gcc33.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: xprobe2-gcc33.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:34:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: idesk.spec - updated pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:34:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl ---- Files affected: SPECS: idesk.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.17 SPECS/idesk.spec:1.18 --- SPECS/idesk.spec:1.17 Mon Aug 22 18:05:09 2005 +++ SPECS/idesk.spec Fri Aug 26 21:34:23 2005 @@ -22,14 +22,18 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not provided by all window managers. The icon graphics are either from a -png or svg (vector) file and support some eyecandy effects like -transparency. Each icon can be confgured to run one or more shell +PNG or SVG (vector) file and support some eyecandy effects like +transparency. Each icon can be configured to run one or more shell commands and the actions which run those commands are completely configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie -oferowana przez wszystkie window managery. +oferowana przez wszystkich zarz?dc?w okien. Grafiki ikon pochodz? z +plik?w PNG lub (wektorowych) SVG i wspieraj? niekt?re efekty takie +jak przezroczysto??. Ka?da ikona mo?e by? skonfigurowana do +uruchamiania jednego lub wi?kszej liczby polece? pow?oki, a akcje +uruchamiaj?ce te polecenia s? w pe?ni konfigurowalne. %prep %setup -q @@ -64,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/26 19:34:23 qboosh +- updated pl + Revision 1.17 2005/08/22 16:05:09 spider - extended description ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Fri Aug 26 21:35:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <21604.1125084920@distfiles.pld-linux.org> Files fetched: 0 ALREADY GOT: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: kchmviewer.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: kchmviewer.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.3 SPECS/kchmviewer.spec:1.4 --- SPECS/kchmviewer.spec:1.3 Mon Aug 22 15:07:58 2005 +++ SPECS/kchmviewer.spec Fri Aug 26 21:45:09 2005 @@ -4,7 +4,8 @@ %bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # -Summary: KchmViewer is a chm (MS HTML help file format) viewer +Summary: KchmViewer - a CHM (MS HTML help file format) viewer +Summary(pl): KchmViewer - przegl?darka CHM (formatu plik?w pomocy MS HTML) Name: kchmviewer Version: 1.0 Release: 0.6 @@ -13,20 +14,27 @@ Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz # Source0-md5: 0f9595cbb13eb950261e660c168dc033 URL: http://kchmviewer.sourceforge.net/ +%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel -BuildRequires: zlib-devel -%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +KchmViewer is a CHM (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or Gnome. However, it may be +library, and does not depend on KDE or GNOME. However, it may be compiled with full KDE support, including KDE widgets and KIO/KHTML. +%description -l pl +KchmViewer to przegl?darka CHM (formatu plik?w pomocy MS HTML) +napisana w C++. W przeciwie?stwie do wi?kszo?ci istniej?cych +przegl?darek CHM dla Uniksa u?ywa biblioteki widget?w Trolltecha Qt i +nie zale?y od KDE czy GNOME. Jednak mo?e by? skompilowana z pe?nym +wsparciem dla KDE, w??cznie z widgetami KDE i KIO/KHTML. + %prep %setup -q @@ -56,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 19:45:09 qboosh +- pl, unified + Revision 1.3 2005/08/22 13:07:58 spider - spaces -> tabs @@ -64,4 +75,3 @@ Revision 1.1 2005/08/22 10:45:44 spider - init - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 21:48:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: kde-icons-gartoon.spec - pl, missing defattr In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:48:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing defattr ---- Files affected: SPECS: kde-icons-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-icons-gartoon.spec diff -u SPECS/kde-icons-gartoon.spec:1.2 SPECS/kde-icons-gartoon.spec:1.3 --- SPECS/kde-icons-gartoon.spec:1.2 Sat Aug 20 21:29:44 2005 +++ SPECS/kde-icons-gartoon.spec Fri Aug 26 21:48:19 2005 @@ -21,13 +21,22 @@ %description Fun looking icons with bright colors and bold outlines. +%description -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. + %package blue Summary: KDE icons - %{_name} blue +Summary(pl): Motyw ikon do KDE - %{_name} blue Group: Themes %description blue Fun looking icons with bright colors and bold outlines. Blue theme. +%description blue -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. Motyw niebieski. + %prep %install @@ -45,6 +54,7 @@ %{_iconsdir}/%{_name} %files blue +%defattr(644,root,root,755) %{_iconsdir}/%{_name}-blue %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +63,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:48:19 qboosh +- pl, missing defattr + Revision 1.2 2005/08/20 19:29:44 glen - use SVG. seems to work ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-icons-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:49:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: kde-splash-gartoon.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:49:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: kde-splash-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.2 SPECS/kde-splash-gartoon.spec:1.3 --- SPECS/kde-splash-gartoon.spec:1.2 Mon Aug 22 09:54:49 2005 +++ SPECS/kde-splash-gartoon.spec Fri Aug 26 21:49:16 2005 @@ -17,6 +17,9 @@ %description gartoon splash screen. +%description -l pl +Ekran startowy gartoon. + %prep %setup -q -n gartoonss @@ -40,6 +43,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:49:16 qboosh +- pl desc + Revision 1.2 2005/08/22 07:54:49 glen - rel 0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:58:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: shared-mime-info.spec - updated URL In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:58:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL ---- Files affected: SPECS: shared-mime-info.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/shared-mime-info.spec diff -u SPECS/shared-mime-info.spec:1.31 SPECS/shared-mime-info.spec:1.32 --- SPECS/shared-mime-info.spec:1.31 Wed Aug 17 20:14:47 2005 +++ SPECS/shared-mime-info.spec Fri Aug 26 21:57:54 2005 @@ -6,7 +6,7 @@ Release: 1 License: GPL Group: X11/Applications -#Source0: http://freedesktop.org/Software/%{name}/%{name}-%{version}.tar.gz +#Source0: http://freedesktop.org/software/shared-mime-info/%{name}-%{version}.tar.gz Source0: http://freedesktop.org/~jrb/%{name}-%{version}.tar.gz # Source0-md5: 255a20bae753ebd41e2286b01e7b86d0 Patch0: %{name}-dtd_path.patch @@ -14,6 +14,7 @@ Patch2: %{name}-dicom.patch Patch3: %{name}-polish.patch Patch4: %{name}-word.patch +URL: http://www.freedesktop.org/wiki/Software/shared-mime-info BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-dtd412-xml @@ -21,7 +22,6 @@ BuildRequires: glib2-devel BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: pkgconfig -URL: http://www.freedesktop.org/software/shared-mime-info BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/26 19:57:54 qboosh +- updated URL + Revision 1.31 2005/08/17 18:14:47 adgor - 0.16 (unofficial) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/shared-mime-info.spec?r1=1.31&r2=1.32&f=u From qboosh at pld-linux.org Fri Aug 26 22:00:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: libcontainer.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 20:00:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libcontainer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libcontainer.spec diff -u SPECS/libcontainer.spec:1.1 SPECS/libcontainer.spec:1.2 --- SPECS/libcontainer.spec:1.1 Sun Aug 21 00:53:13 2005 +++ SPECS/libcontainer.spec Fri Aug 26 22:00:08 2005 @@ -3,8 +3,8 @@ # Conditional build: %bcond_without static_libs # don't build static libraries # -Summary: Simple C library that provides linked lists, stacks, queues and binary trees. -Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych. +Summary: Simple C library that provides linked lists, stacks, queues and binary trees +Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych Name: libcontainer Version: 0.1.0 Release: 0.1 @@ -25,7 +25,12 @@ bubble sort at the moment). There is a slight lack of documentation but there are some examples in the test/ directory. -#%%description -l pl +%description -l pl +Libcontainer to prosta biblioteka C, kt?rej mo?na u?ywa? w aplikacjach +do obs?ugi list wi?zanych, stos?w, kolejek i drzew binarnych. Autor +chcia?by jeszcze popracowa? nad ni? nieco wi?cej (listy wi?zane +obs?uguj? aktualnie tylko sortowanie b?belkowe). S? pewne braki w +dokumentacji, ale jest troch? przyk?ad?w w katalogu test/. %package devel Summary: Header files for libcontainer library @@ -98,7 +103,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 20:00:08 qboosh +- pl desc + Revision 1.1 2005/08/20 22:53:13 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcontainer.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 22:17:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: template-php-pecl.spec, template-php4-pecl.spec - add neede... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add needed rpmbuild(macros) >= 1.228 for %service macro ---- Files affected: SPECS: template-php-pecl.spec (1.11 -> 1.12) , template-php4-pecl.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.11 SPECS/template-php-pecl.spec:1.12 --- SPECS/template-php-pecl.spec:1.11 Fri Aug 26 18:15:39 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.11 2005/08/26 16:15:39 adamg - conf.d support ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.4 SPECS/template-php4-pecl.spec:1.5 --- SPECS/template-php4-pecl.spec:1.4 Fri Aug 26 18:14:52 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php4-devel +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.4 2005/08/26 16:14:52 adamg - move %define calls to the top of the file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Fri Aug 26 22:18:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: template-php-pecl.spec - this is for php5 In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:18:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - this is for php5 ---- Files affected: SPECS: template-php-pecl.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.12 SPECS/template-php-pecl.spec:1.13 --- SPECS/template-php-pecl.spec:1.12 Fri Aug 26 22:17:12 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:55 2005 @@ -52,13 +52,13 @@ rm -rf $RPM_BUILD_ROOT %post -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart %postun if [ "$1" = 0 ]; then - [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart - [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart + [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart fi %files @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/26 20:17:55 glen +- this is for php5 + Revision 1.12 2005/08/26 20:17:12 glen - add needed rpmbuild(macros) >= 1.228 for %service macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Fri Aug 26 23:01:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: libsl.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:01:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libsl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libsl.spec diff -u SPECS/libsl.spec:1.1 SPECS/libsl.spec:1.2 --- SPECS/libsl.spec:1.1 Sun Aug 21 01:08:17 2005 +++ SPECS/libsl.spec Fri Aug 26 23:01:28 2005 @@ -6,7 +6,7 @@ %bcond_without static_libs # don't build static libraries # Summary: A small and flexible linked list implementation -Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej. +Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej Name: libsl Version: 0.3.2 Release: 0.1 @@ -30,7 +30,16 @@ nodes. It also means that a push can't fail because memory couldn't be allocated for the container node. -#%%description -l pl +%description -l pl +sl to wydajna pami?ciowo biblioteka og?lnych list wi?zanych. Nie u?ywa +w?z??w kontenerowych. Zamiast tego wymaga wska?nika do nast?pnego +elementu bezpo?rednio w strukturze danych, z kt?rej chce si? utworzy? +listy (lub stosy). Mo?e to da? znacz?c? oszcz?dno?? pami?ci przy +tworzeniu d?ugich list ma?ych struktur. Pozwala tak?e na szybkie +operacje "push" i "pop", jako ?e nie ma potrzeby przydzielania i +zwalniania pami?ci dla w?z??w kontenerowych. Oznacza to tak?e, ?e +operacja "push" nie mo?e nie powie?? si? z powodu niemo?no?ci +przydzielenia pami?ci na w?ze? kontenerowy. %package devel Summary: Header files for libsl library @@ -104,7 +113,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 21:01:28 qboosh +- pl desc + Revision 1.1 2005/08/20 23:08:17 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsl.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 23:30:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: lighttpd.spec - pl for new mod_* subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:30:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new mod_* subpackages ---- Files affected: SPECS: lighttpd.spec (1.123 -> 1.124) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.123 SPECS/lighttpd.spec:1.124 --- SPECS/lighttpd.spec:1.123 Thu Aug 25 08:40:33 2005 +++ SPECS/lighttpd.spec Fri Aug 26 23:29:59 2005 @@ -117,6 +117,7 @@ %package mod_compress Summary: Output Compression +Summary(pl): Kompresja wyj?cia Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/compress.html Requires: %{name} = %{version}-%{release} @@ -127,11 +128,21 @@ Only static content is supported up to now. -The server negotiates automaticly which compression method is used. +The server negotiates automatically which compression method is used. Supported are gzip, deflate, bzip. +%description mod_compress -l pl +Kompresja wyj?cia zmniejsza obci??enie sieci i mo?e poprawi? ca?kowit? +przepustowo?? serwera WWW. + +Jak na razie obs?ugiwana jest tylko statyczna tre??. + +Serwer automatycznie negocjuje, kt?ra metoda kompresji jest u?ywana. +Obs?ugiwane s? gzip, deflate i bzip. + %package mod_cml Summary: Cache Meta Language module +Summary(pl): Modu? Cache Meta Language Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/cml.html Requires: %{name} = %{version}-%{release} @@ -141,8 +152,13 @@ side and building a page from its fragments on the other side using LUA. +%description mod_cml -l pl +CML to metaj?zyk s?u??cy z jednej strony do opisu zale?no?ci strony i +z drugiej strony do budowania strony z fragment?w przy u?yciu LUA. + %package mod_mysql_vhost Summary: MySQL based vhosting +Summary(pl): vhosty oparte na MySQL-u Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/mysqlvhost.html Requires: %{name} = %{version}-%{release} @@ -150,8 +166,12 @@ %description mod_mysql_vhost This module provides virtual hosts (vhosts) based on a MySQL table. +%description mod_mysql_vhost -l pl +Ten modu? udost?pnia wirtualne hosty (vhosty) oparte na tabeli MySQL. + %package mod_trigger_b4_dl Summary: Trigger before Download +Summary(pl): Wyzwalacz przed ?ci?ganiem Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/trigger_b4_dl.html Requires: %{name} = %{version}-%{release} @@ -159,8 +179,12 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%description mod_trigger_b4_dl -l pl +Jeszcze jeden modu? blokuj?cy bezpo?rednie linkowanie. + %package mod_webdav Summary: WebDAV module for lighttpd +Summary(pl): Modu? WebDAV dla libghttpd Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/webdav.html Requires: %{name} = %{version}-%{release} @@ -181,6 +205,20 @@ So far mounting a webdav resource into Windows XP works and the basic litmus tests are passed. +%description mod_webdav -l pl +Modu? WebDAV to bardzo minimalistyczna implementacja RFC 2518. +Minimalistyczna oznacza, ?e jeszcze nie wszystkie operacje s? +zaimplementowane. Jak na razie s?: +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT +oraz zwyk?e GET, POST, HEAD z HTTP/1.1. + +Jak na razie montowanie zasobu webdav pod Windows XP dzia?a i +podstawowe testy lakmusowe przechodz?. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -352,6 +390,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124 2005/08/26 21:29:59 qboosh +- pl for new mod_* subpackages + Revision 1.123 2005/08/25 06:40:33 aredridel - add openssl fix (Changeset 621) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.123&r2=1.124&f=u From qboosh at pld-linux.org Sat Aug 27 00:25:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: mysql-connector-j.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 22:25:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: mysql-connector-j.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.3 SPECS/mysql-connector-j.spec:1.4 --- SPECS/mysql-connector-j.spec:1.3 Mon Aug 22 12:29:40 2005 +++ SPECS/mysql-connector-j.spec Sat Aug 27 00:25:06 2005 @@ -1,6 +1,10 @@ # $Revision$, $Date$ +# +# Conditional build: %bcond_without bindist # don't use binary distribution (not finished) -Summary: MySQL Connector/J +# +Summary: MySQL Connector/J - JDBC driver for MySQL +Summary(pl): MySQL Connector/J - sterownik JDBC dla MySQL-a Name: mysql-connector-j Version: 3.1.10 Release: 0.1 @@ -24,13 +28,28 @@ MySQL Connector/J is the official JDBC driver for MySQL. +%description -l pl +MySQL Connector/J to natywny sterownik Javy konwertuj?cy wywo?ania +JDBC (Java Database Connectivity) na protok?? sieciowy u?ywany przez +baz? danych MySQL. Pozwala programistom pracowa? z u?yciem j?zyka +programowania Java ?atwo tworz?c programy i aplety wsp??pracuj?ce z +MySQL-em i ??czy? wszystkie zbiorcze dane, nawet w ?rodowisku +heterogenicznym. MySQL Connector/J jest sterownikiem JDBC typu IV i ma +pe?ny zbi?r mo?liwo?ci JDBC obs?uguj?cy MySQL-a. + +MySQL Connector/J to oficjalny sterownik JDBC dla MySQL-a. + %package doc Summary: Documentation for MySQL Connector/J +Summary(pl): Dokumentacja dla MySQL Connector/J Group: Documentation %description doc Documentation for MySQL Connector/J. +%description doc -l pl +Dokumentacja dla MySQL Connector/J. + %prep %setup -q -n mysql-connector-java-%{version} rm -f docs/README # duplicate @@ -67,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 22:25:06 qboosh +- pl + Revision 1.3 2005/08/22 10:29:40 glen - adapterized, no extra subdir on -doc package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.3&r2=1.4&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:45 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: poppler.spec - 0.4.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:52:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.1 ---- Files affected: SPECS: poppler.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.16 SPECS/poppler.spec:1.17 --- SPECS/poppler.spec:1.16 Tue Aug 16 10:04:29 2005 +++ SPECS/poppler.spec Sat Aug 27 00:52:39 2005 @@ -9,12 +9,12 @@ Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF Name: poppler -Version: 0.4.0 +Version: 0.4.1 Release: 1 License: GPL Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: e7c7488788b8240ada090fa0406a3784 +# Source0-md5: 000c069ce0700318ba3cc1f7c4bff87f Patch0: %{name}-link.patch URL: http://poppler.freedesktop.org/ BuildRequires: autoconf >= 2.59 @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/26 22:52:39 aflinta +- 0.4.1 + Revision 1.16 2005/08/16 08:04:29 freetz - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.16&r2=1.17&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:52 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:11 2005 Subject: DISTFILES: poppler-0.4.1.tar.gz Message-ID: <16709.1125096772@distfiles.pld-linux.org> Files fetched: 1 STORED: http://poppler.freedesktop.org/poppler-0.4.1.tar.gz 000c069ce0700318ba3cc1f7c4bff87f poppler-0.4.1.tar.gz Size: 776378 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Sat Aug 27 00:57:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:11 2005 Subject: SPECS: evince.spec - 0.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.0 ---- Files affected: SPECS: evince.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.28 SPECS/evince.spec:1.29 --- SPECS/evince.spec:1.28 Wed Aug 17 23:33:36 2005 +++ SPECS/evince.spec Sat Aug 27 00:57:44 2005 @@ -5,21 +5,21 @@ Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince -Version: 0.3.4 +Version: 0.4.0 Release: 0.9 License: GPL v2 Group: X11/Applications/Graphics -Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 2c3177f60e6d8ed0b73168ebf9f726a5 +Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 +# Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -Patch2: %{name}-disable_dbus.patch +#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake # NOTE: disabled until less broken release -#BuildRequires: dbus-glib-devel >= 0.33 +BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -34,7 +34,7 @@ BuildRequires: libtiff-devel BuildRequires: nautilus-devel BuildRequires: pkgconfig -BuildRequires: poppler-glib-devel >= 0.4.0 +BuildRequires: poppler-glib-devel >= 0.4.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -72,7 +72,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -83,6 +83,7 @@ %configure \ --disable-static \ --disable-schemas-install \ + --enable-dbus \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -144,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/26 22:57:44 aflinta +- 0.4.0 + Revision 1.28 2005/08/17 21:33:36 freetz - forced fixed cairo version in R:, fixed subpackage descriptions, TODO added, more BRs, rel. 0.9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.28&r2=1.29&f=u From aflinta at pld-linux.org Sat Aug 27 00:57:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:14:11 2005 Subject: DISTFILES: evince-0.4.0.tar.bz2 Message-ID: <23056.1125097073@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/evince-0.4.0.tar.bz2 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 Size: 891605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:33:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: trean.spec - let BUILD dir identify source snap (to compare... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:33:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - let BUILD dir identify source snap (to compare them) ---- Files affected: SPECS: trean.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.5 SPECS/trean.spec:1.6 --- SPECS/trean.spec:1.5 Thu Jul 21 00:07:56 2005 +++ SPECS/trean.spec Sat Aug 27 01:33:47 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ -%define _snap 2005-05-11 -%define _rel 1.1 +%define _snap 2005-08-01 +%define _rel 1 %include /usr/lib/rpm/macros.php Summary: Horde Bookmarks application @@ -11,13 +11,13 @@ Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 # NoSource0-md5: 20f5a96682d04444d48f9307ebb08515 -# don't put snapshots to df -NoSource: 0 Source1: %{name}.conf URL: http://www.horde.org/trean/ BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) # docs say it requires 3.1, but seems work in 3.0 too @@ -36,14 +36,14 @@ %description The Trean (Bookmarks) application allows you to store, organize and manage, and most importantly access your web browser bookmarks on-line -and in one central place accessible from any web browser. +and in one central place accessible from any web browser. By storing your bookmarks here, you can access them from any browser on any machine that can access the Horde applications. This means you can easily access your bookmarks from multiple browsers, multiple machines, remote locations, etc. And if you upgrade, switch, or test out browsers, you don't have to worry about what happens to your -bookmarks or how to import them into the new browser. +bookmarks or how to import them into the new browser. The Horde Project writes web applications in PHP and releases them under the GNU General Public License. For more information (including @@ -67,7 +67,8 @@ Treana) mo?na znale?? na stronie . %prep -%setup -q -n %{name} +%setup -q -c -T -n %{name}-%{_snap} +tar zxf %{SOURCE0} --strip-components=1 rm -f config/.htaccess @@ -149,6 +150,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/26 23:33:47 glen +- let BUILD dir identify source snap (to compare them) + Revision 1.5 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sat Aug 27 01:33:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <25568.1125099239@distfiles.pld-linux.org> wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:34:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: trean.spec - license BSD In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:34:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license BSD ---- Files affected: SPECS: trean.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.6 SPECS/trean.spec:1.7 --- SPECS/trean.spec:1.6 Sat Aug 27 01:33:47 2005 +++ SPECS/trean.spec Sat Aug 27 01:34:48 2005 @@ -9,7 +9,7 @@ Name: trean Version: 0.1 Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL +License: BSD Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz # Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 @@ -45,10 +45,6 @@ out browsers, you don't have to worry about what happens to your bookmarks or how to import them into the new browser. -The Horde Project writes web applications in PHP and releases them -under the GNU General Public License. For more information (including -help with Trean) please visit . - %description -l pl Aplikacja Tream (zak?adki) pozwala na przechowywanie, organizowanie i zarz?dzanie, a co najwa?niejsze, dost?p do zak?adek przegl?darki WWW @@ -62,10 +58,6 @@ martwi? co si? stanie z zak?adkami, albo jak zaimportowa? je do nowej przegl?darki. -Projekt Horde tworzy aplikacje WWW w PHP i wydaje je na licencji GNU -Genral Public License. Wi?cej informacji (w??cznie z pomoc? dla -Treana) mo?na znale?? na stronie . - %prep %setup -q -c -T -n %{name}-%{_snap} tar zxf %{SOURCE0} --strip-components=1 @@ -150,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/26 23:34:48 glen +- license BSD + Revision 1.6 2005/08/26 23:33:47 glen - let BUILD dir identify source snap (to compare them) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sat Aug 27 01:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <26702.1125099296@distfiles.pld-linux.org> wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From undefine at pld-linux.org Sat Aug 27 03:10:50 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: aee.spec (NEW) - initital pld version, partialy based on md... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:10:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initital pld version, partialy based on mdk spec ---- Files affected: SPECS: aee.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u /dev/null SPECS/aee.spec:1.1 --- /dev/null Sat Aug 27 03:10:50 2005 +++ SPECS/aee.spec Sat Aug 27 03:10:45 2005 @@ -0,0 +1,59 @@ +# $Revision$, $Date$ +Summary: An easy to use text editor +Summary(pl): ?atwy w u?yciu edytor tekstowy +Name: aee +Version: 2.2.15b +Release: 1 +License: Artistic +Group: Applications/Editors +URL: http://mahon.cwx.net/ +Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +Patch0: %{name}-conf.patch +BuildRequires: XFree86-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +An easy to use text editor. Intended to be usable with little or no +instruction. Provides both a terminal (curses based) interface and +native X-Windows interface (in which case the executable is called +xae). Features include pop-up menus, journalling (to recover from +system crash or loss of connection), cut-and-paste, multiple buffers +(associated with files or not), and much more. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__make} both \ + OPTFLAGS="%{rpmcflags} -L%{_prefix}/X11R6/%{_lib}" + +%install +rm -rf $RPM_BUILD_ROOT +install -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} +install -D xae $RPM_BUILD_ROOT%{_bindir}/xae +install -D %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +install -D help.ae $RPM_BUILD_ROOT%{_datadir}/%{name}/help.ae +ln -sf aee $RPM_BUILD_ROOT%{_bindir}/rae +ln -sf xae $RPM_BUILD_ROOT%{_bindir}/rxae + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Artistic README.aee aee.1.ps aee.i18n.guide keypad +%attr(755,root,root) %{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/help.ae +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 01:10:45 undefine +- initital pld version, partialy based on mdk spec + ================================================================ From undefine at pld-linux.org Sat Aug 27 03:11:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: aee-conf.patch (NEW) - fix patch to help file and use opt... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:11:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix patch to help file and use optflags (from mdk) ---- Files affected: SOURCES: aee-conf.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/aee-conf.patch diff -u /dev/null SOURCES/aee-conf.patch:1.1 --- /dev/null Sat Aug 27 03:11:23 2005 +++ SOURCES/aee-conf.patch Sat Aug 27 03:11:18 2005 @@ -0,0 +1,32 @@ +--- aee-2.2.15b/create.mk.aee~ 2002-09-23 06:16:04.000000000 +0200 ++++ aee-2.2.15b/create.mk.aee 2004-01-05 01:00:11.000000000 +0100 +@@ -263,7 +263,7 @@ fi + + echo "DEFINES = $termio $terminfo_exists $BSD_SELECT $catgets $select $curses " > make.aee + echo "" >> make.aee +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists" >> make.aee ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists \$(OPTFLAGS)" >> make.aee + echo "" >> make.aee + echo "" >> make.aee + echo "all : $TARGET" >> make.aee +--- aee-2.2.15b/help.c~ 1999-02-01 05:28:23.000000000 +0100 ++++ aee-2.2.15b/help.c 2004-01-05 01:06:04.000000000 +0100 +@@ -11,6 +11,7 @@ + #include "aee.h" + + char *help_file_list[4] = { ++ "/usr/share/aee/help.ae", + "/usr/local/aee/help.ae", + "/usr/local/lib/help.ae", + "~/.help.ae", +--- aee-2.2.15b/create.mk.xae~ 2002-09-23 04:16:18.000000000 +0000 ++++ aee-2.2.15b/create.mk.xae 2005-08-27 00:50:37.224401848 +0000 +@@ -185,7 +185,7 @@ + + echo "DEFINES = -DXAE -Dxae11 $catgets " > xae_dir/make.xae + echo "" >> xae_dir/make.xae +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags" >> xae_dir/make.xae ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags \$(OPTFLAGS)" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "all : xae" >> xae_dir/make.xae ================================================================ From aredridel at pld-linux.org Sat Aug 27 04:04:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: librsvg-2.11.0.tar.bz2 Message-ID: <10280.1125108298@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/librsvg-2.11.0.tar.bz2 d64df7603785440c8af39a338753bdf4 librsvg-2.11.0.tar.bz2 Size: 379647 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 04:05:00 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: librsvg.spec - up to 2.11.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 02:05:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.11.0 ---- Files affected: SPECS: librsvg.spec (1.84 -> 1.85) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.84 SPECS/librsvg.spec:1.85 --- SPECS/librsvg.spec:1.84 Sun Mar 20 22:43:18 2005 +++ SPECS/librsvg.spec Sat Aug 27 04:04:54 2005 @@ -13,14 +13,14 @@ Summary(ru): SVG ?????????? Summary(uk): SVG ?????????? Name: librsvg -Version: 2.9.5 -Release: 2 +Version: 2.11.0 +Release: 1 Epoch: 1 License: LGPL v2+ Vendor: GNOME Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.9/%{name}-%{version}.tar.bz2 -# Source0-md5: 44799d75e940eb4150acdae4f63cbe2a +Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: d64df7603785440c8af39a338753bdf4 URL: http://librsvg.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.85 2005/08/27 02:04:54 aredridel +- up to 2.11.0 + Revision 1.84 2005/03/20 21:43:18 aflinta - rebuild with howl 0.9.10, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.84&r2=1.85&f=u From qboosh at pld-linux.org Sat Aug 27 09:42:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: perl-File-chdir.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:42:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: perl-File-chdir.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-File-chdir.spec diff -u SPECS/perl-File-chdir.spec:1.1 SPECS/perl-File-chdir.spec:1.2 --- SPECS/perl-File-chdir.spec:1.1 Fri Aug 19 21:06:06 2005 +++ SPECS/perl-File-chdir.spec Sat Aug 27 09:42:16 2005 @@ -7,6 +7,7 @@ %define pdir File %define pnam chdir Summary: File::chdir - a more sensible way to change directories +Summary(pl): File::chdir - rozs?dniejszy spos?b zmiany katalog?w Name: perl-File-chdir Version: 0.06 Release: 1 @@ -22,9 +23,24 @@ %description File::chdir module - a more sensible way to change directories. -Perl's chdir() has the unfortunate problem of being very, very, very global. If any part of your program calls chdir() or if any library you use calls chdir(), it changes the current working directory for the whole program. +Perl's chdir() has the unfortunate problem of being very, very, very +global. If any part of your program calls chdir() or if any library +you use calls chdir(), it changes the current working directory for +the whole program. + +File::chdir gives you an alternative, $CWD and @CWD. These two +variables combine all the power of chdir(), File::Spec and Cwd. + +%description -l pl +Modu? File::chdir - rozs?dniejszy spos?b zmiany katalog?w. + +Perlowa funkcja chdir() jest problematyczna, poniewa? dzia?a bardzo, +bardzo, bardzo globalnie. Je?li dowolna cz??? programu lub dowolna +u?ywana biblioteka wywo?a chdir(), zmienia si? bie??cy katalog dla +ca?ego programu. -File::chdir gives you an alternative, $CWD and @CWD. These two variables combine all the power of chdir(), File::Spec and Cwd. +File::chdir daje alternatyw? - $CWD i @CWD. Te dwie zmienne ??cz? ca?? +pot?g? chdir(), File::Spec i Cwd. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -57,6 +73,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:42:16 qboosh +- pl + Revision 1.1 2005/08/19 19:06:06 arekm - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-File-chdir.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: POE-Component-DebugShell-1.0411.tar.gz Message-ID: <9575.1125128940@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DebugShell-1.0411.tar.gz 68aa0496f6ded9e221100c22351a05e5 POE-Component-DebugShell-1.0411.tar.gz Size: 6979 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - descs, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - descs, md5 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.2 SPECS/perl-POE-Component-DebugShell.spec:1.3 --- SPECS/perl-POE-Component-DebugShell.spec:1.2 Wed Aug 24 12:47:55 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Sat Aug 27 09:48:55 2005 @@ -6,23 +6,30 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DebugShell -Summary: POE::Component::DebugShell +Summary: POE::Component::DebugShell - interactive peeking into a running POE application +Summary(pl): POE::Component::DebugShell - interaktywne podgl?danie dzia?aj?cych aplikacji POE Name: perl-POE-Component-DebugShell Version: 1.0411 Release: 0.1 -License: other, see LICENSE +License: MIT-like (see LICENSE) Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org -BuildRequires: perl-devel >= 1:5.8.0 -BuildRequires: rpm-perlprov >= 4.1-13 +# Source0-md5: 68aa0496f6ded9e221100c22351a05e5 +URL: http://poe.perl.org/ BuildRequires: perl-POE BuildRequires: perl-POE-API-Peek +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -perl-POE-Component-DebugShell module, see poe.perl.org +This component allows for interactive peeking into a running POE +application. + +%description -l pl +Ten komponent umo?liwia interaktywne podgl?danie dzia?aj?cych +aplikacji POE. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -46,7 +53,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE +%doc Changes LICENSE %{perl_vendorlib}/POE/Component/DebugShell.pm %{_mandir}/man3/* @@ -56,9 +63,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 07:48:55 qboosh +- descs, md5 + Revision 1.2 2005/08/24 10:47:55 agaran - missing buildreq Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: POE-Component-DirWatch-0.02.tar.gz Message-ID: <16990.1125129261@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DirWatch-0.02.tar.gz d41814d4a100c10f270c09638f193ccc POE-Component-DirWatch-0.02.tar.gz Size: 4375 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u SPECS/perl-POE-Component-DirWatch.spec:1.1 SPECS/perl-POE-Component-DirWatch.spec:1.2 --- SPECS/perl-POE-Component-DirWatch.spec:1.1 Wed Aug 24 12:53:29 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Sat Aug 27 09:54:15 2005 @@ -6,27 +6,35 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DirWatch -Summary: POE::Component::DirWatch +Summary: POE::Component::DirWatch - POE directory watcher +Summary(pl): POE::Component::DirWatch - obserwowanie katalog?w w POE Name: perl-POE-Component-DirWatch Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: d41814d4a100c10f270c09638f193ccc +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -#BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback -as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as -an FTP upload directory. +POE::Component::DirWatch watches a directory for files. It creates a +separate session which invokes a user-supplied callback as soon as if +finds a file in the directory. Its primary intended use is processing +a "drop-box" style directory, such as an FTP upload directory. + +%description -l pl +POE::Component::DirWatch obserwowuje katalog pod k?tem plik?w. Tworzy +oddzieln? sesj?, kt?ra wywo?uje przekazane przez u?ytkownika wywo?anie +zwrotne zaraz jak znajdzie w katalogu plik. G??wnym zastosowaniem jest +przetwarzanie katalog?w s?u??cych do wrzucania plik?w, takich jak +katalog upload dost?pny przez FTP. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:54:15 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:53:29 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DirWatch.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:57:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: POE-Component-Logger-1.00.tar.gz Message-ID: <21271.1125129471@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-Logger-1.00.tar.gz b36cfad2d2d446103cbcf671270681ff POE-Component-Logger-1.00.tar.gz Size: 2910 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:57:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: perl-POE-Component-Logger.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-Logger.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u SPECS/perl-POE-Component-Logger.spec:1.1 SPECS/perl-POE-Component-Logger.spec:1.2 --- SPECS/perl-POE-Component-Logger.spec:1.1 Wed Aug 24 12:58:32 2005 +++ SPECS/perl-POE-Component-Logger.spec Sat Aug 27 09:57:45 2005 @@ -6,27 +6,33 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-Logger -Summary: perl(POE::Component::Logger) +Summary: POE::Component::Logger - a POE logging class +Summary(pl): POE::Component::Logger - klasa loguj?ca dla POE Name: perl-POE-Component-Logger Version: 1.00 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: b36cfad2d2d446103cbcf671270681ff +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE %if %{with tests} BuildRequires: perl-Log-Dispatch-Config %endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'perl(anything_fake_or_conditional)' - %description -POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config +A highly flexible logger component for POE that uses Log::Dispatch and +Log::Dispatch::Config for ultimate flexibility and power. + +%description -l pl +Bardzo elastyczny komponent loguj?cy dla POE, u?ywaj?cy Log::Dispatch +i Log::Dispatch::Config dla maksymalnej elastyczno?ci i mocy. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +66,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:57:45 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:58:32 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-Logger.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: perl-POE-Component-TSTP.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u SPECS/perl-POE-Component-TSTP.spec:1.1 SPECS/perl-POE-Component-TSTP.spec:1.2 --- SPECS/perl-POE-Component-TSTP.spec:1.1 Wed Aug 24 13:00:47 2005 +++ SPECS/perl-POE-Component-TSTP.spec Sat Aug 27 10:03:06 2005 @@ -6,25 +6,32 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-TSTP -Summary: POE::Component::TSTP - perl module +Summary: POE::Component::TSTP - a POE component to handle Ctrl-Z +Summary(pl): POE::Component::TSTP - komponent POE obs?uguj?cy Ctrl-Z Name: perl-POE-Component-TSTP Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: 0ac0dafa63a99b3e305e073e30bb9f22 +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE component handling SIGTSTP, ctrl-z usually. +POE component handling SIGTSTP, Ctrl-Z usually. By default, POE +applications do not respond to Ctrl-Z due to slightly strange signal +handling semantics. This module fixes that. + +%description -l pl +Komponent POE obs?uguj?cy SIGTSTP, czyli zwykle Ctrl-Z. Domy?lnie +aplikacje POE nie reaguj? na Ctrl-Z ze wzgl?du na nieco dziwn? +semantyk? obs?ugi sygna??w. Ten modu? poprawia to. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -58,6 +65,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:03:06 qboosh +- pl, md5 + Revision 1.1 2005/08/24 11:00:47 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-TSTP.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: POE-Component-TSTP-0.02.tar.gz Message-ID: <28679.1125129791@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-TSTP-0.02.tar.gz 0ac0dafa63a99b3e305e073e30bb9f22 POE-Component-TSTP-0.02.tar.gz Size: 1685 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 10:07:50 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS (DEVEL): hal.spec - prevent docs building with --without docs In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 08:07:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - prevent docs building with --without docs ---- Files affected: SPECS: hal.spec (1.75.2.3 -> 1.75.2.4) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.75.2.3 SPECS/hal.spec:1.75.2.4 --- SPECS/hal.spec:1.75.2.3 Wed Aug 3 19:29:36 2005 +++ SPECS/hal.spec Sat Aug 27 10:07:45 2005 @@ -130,7 +130,9 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ @@ -232,6 +234,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + Revision 1.75.2.3 2005/08/03 17:29:36 wiget - don't duplicate %{_datadir}/%{name}/device-manger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.75.2.3&r2=1.75.2.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:09:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pear-HTML_AJAX.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:09:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: php-pear-HTML_AJAX.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_AJAX.spec diff -u SPECS/php-pear-HTML_AJAX.spec:1.3 SPECS/php-pear-HTML_AJAX.spec:1.4 --- SPECS/php-pear-HTML_AJAX.spec:1.3 Sun Aug 21 19:33:51 2005 +++ SPECS/php-pear-HTML_AJAX.spec Sat Aug 27 10:09:13 2005 @@ -24,15 +24,27 @@ %description Provides PHP and JavaScript libraries for performing AJAX (Communication from JavaScript to your browser without reloading the -page) +page). Offers OO proxies in JavaScript of registered PHP or proxyless -operation Serialization of data sent between PHP and JavaScript is +operation. Serialization of data sent between PHP and JavaScript is provided by a driver model, currently JSON and Null encodings are -provided +provided. In PEAR status of this package is: %{_status}. +%description -l pl +Ta klasa dostarcza biblioteki PHP i JavaScript do przeprowadzania AJAX +(komunikacji z JavaScriptu do przegl?darki bez prze?adowywania +strony). + +Oferuje zorientowane obiektowo proxy w JavaScripcie z zarejestrowanym +PHP lub operacje bez proxy. Serializacja danych przesy?anych pomi?dzy +PHP i JavaScriptem jest zapewniana przez model sterownik?w, aktualnie +dostarczone s? kodowania JSON i Null. + +Ta klasa ma w PEAR status: %{_status}. + %prep %setup -q -c @@ -40,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} -cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/ +cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} cp -a %{_pearname}-%{version}/js $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/AJAX/js %{__sed} -i -e 's#@data-dir@#%{php_pear_dir}#g' -e "s#'HTML_AJAX'#'HTML'.DIRECTORY_SEPARATOR.'AJAX'#g" \ @@ -60,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 08:09:13 qboosh +- pl desc + Revision 1.3 2005/08/21 17:33:51 adamg - updated to 0.1.4 @@ -68,4 +83,3 @@ Revision 1.1 2005/08/18 18:02:15 arekm - initial package - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_AJAX.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:11:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: HTML_Template_IT-1.1.1.tgz Message-ID: <8083.1125130309@distfiles.pld-linux.org> FATAL: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz md5 mismatch, needed 6062a6b0cf6033b206bd62aaeb36c055, got c50e9c31b94d7ee5febdc90ec8653e13 Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: HTML_Template_IT-1.1.1.tgz Message-ID: <10124.1125130404@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz c50e9c31b94d7ee5febdc90ec8653e13 HTML_Template_IT-1.1.1.tgz Size: 18476 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pear-HTML_Template_IT.spec - really updated to 1.1.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:13:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - really updated to 1.1.1 ---- Files affected: SPECS: php-pear-HTML_Template_IT.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_Template_IT.spec diff -u SPECS/php-pear-HTML_Template_IT.spec:1.18 SPECS/php-pear-HTML_Template_IT.spec:1.19 --- SPECS/php-pear-HTML_Template_IT.spec:1.18 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-HTML_Template_IT.spec Sat Aug 27 10:13:15 2005 @@ -13,7 +13,7 @@ License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 6062a6b0cf6033b206bd62aaeb36c055 +# Source0-md5: c50e9c31b94d7ee5febdc90ec8653e13 URL: http://pear.php.net/package/HTML_Template_IT/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -94,8 +94,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/27 08:13:15 qboosh +- really updated to 1.1.1 + Revision 1.18 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[partially updated to 1.1.1] Revision 1.17 2004/12/03 22:12:19 adamg - rebuild with new PEAR provides/requires scripts ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pear-MDB2.spec - unbroken last changelog entry In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unbroken last changelog entry ---- Files affected: SPECS: php-pear-MDB2.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php-pear-MDB2.spec diff -u SPECS/php-pear-MDB2.spec:1.8 SPECS/php-pear-MDB2.spec:1.9 --- SPECS/php-pear-MDB2.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-MDB2.spec Sat Aug 27 10:17:19 2005 @@ -69,8 +69,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 08:17:19 qboosh +- unbroken last changelog entry + Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[updated to 2.0.0beta4] Revision 1.7 2005/03/26 19:06:36 adamg - install missing files (Tools/Manager/*); release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: MDB2-2.0.0beta4.tgz Message-ID: <15292.1125130651@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/MDB2-2.0.0beta4.tgz 95aee608b6c980b5c99ebbf7425c6aa8 MDB2-2.0.0beta4.tgz Size: 166279 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:21:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: rsync-segv.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:21:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: rsync-segv.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: ffmpeg.spec - sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: ffmpeg.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/ffmpeg.spec diff -u SPECS/ffmpeg.spec:1.49 SPECS/ffmpeg.spec:1.50 --- SPECS/ffmpeg.spec:1.49 Thu Aug 11 11:46:18 2005 +++ SPECS/ffmpeg.spec Sat Aug 27 10:22:52 2005 @@ -19,14 +19,16 @@ Patch2: %{name}-gcc4.patch URL: http://ffmpeg.sourceforge.net/ BuildRequires: SDL-devel +BuildRequires: faac-devel BuildRequires: freetype-devel %ifarch ppc # require version with altivec support fixed BuildRequires: gcc >= 5:3.3.2-3 %endif %{?with_imlib2:BuildRequires: imlib2-devel >= 1.1.0-2} +BuildRequires: lame-libs-devel BuildRequires: libtool >= 2:1.4d-3 -BuildRequires: faac-devel +BuildRequires: libvorbis-devel %ifarch %{ix86} %ifnarch i386 i486 BuildRequires: nasm @@ -36,8 +38,6 @@ BuildRequires: tetex BuildRequires: texinfo BuildRequires: zlib-devel -BuildRequires: lame-libs-devel -BuildRequires: libvorbis-devel %{?with_autoreqdep:BuildConflicts: libpostproc} Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -229,6 +229,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/27 08:22:52 qboosh +- sorted BRs + Revision 1.49 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.49&r2=1.50&f=u From qboosh at pld-linux.org Sat Aug 27 10:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: X11-driver-firegl-inter_module_get.patch (REMOVED), X11-d... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:27:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I suppose) ---- Files affected: SOURCES: X11-driver-firegl-inter_module_get.patch (1.1 -> NONE) (REMOVED), X11-driver-firegl-pci_name.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:30:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pear-Services_DynDNS.spec - pl cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:30:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl cosmetic ---- Files affected: SPECS: php-pear-Services_DynDNS.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pear-Services_DynDNS.spec diff -u SPECS/php-pear-Services_DynDNS.spec:1.1 SPECS/php-pear-Services_DynDNS.spec:1.2 --- SPECS/php-pear-Services_DynDNS.spec:1.1 Sun Aug 21 20:05:58 2005 +++ SPECS/php-pear-Services_DynDNS.spec Sat Aug 27 10:30:29 2005 @@ -6,7 +6,7 @@ %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - provides access to the DynDNS web service -Summary(pl): %{_pearname} - dost?p do serwis?w DynDNS +Summary(pl): %{_pearname} - dost?p do us?ugi WWW DynDNS Name: php-pear-%{_pearname} Version: 0.3.1 Release: 1 @@ -57,6 +57,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:30:29 qboosh +- pl cosmetic + Revision 1.1 2005/08/21 18:05:58 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Services_DynDNS.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:31:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: crossfire-client-big_endian.patch (REMOVED), crossfire-cl... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:31:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete (acc. to wiget) ---- Files affected: SOURCES: crossfire-client-big_endian.patch (1.1 -> NONE) (REMOVED), crossfire-client-memleak.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_free.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_darkness.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:34:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: crossfire-client.spec - new-style bcond, strict internal deps In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:34:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new-style bcond, strict internal deps ---- Files affected: SPECS: crossfire-client.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/crossfire-client.spec diff -u SPECS/crossfire-client.spec:1.35 SPECS/crossfire-client.spec:1.36 --- SPECS/crossfire-client.spec:1.35 Sun Aug 21 10:53:26 2005 +++ SPECS/crossfire-client.spec Sat Aug 27 10:34:06 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without images # don't build images package +# %define sndver 1.4.0 %define imgver 1.7.1 Summary: Crossfire client @@ -21,7 +25,7 @@ BuildRequires: autoconf BuildRequires: gtk+-devel BuildRequires: perl-base -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -53,7 +57,7 @@ Summary: Crossfire sounds Summary(pl): D?wi?ki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description sounds Some sound files and the sound server for crossfire. @@ -65,7 +69,7 @@ Summary: GTK+ Crossfire client Summary(pl): Klient Crossfire pod GTK+ Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk GTK+ client to crossfire. @@ -96,7 +100,7 @@ Summary: GTK+2 Crossfire client Summary(pl): Klient Crossfire pod GTK+2 Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk2 GTK+2 client to crossfire. @@ -123,12 +127,11 @@ przedmiot?w i walcz?c z potworami. Mog? gra? w kooperacji lub przeciwko sobie w tym samym "?wiecie". - %package images Summary: Crossfire images Summary(pl): Obrazki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description images Some images extracted from server for Crossfire. @@ -150,7 +153,7 @@ %prep %setup -q -a1 mv -f sounds cfsounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install -d images cd images tar xzf %{SOURCE2} @@ -172,7 +175,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/ -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install images/bmaps.client images/crossfire.base images/crossfire.clsc \ $RPM_BUILD_ROOT%{_datadir}/%{name} %endif @@ -196,7 +199,7 @@ %attr(755,root,root) %{_bindir}/cfsndserv* %{_datadir}/%{name}/sounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} %files images %defattr(644,root,root,755) %{_datadir}/%{name}/bmaps.client @@ -219,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/27 08:34:06 qboosh +- new-style bcond, strict internal deps + Revision 1.35 2005/08/21 08:53:26 wiget - updated to 1.8.0 (images to 1.7.1) - added gtk2 subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossfire-client.spec?r1=1.35&r2=1.36&f=u From qboosh at pld-linux.org Sat Aug 27 10:36:44 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:36:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dbx.spec diff -u SPECS/php-pecl-dbx.spec:1.1 SPECS/php-pecl-dbx.spec:1.2 --- SPECS/php-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php-pecl-dbx.spec Sat Aug 27 10:36:39 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:36:39 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:37:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php4-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:37:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php4-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-dbx.spec diff -u SPECS/php4-pecl-dbx.spec:1.1 SPECS/php4-pecl-dbx.spec:1.2 --- SPECS/php4-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php4-pecl-dbx.spec Sat Aug 27 10:37:22 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:37:22 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: Zope3.spec - pl for python- In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:33:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for python- ---- Files affected: SPECS: Zope3.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.1 SPECS/Zope3.spec:1.2 --- SPECS/Zope3.spec:1.1 Fri Aug 26 10:43:05 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:33:06 2005 @@ -1,5 +1,4 @@ # $Revision$, $Date$ - Summary: An application server and portal toolkit for building Web sites Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW @@ -75,10 +74,9 @@ eles ao inv?s desse RPM. %package -n python-zope -Summary: Python packages developed as part of the Zope 3 project. -Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Summary: Python packages developed as part of the Zope 3 project +Summary(pl): Modu?y Pythona rozwijane w projekcie Zope 3 Group: Development/Tools -Obsoletes: ZopeInterface Provides: ZopeInterface Provides: python-zope-cachedescriptors Provides: python-zope-component @@ -104,15 +102,25 @@ Provides: python-zope-tales Provides: python-zope-testing Provides: python-zope-thread +Obsoletes: ZopeInterface %description -n python-zope -The "zope" package is a pure namespace package holding packages developed as -part of the Zope 3 project. +The "zope" package is a pure namespace package holding packages +developed as part of the Zope 3 project. -Generally, the immediate subpackages of the "zope" package should be useful and -usable outside of the Zope application server. Subpackages of the "zope" -package should have minimal interdependencies, although most depend on -"zope.interface". +Generally, the immediate subpackages of the "zope" package should be +useful and usable outside of the Zope application server. Subpackages +of the "zope" package should have minimal interdependencies, although +most depend on "zope.interface". + +%description -n python-zope -l pl +Pakiet "zope" to pakiet czystej przestrzeni nazw przechowuj?cej +pakiety tworzone jako cz??? projektu Zope 3. + +Og?lnie bezpo?rednie podpakiety pakietu "zope" powinny by? przydatne i +u?ywalne poza serwerem aplikacji Zope. Podpakiety pakietu "zope" +powinny mie? minimalne zale?no?ci wzajemne, chocia? wi?kszo?? zale?y +od "zope.interface". %prep %setup -q -n Zope-%{version}%{sub_ver} @@ -250,6 +258,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:33:06 qboosh +- pl for python- + Revision 1.1 2005/08/26 08:43:05 jajcus - new, based on Zope.spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <20149.1125135207@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:35:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS (DEVEL): ingo.spec - updated to 2005-08-26 snap (many change... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:35:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-26 snap (many changes were made) - release 1 ---- Files affected: SPECS: ingo.spec (1.6 -> 1.6.4.1) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6 SPECS/ingo.spec:1.6.4.1 --- SPECS/ingo.spec:1.6 Thu Jul 21 00:07:56 2005 +++ SPECS/ingo.spec Sat Aug 27 11:35:39 2005 @@ -1,14 +1,18 @@ # $Revision$, $Date$ + +%define _snap 2005-08-26 +%define _rel 1 +# %include /usr/lib/rpm/macros.php Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo Version: 1.0.1 -Release: 1.1 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW -Source0: http://ftp.horde.org/pub/ingo/%{name}-h3-%{version}.tar.gz -# Source0-md5: 7fce229d752e5b981621e215e4fc56e8 +Source0: ftp://ftp.horde.org/pub/snaps/2005-08-26/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 32dd41dafa8b2dd0968fb6ba1e139c0a Source1: %{name}.conf Patch0: %{name}-path.patch URL: http://www.horde.org/ingo/ @@ -55,7 +59,7 @@ . %prep -%setup -q -n %{name}-h3-%{version} +%setup -q -n %{name} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -133,6 +137,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.1 2005/08/27 09:35:39 paszczus +- updated to 2005-08-26 snap (many changes were made) +- release 1 + Revision 1.6 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6&r2=1.6.4.1&f=u From paszczus at pld-linux.org Sat Aug 27 11:36:20 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ingo-HEAD-2005-08-26.tar.gz Message-ID: <23684.1125135380@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/ingo-HEAD-2005-08-26.tar.gz 32dd41dafa8b2dd0968fb6ba1e139c0a ingo-HEAD-2005-08-26.tar.gz Size: 838918 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:39:52 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS (DEVEL): ingo.spec - it is a snap of 1.1 version In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:39:52 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - it is a snap of 1.1 version ---- Files affected: SPECS: ingo.spec (1.6.4.1 -> 1.6.4.2) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6.4.1 SPECS/ingo.spec:1.6.4.2 --- SPECS/ingo.spec:1.6.4.1 Sat Aug 27 11:35:39 2005 +++ SPECS/ingo.spec Sat Aug 27 11:39:47 2005 @@ -7,7 +7,7 @@ Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo -Version: 1.0.1 +Version: 1.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.2 2005/08/27 09:39:47 paszczus +- it is a snap of 1.1 version + Revision 1.6.4.1 2005/08/27 09:35:39 paszczus - updated to 2005-08-26 snap (many changes were made) - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6.4.1&r2=1.6.4.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: aee.spec - pl desc, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:46:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc, md5 ---- Files affected: SPECS: aee.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u SPECS/aee.spec:1.1 SPECS/aee.spec:1.2 --- SPECS/aee.spec:1.1 Sat Aug 27 03:10:45 2005 +++ SPECS/aee.spec Sat Aug 27 11:46:47 2005 @@ -6,19 +6,29 @@ Release: 1 License: Artistic Group: Applications/Editors -URL: http://mahon.cwx.net/ Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +# Source0-md5: f8c3a4196f1bfd46beb6b76d73ecb7a2 Patch0: %{name}-conf.patch +URL: http://mahon.cwx.net/ BuildRequires: XFree86-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description An easy to use text editor. Intended to be usable with little or no instruction. Provides both a terminal (curses based) interface and -native X-Windows interface (in which case the executable is called -xae). Features include pop-up menus, journalling (to recover from -system crash or loss of connection), cut-and-paste, multiple buffers -(associated with files or not), and much more. +native X Window System interface (in which case the executable is +called xae). Features include pop-up menus, journalling (to recover +from system crash or loss of connection), cut-and-paste, multiple +buffers (associated with files or not), and much more. + +%description -l pl +?atwy w u?yciu edytor tekstu. Ma by? u?ywalny z niewielk? albo i bez +?adnej instrukcji. Ma zar?wno interfejs terminalowy (oparty na +curses), jak i natywny interfejs X Window System (w tym wypadku +binarka nazywa si? xae). Mo?liwo?ci obejmuj? wyskakuj?ce menu, +kronik? (do odtwarzania danych po padzie systemu lub utracie +po??czenia), wytnij-i-wklej, wiele bufor?w (powi?zanych z plikami lub +nie) i wiele wi?cej. %prep %setup -q @@ -54,6 +64,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:46:47 qboosh +- pl desc, md5 + Revision 1.1 2005/08/27 01:10:45 undefine - initital pld version, partialy based on mdk spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aee.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: aee-2.2.15b.tar.gz Message-ID: <7234.1125136019@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mahon.cwx.net/sources/aee-2.2.15b.tar.gz f8c3a4196f1bfd46beb6b76d73ecb7a2 aee-2.2.15b.tar.gz Size: 184218 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:51:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: egroupware.spec - pl for new subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new subpackages ---- Files affected: SPECS: egroupware.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.8 SPECS/egroupware.spec:1.9 --- SPECS/egroupware.spec:1.8 Thu Aug 25 18:21:09 2005 +++ SPECS/egroupware.spec Sat Aug 27 11:51:01 2005 @@ -16,9 +16,9 @@ URL: http://www.egroupware.org/ Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-pcre Requires: php-gd Requires: php-mbstring +Requires: php-pcre BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,31 +40,47 @@ %package db-mysql Summary: eGroupware DB Driver for MySQL +Summary(pl): Sterownik bazy danych eGroupware dla MySQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mysql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mysql This virtual package provides MySQL database backend for eGroupware. +%description db-mysql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla +eGroupware. + %package db-pgsql Summary: eGroupware DB Driver for PostgreSQL +Summary(pl): Sterownik bazy danych eGroupware dla PostgreSQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-pgsql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-pgsql -This virtual package provides PostgreSQL database backend for eGroupware. +This virtual package provides PostgreSQL database backend for +eGroupware. + +%description db-pgsql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych PostgreSQL dla +eGroupware. %package db-mssql Summary: eGroupware DB Driver for MS SQL +Summary(pl): Sterownik bazy danych eGroupware dla MS SQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mssql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mssql This virtual package provides MS SQL database backend for eGroupware. +%description db-mssql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MS SQL dla +eGroupware. + %prep %setup -q -n %{name} @@ -178,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 09:51:01 qboosh +- pl for new subpackages + Revision 1.8 2005/08/25 16:21:09 glen - created virtual DB packages to let user choose just one database ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: Zope3.spec - fixed md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: Zope3.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.2 SPECS/Zope3.spec:1.3 --- SPECS/Zope3.spec:1.2 Sat Aug 27 11:33:06 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:51:39 2005 @@ -10,7 +10,7 @@ License: Zope Public License (ZPL) Group: Networking/Daemons Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz -# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +# Source0-md5: e22eeeae5de89c0eea9edabe3f2c3c4d Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -258,6 +258,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 09:51:39 qboosh +- fixed md5 + Revision 1.2 2005/08/27 09:33:06 qboosh - pl for python- ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: Zope3-3.1.0c1.tgz Message-ID: <14186.1125136318@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz e22eeeae5de89c0eea9edabe3f2c3c4d Zope3-3.1.0c1.tgz Size: 3987090 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:52:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: subversion-SWIGEXPORT.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:52:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: subversion-SWIGEXPORT.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:55:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: initng-PLD.patch (REMOVED) - outdated (I assume) In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:55:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I assume) ---- Files affected: SOURCES: initng-PLD.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:57:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: jude.spec - pl fix, unified preamble In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:57:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix, unified preamble ---- Files affected: SPECS: jude.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.6 SPECS/jude.spec:1.7 --- SPECS/jude.spec:1.6 Thu Aug 25 11:58:52 2005 +++ SPECS/jude.spec Sat Aug 27 11:57:41 2005 @@ -10,10 +10,10 @@ Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop Source2: %{name}-icon.png +NoSource: 0 URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch -NoSource: 0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -21,8 +21,8 @@ designing in JavaTM and UML1.4 (Unified Modeling Language). %description -l pl -Jude jest nowym narz?dziem obs?uguj?cym obiektowo-zorientowane -przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany +Jude jest nowym narz?dziem obs?uguj?cym zorientowane obiektowo +przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany j?zyk modelowania). %prep @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/27 09:57:41 qboosh +- pl fix, unified preamble + Revision 1.6 2005/08/25 09:58:52 heretyk - up to 1.6.2 - icon added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sat Aug 27 12:01:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: librsvg.spec - unified In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:01:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified ---- Files affected: SPECS: librsvg.spec (1.85 -> 1.86) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.85 SPECS/librsvg.spec:1.86 --- SPECS/librsvg.spec:1.85 Sat Aug 27 04:04:54 2005 +++ SPECS/librsvg.spec Sat Aug 27 12:01:34 2005 @@ -122,7 +122,7 @@ Bibliotecas est?ticas para o desenvolvimento de aplica??es com librsvg. -%package -n mozilla-plugin-rsvg +%package -n mozilla-plugin-rsvg Summary: Mozilla SVG plugin using librsvg Summary(pl): Wtyczka Mozilli do SVG wykorzystuj?ca librsvg Group: X11/Applications/Multimedia @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86 2005/08/27 10:01:34 qboosh +- unified + Revision 1.85 2005/08/27 02:04:54 aredridel - up to 2.11.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.85&r2=1.86&f=u From qboosh at pld-linux.org Sat Aug 27 12:04:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:04:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u SPECS/openldap-schema-mozillaorgperson.spec:1.1 SPECS/openldap-schema-mozillaorgperson.spec:1.2 --- SPECS/openldap-schema-mozillaorgperson.spec:1.1 Fri Aug 26 01:05:07 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Sat Aug 27 12:04:13 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Mozilla LDAP schema +Summary(pl): Schemat LDAP dla Mozilli Name: openldap-schema-mozillaorgperson Version: 0.6.3 Release: 0.2 @@ -19,6 +20,10 @@ This package contains LDAPv3 schema for use with the Mozilla Address Book. +%description -l pl +Ten pakiet zawiera schemat LDAPv3 do u?ywania z ksi??k? adresow? +Mozilli. + %prep %setup -q -c -T cp %{SOURCE0} . @@ -77,6 +82,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:04:13 qboosh +- pl + Revision 1.1 2005/08/25 23:05:07 glen - created - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap-schema-mozillaorgperson.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pecl-cpdf.spec - cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:08:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetic ---- Files affected: SPECS: php-pecl-cpdf.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u SPECS/php-pecl-cpdf.spec:1.1 SPECS/php-pecl-cpdf.spec:1.2 --- SPECS/php-pecl-cpdf.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-cpdf.spec Sat Aug 27 12:08:06 2005 @@ -3,7 +3,7 @@ %define _status stable Summary: %{_modname} - extension module for PHP -Summary(pl): %{_modname} - modu? dla php +Summary(pl): %{_modname} - modu? dla PHP Name: php-pecl-%{_modname} Version: 2.0.0 Release: 1 @@ -69,6 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:08:06 qboosh +- cosmetic + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-cpdf.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <4478.1125137290@distfiles.pld-linux.org> wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <8692.1125137465@distfiles.pld-linux.org> wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: php-pecl-dio.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:11:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: php-pecl-dio.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dio.spec diff -u SPECS/php-pecl-dio.spec:1.1 SPECS/php-pecl-dio.spec:1.2 --- SPECS/php-pecl-dio.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-dio.spec Sat Aug 27 12:11:01 2005 @@ -3,6 +3,7 @@ %define _status stable Summary: %{_modname} - Direct I/O functions +Summary(pl): %{_modname} - funkcje bezpo?redniego we/wy Name: php-pecl-%{_modname} Version: not-yet Release: 1 @@ -21,7 +22,7 @@ %define extensionsdir %{_libdir}/php %description -PHP supports the direct io functions as described in the Posix +PHP supports the direct I/O functions as described in the Posix Standard (Section 6) for performing I/O functions at a lower level than the C-Language stream I/O functions (fopen(), fread(),..). The use of the DIO functions should be considered only when direct control @@ -30,6 +31,17 @@ In PECL status of this extension is: %{_status}. +%description -l pl +PHP obs?uguje funkcje bezpo?redniego we/wy wg opisu w standardzie +POSIX (sekcji 6) do wykonywania operacji we/wy na poziomie ni?szym ni? +funkcje strumieni we/wy w j?zyku C (fopen(), fread()...). U?ycie +funkcji DIO powinno by? rozwa?ane tylko je?li potrzebna jest +bezpo?rednia kontrola nad urz?dzeniem. We wszystkich innych +przypadkach odpowiedniejsze s? standardowe funkcje operacji na +systemie plik?w. + +To rozszerzenie ma w PECL status: %{_status}. + %prep %setup -q -c @@ -66,6 +78,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:11:01 qboosh +- pl + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dio.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:19:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: ruby-open4.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:19:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ruby-open4.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u SPECS/ruby-open4.spec:1.1 SPECS/ruby-open4.spec:1.2 --- SPECS/ruby-open4.spec:1.1 Thu Aug 25 21:24:44 2005 +++ SPECS/ruby-open4.spec Sat Aug 27 12:18:59 2005 @@ -3,6 +3,7 @@ %define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') %define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') Summary: Ruby open3 with exit reporting +Summary(pl): open3 w Rubym z raportowaniem wyj?cia Name: ruby-open4 Version: 0.1.0 Release: 1 @@ -20,6 +21,9 @@ %description Ruby open3 with exit reporting. +%description -l pl +open3 w Rubym z raportowaniem wyj?cia. + %prep %setup -q -n open4-%{version} @@ -56,6 +60,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:18:59 qboosh +- pl + Revision 1.1 2005/08/25 19:24:44 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ruby-open4.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sat Aug 27 12:28:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:12 2005 Subject: PLD-doc: BuildRequires.txt - elaborate %service macros versions In-Reply-To: References: Message-ID: Author: glen Date: Sat Aug 27 10:28:51 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - elaborate %service macros versions ---- Files affected: PLD-doc: BuildRequires.txt (1.40 -> 1.41) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.40 PLD-doc/BuildRequires.txt:1.41 --- PLD-doc/BuildRequires.txt:1.40 Tue Aug 23 20:33:10 2005 +++ PLD-doc/BuildRequires.txt Sat Aug 27 12:28:46 2005 @@ -110,7 +110,10 @@ Requires(postun): /usr/sbin/groupdel # %service +# basic %service support BuildRequires: rpmbuild(macros) >= 1.228 +# %service which is one command in shell context ([ "$condition" ] || %service) +BuildRequires: rpmbuild(macros) >= 1.230 Requires(post,preun): rc-scripts # /sbin/chkconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.40&r2=1.41&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: xorg-lib-xtrans.spec - merged descs from libXtrans.spec, Ob... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from libXtrans.spec, Obsoletes: libXtrans* ---- Files affected: SPECS: xorg-lib-xtrans.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.1 SPECS/xorg-lib-xtrans.spec:1.2 --- SPECS/xorg-lib-xtrans.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 12:38:00 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # $Rev: 3233 $, $Date$ # -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Name: xorg-lib-xtrans Version: 0.99.0 Release: 0.04 @@ -20,24 +20,29 @@ %define _prefix /usr/X11R6 %description -xtrans library. +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description -l pl -Biblioteka xtrans. - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %package devel -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Group: X11/Development/Libraries Requires: xorg-proto-xproto-devel +Obsoletes: libXtrans-devel %description devel -xtrans library +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description devel -l pl -Biblioteka xtrans - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %prep %setup -q -n xtrans-%{version} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:38:00 qboosh +- merged descs from libXtrans.spec, Obsoletes: libXtrans* + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:53 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: libXtrans.spec (REMOVED) - obsoleted by xorg-lib-xtrans In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - obsoleted by xorg-lib-xtrans ---- Files affected: SPECS: libXtrans.spec (1.7 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 12:40:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:12 2005 Subject: PLD-doc: PLD-update-TODO - updated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:40:31 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - updated ---- Files affected: PLD-doc: PLD-update-TODO (1.248 -> 1.249) ---- Diffs: ================================================================ Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.248 PLD-doc/PLD-update-TODO:1.249 --- PLD-doc/PLD-update-TODO:1.248 Wed Aug 17 19:20:22 2005 +++ PLD-doc/PLD-update-TODO Sat Aug 27 12:40:26 2005 @@ -2,23 +2,24 @@ AfterStep(12) [OLD] 2.00.02 [NEW] 2.1.2 AutoIndex(11) [OLD] 2.1.1 [NEW] 2.1.2 Azureus(9) [OLD] 2.1.0.4 [NEW] 2.3.0.4 -DenyHosts(9) [OLD] 0.9.8 [NEW] 0.9.9 -EasyBMP(10) [OLD] 0.63 [NEW] 0.65 -EasyBMP(12) [OLD] 0.63 [NEW] 0.64 +BitTorrent(9) [OLD] 4.1.3 [NEW] 4.1.4 +DenyHosts(9) [OLD] 0.9.8 [NEW] 1.0.2 +EasyBMP(10) [OLD] 0.65 [NEW] 0.66 GNUnet(13) [OLD] 0.6.5 [NEW] 0.6.6 GWorkspace(9) [OLD] 0.6.5 [NEW] 0.7.1 Gauche(9) [OLD] 0.5.5 [NEW] 0.8.5 -GeoIP(9) [OLD] 1.3.12 [NEW] 1.3.13 IRRToolSet(13) [OLD] 4.7.3 [NEW] 4.8.2 ISMail(9) [OLD] 1.7.3 [NEW] 1.7.4 Isearch(9) [OLD] 1.47b [NEW] 1.47i +LabPlot(9) [OLD] 1.4.1 [NEW] 1.5.0.1 MayaVi(9) [OLD] 1.3 [NEW] 1.4 -Mesa(14) [OLD] 6.2.1 [NEW] 6.3 -Mesa(16) [OLD] 6.2.1 [NEW] 6.3 +Mesa(14) [OLD] 6.2.1 [NEW] 6.3.2 +Mesa(16) [OLD] 6.2.1 [NEW] 6.3.2 Narval-pda(11) [OLD] 20011016 [NEW] 20020927 STLport(10) [OLD] 4.6.2 [NEW] 5.0RC2 -TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.6 -TkDVD(9) [OLD] 3.6 [NEW] 3.7 +Slune(9) [OLD] 1.0.8 [NEW] 1.0.9 +TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.7 +TkDVD(9) [OLD] 3.6 [NEW] 3.8 Zope(20) [OLD] 2.7.7 [NEW] 2.8.1 Zope-CMF(14) [OLD] 1.4.7 [NEW] 1.5.3 Zope-LocalFS(11) [OLD] 1.6 [NEW] 1.7rc1 @@ -27,53 +28,63 @@ Zope-ZAAPlugins(10) [OLD] 2.3 [NEW] 2.21 Zope-ZAttachmentAttribute(10) [OLD] 2.3 [NEW] 2.21 ZopeInterface(9) [OLD] 3.0.1 [NEW] 3.1.0b1 -abcde(9) [OLD] 2.2.6 [NEW] 2.3.0 +abcde(9) [OLD] 2.2.6 [NEW] 2.3.2 aboot(10) [OLD] 0.9b [NEW] 1.0_pre20040408 adm8211(18) [OLD] 20050323 [NEW] 20050620 aegis(9) [OLD] 4.16 [NEW] 4.20 -alien(10) [OLD] 8.53 [NEW] 8.56 alleyoop(9) [OLD] 0.8.2 [NEW] 0.9.0 alltray(9) [OLD] 0.51 [NEW] 0.60 -alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b +alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b [1.0.10rc1] +alsa-lib(17) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-oss(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-tools(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-utils(13) [OLD] 1.0.9a [NEW] 1.0.10rc1 am-utils(12) [OLD] 6.0.10 [NEW] 6.1.1 amaya(9) [OLD] 8.6 [NEW] 9.2.1 -anjuta(12) [OLD] 1.2.3 [NEW] 2.0.1 +anjuta(12) [OLD] 1.2.4 [NEW] 2.0.1 antinat(9) [OLD] 0.71 [NEW] 0.90 antlr(17) [OLD] 2.7.5 [NEW] 3.0ea5 +aoetools(14) [OLD] 5 [NEW] 6 apache-mod_bt(11) [OLD] 0.0.4 [NEW] 0.0.13 apache-mod_caml(11) [OLD] 1.3.4 [NEW] 1.3.6 apache-mod_epp(16) [OLD] 1.1 [NEW] 1.2 apache-mod_perl(31) [OLD] 2.0.0 [NEW] 2.0.1 -apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.6 -apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.7 +apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apache-mod_transform(11) [OLD] 0.4.0 [NEW] 0.6.0 +apache-mod_vhs(11) [OLD] 1.0.16 [NEW] 1.0.18 apache1-mod_chroot(11) [OLD] 0.4 [NEW] 0.5 apache1-mod_mp3(13) [OLD] 0.40 [NEW] 1.2 -apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apcupsd(14) [OLD] 3.10.17 [NEW] 3.10.18 +apr(10) [OLD] 1.1.1 [NEW] 1.2.1 +apr-util(14) [OLD] 1.1.2 [NEW] 1.2.1 aptitude(14) [OLD] 0.2.11.1 [NEW] 0.3.3 aqsis(9) [OLD] 1.0.0 [NEW] 1.1.0.30062005 asa(14) [OLD] 0.1.6 [NEW] 0.1.7 aspell(12) [OLD] 0.60.2 [NEW] 0.60.3 aspell-he(11) [OLD] 0.8 [NEW] 0.9 -aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050815 +aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050824 asterisk-addons(10) [OLD] 1.0.7 [NEW] 1.0.9 +atlas(14) [OLD] 3.7.10 [NEW] 3.7.11 atmelwlandriver(22) [OLD] 3.4.1.0 [NEW] 3.4.1.1 atop(9) [OLD] 1.13 [NEW] 1.14 -audit(9) [OLD] 0.9.7 [NEW] 1.0.2 +audit(9) [OLD] 0.9.7 [NEW] 1.0.3 autodns(12) [OLD] 0.0.6 [NEW] 0.0.8 autofs(15) [OLD] 4.1.3 [NEW] 4.1.4 ayam(10) [OLD] 1.8.2 [NEW] 1.8.3 -bacula(15) [OLD] 1.36.3 [NEW] 1.37.30 +bacula(15) [OLD] 1.36.3 [NEW] 1.37.36 bacula(19) [OLD] 1.36.3 [NEW] 1.37.18 batik(9) [OLD] 1.5.1 [NEW] 1.6 bbkeys(9) [OLD] 0.8.6 [NEW] 0.9.0 +bglibs(9) [OLD] 1.024 [NEW] 1.027 bigloo(9) [OLD] 2.6b [NEW] 2.6f bigsister(19) [OLD] 0.99b2 [NEW] 0.99c3 bincimap(9) [OLD] 1.2.12final [NEW] 1.2.13final bitbake(9) [OLD] 1.2 [NEW] 1.2.1 bless(9) [OLD] 0.3.1 [NEW] 0.3.6 -bogofilter(10) [OLD] 0.94.14 [NEW] 0.95.2 +bluefish(17) [OLD] 1.0.2 [NEW] 1.0.3 +bogofilter(10) [OLD] 0.95.2 [NEW] 0.96.0 boost-jam(9) [OLD] 3.1.10 [NEW] 3.1.11 bootsplash(13) [OLD] 3.1 [NEW] 3.2 brltty(10) [OLD] 3.6.1 [NEW] 3.6.2 @@ -81,11 +92,12 @@ bsdmake(9) [OLD] 11 [NEW] 16 bttv(20) [OLD] 0.7.87 [NEW] 0.9.15 bugzilla(16) [OLD] 2.18 [NEW] 2.20 +busybox(41) [OLD] 1.00 [NEW] 1.01 bygfoot(9) [OLD] 1.8.1 [NEW] 1.9.0 cacti(14) [OLD] 0.8.6c [NEW] 0.8.6f castle-combat(9) [OLD] 0.7.4 [NEW] 0.8.0a2 cbb(10) [OLD] 0.8.1 [NEW] 0.9.5b -ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.9 +ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.10 cdl3(9) [OLD] 1.2.3 [NEW] 1.2.6 cdrdao(14) [OLD] 1.1.9 [NEW] 1.2.0 cfl(9) [OLD] 0.8.0 [NEW] 1.0 @@ -96,39 +108,46 @@ cheops-ng(9) [OLD] 0.1.12 [NEW] 0.2.2 cinelerra(11) [OLD] 1.2.1 [NEW] 1.2.2 cjc(15) [OLD] 0.5.s20050709 [NEW] 0.5.s20050724 -clamsmtp(9) [OLD] 1.4.1 [NEW] 1.5 clanbomber(9) [OLD] 1.02a [NEW] 1.05 classpath(14) [OLD] 0.16 [NEW] 0.17 clearsilver(9) [OLD] 0.9.14 [NEW] 0.10.1 click-packages(9) [OLD] 1.4 [NEW] 1.4.2 clip(28) [OLD] 1.1.13 [NEW] 1.1.14 -clusterit(9) [OLD] 2.3 [NEW] 2.3.1 -conary(9) [OLD] 0.61.6 [NEW] 0.61.7 courier-imap(9) [OLD] 4.0.3 [NEW] 4.0.4 cpqarrayd(9) [OLD] 2.0 [NEW] 2.2 -crafty(9) [OLD] 19.5 [NEW] 19.19 +crafty(9) [OLD] 19.5 [NEW] 19.20 cronosII(9) [OLD] 0.2.2.23 [NEW] 0.3.0pre9 +crossalpha-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossarm-binutils(17) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossarm-newlib(9) [OLD] 1.12.0 [NEW] 1.13.0 -crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.2 +crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.3 crossavr-gcc(14) [OLD] 3.4.2 [NEW] 4.0.1 crossavr-gdb(18) [OLD] 6.2.1 [NEW] 6.3 -crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 crossdjgpp-gcc(14) [OLD] 3.3.2 [NEW] 4.0.1 crossdjgpp-pdcurses(10) [OLD] 24 [NEW] 26 crossfire(9) [OLD] 1.6.0 [NEW] 1.8.0.maps -crossfire-client(11) [OLD] 1.7.0 [NEW] 1.8.0 -crossfire-client(15) [OLD] 1.7.0 [NEW] 1.7.1 -crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 +crossmingw32-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossmingw32-gcc(26) [OLD] 3.4.3 [NEW] 4.0.1 -crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.2 +crossmingw32-lua40(10) [OLD] 4.0.1 [NEW] 5.0.2 +crossmingw32-pcre(10) [OLD] 6.2 [NEW] 6.3 +crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.3 crossmipsel-egcs(11) [OLD] 1.0.2 [NEW] 1.1.2 crossmipsel-gcc(14) [OLD] 3.3.5 [NEW] 4.0.1 +crossppc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossppc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosss390x-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossx8664-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 ctwm(9) [OLD] 3.6 [NEW] 3.7 cyclone(11) [OLD] 0.5 [NEW] 0.8 cyclone(9) [OLD] 0.5 [NEW] 0.8.1 dansguardian(10) [OLD] 2.8.0.4 [NEW] 2.8.0.6 darcs(9) [OLD] 1.0.3 [NEW] 1.0.4pre2 darkice(9) [OLD] 0.14 [NEW] 0.15 +dbus(29) [OLD] 0.36 [NEW] 0.36.1 dcc-dccd(9) [OLD] 1.2.50 [NEW] 1.3.15 debiandoc-sgml(10) [OLD] 1.1.86 [NEW] 1.1.88 debootstrap(12) [OLD] 0.2.45 [NEW] 0.3.1.5 @@ -137,7 +156,7 @@ di(9) [OLD] 3.11 [NEW] 4.1 dibbler(11) [OLD] 0.4.0 [NEW] 0.4.1 dibbler(9) [OLD] 0.4.0 [NEW] 0.4.1 -digikamimageplugins(9) [OLD] 0.7.2 [NEW] 0.7.3 +dirac(9) [OLD] 0.5.2 [NEW] 0.5.3 directory_administrator(11) [OLD] 1.6.0 [NEW] 1.7.1 dnprogs(18) [OLD] 2.23 [NEW] 2.29 doc++(14) [OLD] 3.4.9 [NEW] 3.4.10 @@ -146,17 +165,19 @@ doom3(22) [OLD] 1.1.1286 [NEW] 1.3.1302 dopewars(18) [OLD] 1.5.9 [NEW] 1.5.10 dotproject(14) [OLD] 1.0.1 [NEW] 2.0.1 -dpkg(9) [OLD] 1.10.23 [NEW] 1.13.10 +dovecot(16) [OLD] 0.99.14 [NEW] 1.0.alpha1 +dpkg(9) [OLD] 1.10.23 [NEW] 1.13.11 drgeo(9) [OLD] 1.0.0 [NEW] 1.1.0 drivel(9) [OLD] 2.0.1 [NEW] 2.0.2 dspam(52) [OLD] 3.4.9 [NEW] 3.6.beta.1 -dumb(9) [OLD] 0.9.2 [NEW] 0.9.3 dvdisaster(12) [OLD] 0.62 [NEW] 0.63 dx(12) [OLD] 4.3.2 [NEW] 4.3.3 e-uae(9) [OLD] 0.8.27 [NEW] 0.8.28 eboard(9) [OLD] 0.9.0 [NEW] 0.9.5 +ecasound(16) [OLD] 2.4.2 [NEW] 2.4.3 eclipse-plugin-TeXlipse(9) [OLD] 1.0.2 [NEW] 1.0.4 elektra(10) [OLD] 0.4.6 [NEW] 0.5.0.4 +elm(16) [OLD] 2.5.7 [NEW] 2.5.8 emacs-erc(9) [OLD] 4.0 [NEW] 5.0.4 emacs-ess(9) [OLD] 5.2.6 [NEW] 5.2.8 emacs-mew-pkg(10) [OLD] 3.3 [NEW] 4.2 @@ -166,17 +187,20 @@ epic4(10) [OLD] 1.2.9 [NEW] 2.1.3 epiphany(13) [OLD] 1.6.4 [NEW] 1.6.5 epiphany-extensions(12) [OLD] 1.6.4 [NEW] 1.6.5 -etherape(10) [OLD] 0.9.0 [NEW] 0.9.2 +etherape(10) [OLD] 0.9.0 [NEW] 0.9.3 etherboot(10) [OLD] 5.3.7 [NEW] 5.4.0 everybuddy(10) [OLD] 0.2.1beta6 [NEW] 0.4.3 [DEAD URL] evms(9) [OLD] 2.3.4 [NEW] 2.5.3 +evolution-exchange(16) [OLD] 2.3.7 [NEW] 2.3.8 exifprobe(9) [OLD] 1.2.6 [NEW] 2.0.1 exim-lite(11) [OLD] 4.51 [NEW] 4.52 expect(15) [OLD] 5.42.1 [NEW] 5.43.0 extace(9) [OLD] 1.5.0 [NEW] 1.9.3 -fax4CUPS(9) [OLD] 1.24 [NEW] 1.25 +fakeroot(10) [OLD] 1.4.2 [NEW] 1.4.3 +fax4CUPS(9) [OLD] 1.24 [NEW] 1.26 feh(9) [OLD] 1.3.2 [NEW] 1.3.4 fftrader(9) [OLD] 0.65 [NEW] 0.66 +file(35) [OLD] 4.14 [NEW] 4.15 flow-tools(9) [OLD] 0.67 [NEW] 0.68 fluxconf(14) [OLD] 0.9.7 [NEW] 0.9.8 fmio(9) [OLD] 1.2.29 [NEW] 2.0.8 @@ -185,24 +209,24 @@ foomatic-db(10) [OLD] 20050405 [NEW] 20050721 foomatic-db-engine(11) [OLD] 3.0.1 [NEW] 3.0.2 forgate(10) [OLD] 0.9 [NEW] 0.9b -fox(9) [OLD] 1.4.16 [NEW] [1.5.6 DEVEL] +fox(9) [OLD] 1.4.17 [NEW] [1.5.7 DEVEL] freenx(9) [OLD] 0.4.0 [NEW] 0.4.2 freeradius(15) [OLD] 1.0.2 [NEW] 1.0.4 freeswan(19) [OLD] 2.04 [NEW] 2.06 fspclient(10) [OLD] 0.90.0 [NEW] 0.91.0 fsplib(13) [OLD] 0.6 [NEW] 0.7 -fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.13 +fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.14 gDesklets(9) [OLD] 0.35 [NEW] 0.35.2 gai(16) [OLD] 0.5.8 [NEW] 0.5.10 gallery(16) [OLD] 1.4.4 [NEW] 1.5 gaphor(9) [OLD] 0.7.0 [NEW] 0.7.0.1 -gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.5 +gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.6 gcl(14) [OLD] 2.6.6 [NEW] 2.6.7 gcx(9) [OLD] 0.8.8 [NEW] 0.9.2 gdal(13) [OLD] 1.2.6 [NEW] 1.3.0 geneweb(18) [OLD] 4.09 [NEW] 4.10 genius(9) [OLD] 0.7.2 [NEW] 0.7.4 -gg2(20) [OLD] 2.2.6 [NEW] 2.2.7 +geos(9) [OLD] 2.1.3 [NEW] 2.1.4 ghemical(14) [OLD] 1.01 [NEW] 1.90 ghostpcl(9) [OLD] 1.38p1 [NEW] 1.41 giFT-gnutella(12) [OLD] 0.0.9.2 [NEW] 0.0.10.1 @@ -210,15 +234,17 @@ giFToxic(9) [OLD] 0.0.9 [NEW] 0.0.10 gkrellm-bgchg(9) [OLD] 0.1.4 [NEW] 0.1.5 gkrellm-pmu(9) [OLD] 2.3 [NEW] 2.4 -gksu(10) [OLD] 1.2.2 [NEW] 1.3.3 +gksu(10) [OLD] 1.2.2 [NEW] 1.3.4 glchess(9) [OLD] 0.4.7 [NEW] 0.8.6 gliv(10) [OLD] 1.9.2 [NEW] 1.9.3 global(14) [OLD] 4.7 [NEW] 4.8.6 +gmime(13) [OLD] 2.1.15 [NEW] 2.1.16 gnocatan(9) [OLD] 0.8.1.43 [NEW] 0.8.1.59, pioneers-0.9.19 gnofract4d(9) [OLD] 2.7 [NEW] 2.9 gnomad2(10) [OLD] 2.6.3 [NEW] 2.8.0 gnome-applet-bubblemon(9) [OLD] 1.2.6 [NEW] 1.2.9 -gnome-applet-netspeed(10) [OLD] 0.12.1 [NEW] 0.13 +gnome-applet-quick-lounge(9) [OLD] 2.10.0 [NEW] 2.10.1 +gnome-applet-timer(12) [OLD] 1.0 [NEW] 1.1.1 gnome-btdownload(9) [OLD] 0.0.20 [NEW] 0.0.22 gnome-chemistry-utils(13) [OLD] 0.2.5 [NEW] 0.5.0 gnome-crystal(9) [OLD] 0.6.1 [NEW] 0.6.5 @@ -227,12 +253,11 @@ gnome-mag(9) [OLD] 0.12.0 [NEW] 0.12.1 gnome-mud(9) [OLD] 0.10.5 [NEW] 0.10.7 gnome-network(13) [OLD] 1.99.2 [NEW] 1.99.5 -gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0.1 +gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0-1 gnome-telnet(9) [OLD] 2.4 [NEW] 2.5 [DEAD URL] gnome-themes(9) [OLD] 2.10.1 [NEW] 2.10.2 gnomemm(9) [OLD] 1.2.2 [NEW] 1.2.4 gnu.getopt(9) [OLD] 1.0.9 [NEW] 1.0.11 -gnubiff(13) [OLD] 2.1.3 [NEW] 2.1.4 gnue-appserver(10) [OLD] 0.4.1 [NEW] 0.4.2 gnue-common(9) [OLD] 0.5.14 [NEW] 0.6.0 gnue-designer(9) [OLD] 0.5.6 [NEW] 0.5.7 @@ -242,7 +267,6 @@ gnugk(9) [OLD] 2.0.8 [NEW] 2.2.1 gnugo(9) [OLD] 3.4 [NEW] 3.6 gnuitar(9) [OLD] 0.3.1 [NEW] 0.3.2 -gnupg(20) [OLD] 1.4.1 [NEW] 1.4.2 gnuserv(10) [OLD] 3.12.6 [NEW] 3.12.7 gnusound(9) [OLD] 0.7.1 [NEW] 0.7.4 gofish(9) [OLD] 0.22 [NEW] 1.0 @@ -255,13 +279,14 @@ gretl(9) [OLD] 1.2.4 [NEW] 1.4.1 grisbi(12) [OLD] 0.5.5 [NEW] 0.5.7 grub(24) [OLD] 0.97 [NEW] 1.90 +gsasl(15) [OLD] 0.2.6 [NEW] 0.2.7 gsdl(16) [OLD] 2.39 [NEW] 2.40 gsoap(9) [OLD] 2.7 [NEW] 2.7.1 gstreamer(9) [OLD] 0.8.10 [NEW] 0.9.1 gstreamer-ffmpeg(17) [OLD] 0.8.5 [NEW] 0.8.6 gtk+-directfb(10) [OLD] 1.3.4 [NEW] 2.0.9-2 +gtk+2(23) [OLD] 2.6.9 [NEW] 2.6.10 gtk-gnutella(10) [OLD] 0.95 [NEW] 0.95.4 -gtk-sharp2(12) [OLD] 1.9.1 [NEW] 1.9.3 gtk-theme-4Missy(9) [OLD] 1.2 [NEW] 1.2.x gtk-theme-engine-Xenophilia(9) [OLD] 0.8 [NEW] 1.2.x gtkatlantic(9) [OLD] 0.4.0 [NEW] 0.4.1 @@ -274,7 +299,7 @@ gtm(12) [OLD] 0.4.11 [NEW] 0.4.12 guarddog(9) [OLD] 2.4.0 [NEW] 2.5.0 gveejay(10) [OLD] 0.4.7 [NEW] 0.7 -gwenview(9) [OLD] 1.1.8 [NEW] 1.2.91 +gwenview(9) [OLD] 1.1.8 [NEW] 1.2.92 gwhere(15) [OLD] 0.1.6 [NEW] 0.2.1 gxmlviewer(9) [OLD] 1.2.0 [NEW] 1.3.3 gxmms(16) [OLD] 0.2.1 [NEW] 0.3.0 @@ -285,37 +310,40 @@ hk_classes(15) [OLD] 0.7.4 [NEW] 0.7.4a hnb(9) [OLD] 1.8.1 [NEW] 1.9.17 honeyd(12) [OLD] 0.8 [NEW] 1.0 -horde(20) [OLD] 3.0.4 [NEW] 3.0.5 hostap-utils(10) [OLD] 0.3.7 [NEW] 0.4.0 -hostapd(10) [OLD] 0.2.5 [NEW] 0.4.3 -howto(11) [OLD] 20050718 [NEW] 20050815 -howto-html(11) [OLD] 20050718 [NEW] 20050815 +hostapd(10) [OLD] 0.2.5 [NEW] 0.4.4 +howto(11) [OLD] 20050718 [NEW] 20050825 +howto-html(11) [OLD] 20050718 [NEW] 20050825 +hpijs(13) [OLD] 1.7.1 [NEW] 2.1.4 html2ps(10) [OLD] 1.0b3 [NEW] 1.0b4 hypersrc(9) [OLD] 4.4.15 [NEW] 5.4.18 icc(16) [OLD] 8.0.055 [NEW] 8.1.021 +icecast(14) [OLD] 2.2.0 [NEW] 2.3.0.rc1 icewm(29) [OLD] 1.2.20 [NEW] 1.2.23 ifp-line(12) [OLD] 0.2.4.5 [NEW] 0.2.4.6 iftop(10) [OLD] 0.16 [NEW] 0.17pre1 im-ja(9) [OLD] 1.3 [NEW] 1.4 +imap(15) [OLD] 2004e [NEW] 2004f imapsync(10) [OLD] 1.133 [NEW] 1.139 imcom(10) [OLD] 1.33 [NEW] 1.34 imwheel(11) [OLD] 0.9.9 [NEW] 1.0.0pre12 +inkscape(16) [OLD] 0.42 [NEW] 0.42.2 ip-filter(9) [OLD] 3.3.12 [NEW] 4.1.9 ipcad(9) [OLD] 3.6.5 [NEW] 3.6.6 -ipcalc(10) [OLD] 0.38 [NEW] 0.40 ipmiutil(9) [OLD] 1.5.8 [NEW] 1.6.7 -ipsec-tools(16) [OLD] 0.6 [NEW] 0.6.1rc1 iptables(27) [OLD] 1.3.2 [NEW] 1.3.3 ircd-hybrid(22) [OLD] 7.0.3 [NEW] 7.1.1 ircd-ptlink(16) [OLD] 6.19.3 [NEW] 6.19.4 irrd(9) [OLD] 2.2.2 [NEW] 2.2.6 ispell(14) [OLD] 3.2.06 [NEW] 3.3.02 -ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050815 +ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050825 +iv(9) [OLD] 1.2.1 [NEW] 1.3.2 ivtools(9) [OLD] 1.1.3 [NEW] 1.2.2 j(10) [OLD] 0.19.0 [NEW] 0.21.0 -jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050809 -jahshaka(9) [OLD] 1.9a3 [NEW] 1.9a9 +jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050821 +jahshaka(9) [OLD] 1.9a3 [NEW] 2.0.RC1 jakarta-commons-daemon(9) [OLD] 1.0 [NEW] 1.0.1 +jakarta-regexp(9) [OLD] 1.3 [NEW] 1.4 jakarta-struts(9) [OLD] 1.2.6 [NEW] 1.2.7 jamvm(9) [OLD] 1.3.0 [NEW] 1.3.2 java-access-bridge(9) [OLD] 1.4.2 [NEW] 1.4.5 @@ -331,17 +359,19 @@ kbear(9) [OLD] 2.1.1 [NEW] 3.0alpha1b kde-style-dotcurve(10) [OLD] 0.2.1 [NEW] 1.0rc1 kde-theme-gorilla(11) [OLD] 1.0 [NEW] 1.4 [inny Source0 URL] +kdesvn(9) [OLD] 0.5.0 [NEW] 0.5.3 kernel-char-kbde(9) [OLD] 1.0.0 [NEW] 1.1.2 kernel-misc-acerhk(17) [OLD] 0.5.18 [NEW] 0.5.27 kernel-misc-mwavem(16) [OLD] 1.0.4 [NEW] 20010714.tar.gz kernel-mosix(40) [OLD] 2.4.22 [NEW] 2.4.31 kernel-net-e100(21) [OLD] 2.3.33 [NEW] 3.4.14 kernel-net-e1000(17) [OLD] 6.0.60 [NEW] 6.1.16 -kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.1 +kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.4 kernel-pcmcia-orinoco-usb(15) [OLD] 0.0.8 [NEW] 0.1.3 kernel-video-drm(16) [OLD] 4.3.0 [NEW] 4.4.0 kernel24-video-em8300(11) [OLD] 0.14.0 [NEW] 0.15.0 kgcc(9) [OLD] 3.2.2 [NEW] 4.0.1 +kmediafactory(9) [OLD] 0.3.0 [NEW] 0.4.0 kmyfirewall(9) [OLD] 0.9.6.2 [NEW] 1.0beta1 kmymoney2(9) [OLD] 0.6.4 [NEW] 0.8 koha(12) [OLD] 1.2.2 [NEW] 2.2.3 @@ -354,19 +384,18 @@ latd(10) [OLD] 1.21 [NEW] 1.23.1 lbreakout2(9) [OLD] 2.5.2 [NEW] 2.6beta lcdf-typetools(9) [OLD] 2.17 [NEW] 2.34 -ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc1 +ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc2 leafnode(10) [OLD] 1.11.2 [NEW] 1.11.3 lg(213) [OLD] 110 [NEW] 117 -libXrender(9) [OLD] 0.8.4 [NEW] 0.9.0 libapreq(10) [OLD] 1.3 [NEW] 1.33 libapreq2(13) [OLD] 2.05 [NEW] 2.06 libdnet(12) [OLD] 1.8 [NEW] 1.10 libdockapp(13) [OLD] 0.5.0 [NEW] 0.6.1 -libdomainkeys(9) [OLD] 0.66 [NEW] 0.67 libetpan(9) [OLD] 0.37 [NEW] 0.38 libfpx(14) [OLD] 1.2.0.12 [NEW] 1.2.0.13 libhome(9) [OLD] 0.8.1 [NEW] 0.10 libhttpd(9) [OLD] 1.3 [NEW] 1.4 +libifp(9) [OLD] 1.0.0.1 [NEW] 1.0.0.2 libinklevel(9) [OLD] 0.6.4 [NEW] 0.6.5rc1 liblzf(10) [OLD] 1.5 [NEW] 1.51 libmath++(9) [OLD] 0.0.3 [NEW] 0.0.4 @@ -391,10 +420,12 @@ lirc(19) [OLD] 0.7.1 [NEW] 0.7.2 lire(12) [OLD] 1.3 [NEW] 2.0.1 lmp(9) [OLD] 0.2.99.10 [NEW] 0.3.0.pre1 -lms(19) [OLD] 1.6.2 [NEW] [1.7.2] +lms(19) [OLD] 1.6.3 [NEW] [1.7.2] log4cpp(9) [OLD] 0.3.4b [NEW] 0.3.5rc3 logfmon(10) [OLD] 0.4 [NEW] 0.7 logtool(9) [OLD] 1.1.0 [NEW] 1.3.1 +lout(11) [OLD] 3.30 [NEW] 3.31 +luma(9) [OLD] 2.2 [NEW] 2.2.1 lurker(10) [OLD] 0.8 [NEW] 1.3 lynx(15) [OLD] 2.8.5rel.1 [NEW] 2.8.6dev.13 lyx(12) [OLD] 1.3.5 [NEW] 1.3.6 @@ -406,18 +437,19 @@ manedit(9) [OLD] 0.5.12 [NEW] 0.6.1 mangoquest(9) [OLD] 0.6.3a [NEW] 0.6.4 mantis(14) [OLD] 0.19.2 [NEW] 1.0.0rc1 -mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.8 +mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.9 +md5deep(9) [OLD] 1.7 [NEW] 1.8 mdbtools(14) [OLD] 0.5 [NEW] 0.6pre1 mdns-scan(10) [OLD] 0.1 [NEW] 0.4 mecab(12) [OLD] 0.80 [NEW] 0.82pre2 mediawiki(16) [OLD] 1.4.7 [NEW] [1.5beta4] +mercurial(9) [OLD] 0.6b [NEW] 0.6c messagewall(9) [OLD] 1.0.8 [NEW] 1.1.0 [DEAD URL] metabar(9) [OLD] 0.7 [NEW] 0.8 metakit(9) [OLD] 2.4.9.3 [NEW] 2.4.9.4 mftrace(9) [OLD] 1.1.10 [NEW] 1.1.16 min12xxw(9) [OLD] 0.0.7 [NEW] 0.0.8 mixmaster(9) [OLD] 2.9.0 [NEW] 3.0b2 -mldonkey(38) [OLD] 2.6.1 [NEW] 2.6.2 mlkit(9) [OLD] 4.1.1 [NEW] 4.1.4 mlton(12) [OLD] 20021122 [NEW] 20030625 mm3d(13) [OLD] 1.1.6 [NEW] 1.1.8 @@ -425,41 +457,37 @@ moinmoin(12) [OLD] 1.3.4 [NEW] 1.3.5 molden(9) [OLD] 4.3 [NEW] 4.4 monopd(9) [OLD] 0.9.2 [NEW] 0.9.3 -monotone(13) [OLD] 0.21 [NEW] 0.22 -motion(15) [OLD] 3.1.19 [NEW] 3.2.2 +motion(15) [OLD] 3.1.19 [NEW] 3.2.3 mp1e(13) [OLD] 1.9.4 [NEW] 1.9.7cvs mpich(9) [OLD] 1.2.6 [NEW] 1.2.7 mpich2(9) [OLD] 0.97 [NEW] 1.0.2p1 mrouted(9) [OLD] 3.9beta3+IOS12 [NEW] -mrtg(19) [OLD] 2.12.1 [NEW] 2.12.2 mrxvt(10) [OLD] 0.3.13 [NEW] 0.4.1 -msmtp(9) [OLD] 1.4.3 [NEW] 1.4.4 msyslog(9) [OLD] 1.09c [NEW] 1.09d -mtd(9) [OLD] 20050624 [NEW] 20050815 +mt-st(16) [OLD] 0.9 [NEW] 0.9b +mtd(9) [OLD] 20050624 [NEW] 20050825 multipath-tools(10) [OLD] 0.3.3 [NEW] 0.4.4 muse(20) [OLD] 0.7.1 [NEW] 0.7.2pre2 mutt-nntp(22) [OLD] 1.4 [NEW] 1.4.2.1 muttprint(9) [OLD] 0.72c [NEW] 0.72d -mysql(30) [OLD] 4.1.13 [NEW] 4.1.13a -mysql-ruby(11) [OLD] 2.6 [NEW] 2.6.3 [2.7-beta2] +mysql-ruby(11) [OLD] 2.6 [NEW] 2.7 mysqlBind(9) [OLD] 1.8 [NEW] 1.92RC mywebftp(9) [OLD] 0.2 [NEW] 03rc3 nagios-plugins(12) [OLD] 1.4 [NEW] 1.4.1 nam(9) [OLD] 1.10 [NEW] 1.11 nautilus-cd-burner(13) [OLD] 2.10.1 [NEW] 2.10.2 -neon(13) [OLD] 0.24.7 [NEW] 0.25.2 +ndiswrapper(20) [OLD] 1.2 [NEW] 1.3rc1 netdude(9) [OLD] 0.3.3 [NEW] 0.4.6 netpbm(18) [OLD] 10.28 [NEW] 10.29 neveredit(9) [OLD] 0.7b2 [NEW] 0.8b1 +nginx(13) [OLD] 0.1.41 [NEW] 0.1.42 njamd(9) [OLD] 0.8.1 [NEW] 0.9.3pre2 nmap(19) [OLD] 3.81 [NEW] 3.84ALPHA1 nocc(9) [OLD] 0.9.6 [NEW] 0.9.7 noffle(9) [OLD] 1.0.1 [NEW] 1.2.0rc1 ns(12) [OLD] 2.27 [NEW] 2.28 nsd(10) [OLD] 2.2.1 [NEW] 2.3.0 -nss_mdns(9) [OLD] 0.3 [NEW] 0.5 nte(9) [OLD] 1.7.0 [NEW] 2.4 -nusoap(10) [OLD] 0.7.0 [NEW] 0.7.2 nut(13) [OLD] 2.0.1 [NEW] 2.0.2 oajabber(12) [OLD] 20040913 [NEW] [current] obexftp(9) [OLD] 0.10.3 [NEW] 0.10.6 @@ -468,15 +496,13 @@ ocaml-dbi(10) [OLD] 0.9.10 [NEW] 0.9.11 ocaml-equeue(11) [OLD] 1.2.3 [NEW] 2.1 ocaml-extlib(10) [OLD] 1.3 [NEW] 1.4 -ocaml-findlib(12) [OLD] 0.8.1 [NEW] 1.0.4 ocaml-gdome2-xslt(10) [OLD] 0.0.1 [NEW] 0.0.6 ocaml-lablgtk2(16) [OLD] 2.2.0 [NEW] 2.4.0 ocaml-net(9) [OLD] 0.95 [NEW] 1.1 ocaml-netclient(11) [OLD] 0.90.1 [NEW] 0.91.1 -ocaml-pcre(10) [OLD] 5.09.0 [NEW] 5.10.0 ocaml-postgres(12) [OLD] 20020409 [NEW] 20040120 -ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1 -ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1 +ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1.1 +ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1.1 ocaml-wlex(12) [OLD] 20030827 [NEW] 20040827 octave(27) [OLD] 2.1.71 [NEW] [bleeding-edge/2.9.3] octave-forge(9) [OLD] 2004.09.09 [NEW] 2005.06.13 @@ -484,16 +510,18 @@ openaether-utils(12) [OLD] 20040713 [NEW] [current] openct(9) [OLD] 0.6.4 [NEW] 0.6.5 openhpi(9) [OLD] 2.1.1 [NEW] 2.1.2 +openldap(26) [OLD] 2.3.5 [NEW] 2.3.6 opennap(9) [OLD] 0.43 [NEW] 0.44 -openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050816 +openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050826 openoffice-thesaurus-es(11) [OLD] 050128 [NEW] 050720 opensched(9) [OLD] 0.3.8 [NEW] 0.4.4 -openswan(11) [OLD] 2.3.1 [NEW] 2.4.0dr10 +openswan(11) [OLD] 2.3.1 [NEW] 2.4.0rc4 openvrml(13) [OLD] 0.15.9 [NEW] 0.15.10 -otrs(19) [OLD] 1.3.2 [NEW] 2.0.1 +ortp(11) [OLD] 0.7.0 [NEW] 0.7.1 +otrs(19) [OLD] 1.3.2 [NEW] 2.0.2 pam-pam_encfs(10) [OLD] 0.1 [NEW] 0.1.1 +pam-pam_ldap(15) [OLD] 178 [NEW] 180 pam-pam_mktemp(10) [OLD] 0.2.5 [NEW] 1.0.1 -pam-pam_mysql(12) [OLD] 0.5 [NEW] 0.6.0 parrot(10) [OLD] 0.2.0 [NEW] 0.2.3 partimage(11) [OLD] 0.6.5_beta2 [NEW] [0.7.2 - older than 0.6.5!] partysip(11) [OLD] 0.6.0 [NEW] 2.2.3 @@ -502,7 +530,7 @@ pbbuttonsd(14) [OLD] 0.6.10 [NEW] 0.7.1 pcb(10) [OLD] 20050315 [NEW] 20050609 pchar(9) [OLD] 1.4 [NEW] 1.5 -pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre1 +pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre3 pdp++(9) [OLD] 2.01 [NEW] 3.2a05 perl(60) [OLD] 5.8.7 [NEW] [5.9.2 DEVEL] perl-AcePerl(12) [OLD] 1.87 [NEW] 1.89 @@ -516,6 +544,7 @@ perl-Apache-Session-Wrapper(17) [OLD] 0.17 [NEW] 0.25 perl-Apache-Test(17) [OLD] 1.19 [NEW] 1.26 perl-Apache-VMonitor(17) [OLD] 2.01 [NEW] 2.05 +perl-Archive-Tar(31) [OLD] 1.24 [NEW] 1.26 perl-Archive-Zip(17) [OLD] 1.14 [NEW] 1.16 perl-Array-Compare(17) [OLD] 1.11 [NEW] 1.12 perl-Attribute-Persistent(16) [OLD] 1.0 [NEW] 1.1 @@ -525,8 +554,10 @@ perl-CGI-Application(16) [OLD] 4.01 [NEW] 4.03 perl-Cache-Simple-TimedExpiry(17) [OLD] 0.22 [NEW] 0.23 perl-Callback(14) [OLD] 1.05 [NEW] 1.06 -perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.18 +perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.20 +perl-Class-DBI-SQLite(17) [OLD] 0.09 [NEW] 0.10 perl-Class-ReturnValue(17) [OLD] 0.52 [NEW] 0.53 +perl-Class-Trigger(17) [OLD] 0.09 [NEW] 0.10 perl-Config-Auto(17) [OLD] 0.11 [NEW] 0.14 perl-Config-General(17) [OLD] 2.27 [NEW] 2.29 perl-Config-Simple(17) [OLD] 4.57 [NEW] 4.58 @@ -552,6 +583,7 @@ perl-Data-Library(17) [OLD] 0.1 [NEW] 0.2 perl-Data-Serializer(17) [OLD] 0.28 [NEW] 0.29 perl-DateTime(16) [OLD] 0.28 [NEW] 0.2901 +perl-DateTime-TimeZone(18) [OLD] 0.36 [NEW] 0.37 perl-Devel-Size(16) [OLD] 0.59 [NEW] 0.63 perl-Devel-Size-Report(17) [OLD] 0.07 [NEW] 0.10 perl-Device-Modem(17) [OLD] 1.43 [NEW] 1.44 @@ -572,13 +604,14 @@ perl-Getopt-ArgvFile(16) [OLD] 1.09 [NEW] 1.10 perl-Glib(15) [OLD] 1.081 [NEW] 1.093 perl-Gnome2-GConf(15) [OLD] 1.000 [NEW] 1.013 +perl-Gnome2-Print(15) [OLD] 0.94 [NEW] 0.951 perl-Gnome2-VFS(15) [OLD] 1.003 [NEW] 1.031 perl-Graph(15) [OLD] 0.20105 [NEW] 0.67 perl-GraphViz(16) [OLD] 2.01 [NEW] 2.02 <> ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/PLD-update-TODO?r1=1.248&r2=1.249&f=u From megabajt at pld-linux.org Sat Aug 27 14:00:43 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: ogle.spec - BR: sed >= 4.0, sorted BR In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:00:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: sed >= 4.0, sorted BR ---- Files affected: SPECS: ogle.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ogle.spec diff -u SPECS/ogle.spec:1.39 SPECS/ogle.spec:1.40 --- SPECS/ogle.spec:1.39 Sat Sep 11 22:01:54 2004 +++ SPECS/ogle.spec Sat Aug 27 14:00:36 2005 @@ -6,9 +6,9 @@ Release: 3 License: GPL Group: X11/Applications/Multimedia -URL: http://www.dtek.chalmers.se/~dvd/ Source0: http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz # Source0-md5: a76a9892bdb807a4bcf859d15a91f0f9 +URL: http://www.dtek.chalmers.se/~dvd/ BuildRequires: XFree86-devel BuildRequires: a52dec-libs-devel >= 0.7.3 BuildRequires: autoconf @@ -16,9 +16,10 @@ BuildRequires: libdvdcss-devel >= 1.2.2 BuildRequires: libdvdread-devel >= 0.9.4 BuildRequires: libjpeg-devel -BuildRequires: libxml2-devel >= 2.4.5 -BuildRequires: libtool BuildRequires: libmad-devel +BuildRequires: libtool +BuildRequires: libxml2-devel >= 2.4.5 +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -108,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/27 12:00:36 megabajt +- BR: sed >= 4.0, sorted BR + Revision 1.39 2004/09/11 20:01:54 adamg - slightly better approach, but still not perfect ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ogle.spec?r1=1.39&r2=1.40&f=u From arekm at pld-linux.org Sat Aug 27 14:31:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: BitTorrent.spec - up to 4.1.4 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 12:31:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.1.4 ---- Files affected: SPECS: BitTorrent.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/BitTorrent.spec diff -u SPECS/BitTorrent.spec:1.41 SPECS/BitTorrent.spec:1.42 --- SPECS/BitTorrent.spec:1.41 Sun Jul 31 08:39:53 2005 +++ SPECS/BitTorrent.spec Sat Aug 27 14:31:53 2005 @@ -2,12 +2,12 @@ Summary: BitTorrent - a tool for distributing files Summary(pl): BitTorrent - narz?dzie do rozpowszechniania plik?w Name: BitTorrent -Version: 4.1.3 +Version: 4.1.4 Release: 1 License: BitTorrent Open Source License Group: Applications/Communications Source0: http://www.bittorrent.com/dl/%{name}-%{version}.tar.gz -# Source0-md5: cd4dff145b5dea3789fa384bb94a4de9 +# Source0-md5: 1d0f85eb5cd4ac219853e2e6709f5847 Patch0: %{name}-man_pages.patch URL: http://www.bittorrent.com/ BuildRequires: python-devel @@ -64,27 +64,30 @@ find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name "*.py" | xargs rm install debian/* $RPM_BUILD_ROOT%{_mandir}/man1 +%find_lang bittorrent + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f bittorrent.lang %defattr(644,root,root,755) %doc LICENSE.txt README.txt credits.txt -%attr(755,root,root) %{_bindir}/btdownloadcurses.py -%attr(755,root,root) %{_bindir}/btdownloadheadless.py -%attr(755,root,root) %{_bindir}/btlaunchmany*.py -%attr(755,root,root) %{_bindir}/btmaketorrent.py -%attr(755,root,root) %{_bindir}/btr*.py -%attr(755,root,root) %{_bindir}/btt*.py -%attr(755,root,root) %{_bindir}/btshowmetainfo.py +%attr(755,root,root) %{_bindir}/bittorrent-console +%attr(755,root,root) %{_bindir}/bittorrent-curses +%attr(755,root,root) %{_bindir}/bittorrent-tracker +%attr(755,root,root) %{_bindir}/changetracker-console +%attr(755,root,root) %{_bindir}/launchmany-console +%attr(755,root,root) %{_bindir}/launchmany-curses +%attr(755,root,root) %{_bindir}/maketorrent-console +%attr(755,root,root) %{_bindir}/torrentinfo-console %{py_sitescriptdir}/BitTorrent %{py_sitescriptdir}/khashmir %{_mandir}/man1/* %files gui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/btdownloadgui.py -%attr(755,root,root) %{_bindir}/btmaketorrentgui.py +%attr(755,root,root) %{_bindir}/bittorrent +%attr(755,root,root) %{_bindir}/maketorrent %{_pixmapsdir}/BitTorrent-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -93,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 12:31:53 arekm +- up to 4.1.4 + Revision 1.41 2005/07/31 06:39:53 kosmo - updated to 4.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/BitTorrent.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Sat Aug 27 14:32:08 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: BitTorrent-4.1.4.tar.gz Message-ID: <7981.1125145927@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bittorrent.com/dl/BitTorrent-4.1.4.tar.gz 1d0f85eb5cd4ac219853e2e6709f5847 BitTorrent-4.1.4.tar.gz Size: 2016856 bytes -- Virtually Yours: distfiles. From megabajt at pld-linux.org Sat Aug 27 14:36:53 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: vde.spec - BR: autoconf, automake, libtool In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:36:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: autoconf, automake, libtool ---- Files affected: SPECS: vde.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/vde.spec diff -u SPECS/vde.spec:1.8 SPECS/vde.spec:1.9 --- SPECS/vde.spec:1.8 Fri Jun 24 15:38:57 2005 +++ SPECS/vde.spec Sat Aug 27 14:36:47 2005 @@ -10,6 +10,9 @@ # Source0-md5: 13337f2317a51a8c441503a0b0c908ac Patch0: %{name}-DESTDIR.patch URL: http://sourceforge.net/projects/vde/ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 12:36:47 megabajt +- BR: autoconf, automake, libtool + Revision 1.8 2005/06/24 13:38:57 ankry - pl capitalization is pointless here: unless we do s/vde/wre/g ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vde.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: DISTFILES: scintilla166.tgz Message-ID: <5422.1125149759@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scintilla166.tgz 10a60fffbeae8408a76bb79ac7b61500 scintilla166.tgz Size: 593866 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 15:35:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: scintilla.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scintilla.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/scintilla.spec diff -u SPECS/scintilla.spec:1.16 SPECS/scintilla.spec:1.17 --- SPECS/scintilla.spec:1.16 Sat Jun 18 17:25:10 2005 +++ SPECS/scintilla.spec Sat Aug 27 15:35:50 2005 @@ -6,13 +6,13 @@ Summary: Free source code editing component for GTK+ and Win32 Summary(pl): Wolnodost?pna kontrolka edycyjna dla GTK+ i Win32 Name: scintilla -Version: 1.63 +Version: 1.66 %define fver %(echo %{version} | tr -d .) Release: 1 License: BSD-like Group: Libraries Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz -# Source0-md5: 9122e70a41181f0b2e54e19f8236c68b +# Source0-md5: 10a60fffbeae8408a76bb79ac7b61500 Patch0: %{name}-make.patch URL: http://scintilla.org/ %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 13:35:50 arekm +- up to 1.66 + Revision 1.16 2005/06/18 15:25:10 zbyniu - BR: libtool, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scintilla.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: SOURCES: scintilla-make.patch - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SOURCES: scintilla-make.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/scintilla-make.patch diff -u SOURCES/scintilla-make.patch:1.7 SOURCES/scintilla-make.patch:1.8 --- SOURCES/scintilla-make.patch:1.7 Tue Apr 5 17:59:41 2005 +++ SOURCES/scintilla-make.patch Sat Aug 27 15:35:53 2005 @@ -1,6 +1,6 @@ -diff -urN scintilla.org/gtk/makefile scintilla/gtk/makefile ---- scintilla.org/gtk/makefile 2005-04-01 02:54:34.000000000 +0200 -+++ scintilla/gtk/makefile 2005-04-05 17:53:51.782783120 +0200 +diff -urNbB scintilla.org/gtk/makefile scintilla/gtk/makefile +--- scintilla.org/gtk/makefile 2005-05-27 13:29:44.000000000 +0200 ++++ scintilla/gtk/makefile 2005-08-27 15:34:00.961960088 +0200 @@ -7,7 +7,7 @@ # To force GTK+ 2 build, define GTK2 on the make command line. # To force GTK+ 1 build, define GTK1 on the make command line. @@ -57,33 +57,33 @@ + libtool --tag=CXX --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< +.c.lo: + libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< -+ ++ #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ -LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ --LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexForth.o LexFortran.o \ --LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o \ --LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ --LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o LexPython.o \ --LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o \ --LexVHDL.o LexYAML.o +-LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ +-LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ +-LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +-LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ +-LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ +-LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o +LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo \ +LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo \ -+LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexForth.lo LexFortran.lo \ -+LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo LexLout.lo LexLua.lo \ -+LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo LexNsis.lo \ -+LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo LexPython.lo \ -+LexRuby.lo LexScriptol.lo LexSpecman.lo LexSQL.lo LexTeX.lo LexVB.lo LexVerilog.lo \ -+LexVHDL.lo LexYAML.lo ++LexCsound.lo LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo \ ++LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo \ ++LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo \ ++LexNsis.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo \ ++LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo LexSpecman.lo \ ++LexSQL.lo LexTADS3.lo LexTeX.lo LexVB.lo LexVerilog.lo LexVHDL.lo LexYAML.lo #--Autogenerated -- end of automatically generated section all: $(COMPLIB) clean: - rm -f *.o $(COMPLIB) -+ rm -f *.lo $(COMPLIB) ++ rm -f *.o *.lo $(COMPLIB) deps: $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/scintilla-make.patch?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Sat Aug 27 15:38:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:12 2005 Subject: SPECS: scite.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:38:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scite.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.11 SPECS/scite.spec:1.12 --- SPECS/scite.spec:1.11 Tue Apr 5 18:05:59 2005 +++ SPECS/scite.spec Sat Aug 27 15:38:30 2005 @@ -6,12 +6,12 @@ Summary: SciTE - a programmers text editor Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite -Version: 1.63 +Version: 1.66 Release: 1 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz -# Source0-md5: e92bd082788759f2a3ee629d1688cdb8 +# Source0-md5: 62ce813c59e2d0206e875549dd300ee2 Patch0: %{name}-make.patch Patch1: %{name}-desktop.patch URL: http://scintilla.org/SciTE.html @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/27 13:38:30 arekm +- up to 1.66 + Revision 1.11 2005/04/05 16:05:59 arekm - up to 1.63 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sat Aug 27 15:38:38 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: scite166.tgz Message-ID: <9819.1125149918@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scite166.tgz 62ce813c59e2d0206e875549dd300ee2 scite166.tgz Size: 1259178 bytes -- Virtually Yours: distfiles. From dzeus at pld-linux.org Sat Aug 27 15:58:50 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: sylpheed.spec - up to 2.0.1 In-Reply-To: References: Message-ID: Author: dzeus Date: Sat Aug 27 13:58:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.0.1 ---- Files affected: SPECS: sylpheed.spec (1.167 -> 1.168) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167 SPECS/sylpheed.spec:1.168 --- SPECS/sylpheed.spec:1.167 Fri Jul 29 00:11:33 2005 +++ SPECS/sylpheed.spec Sat Aug 27 15:58:43 2005 @@ -12,12 +12,12 @@ Summary(pl): Szybki klient poczty bazuj?cy na GTK+ Summary(pt_BR): Um r?pido e leve cliente de email baseado em GTK+ Name: sylpheed -Version: 2.0.0 +Version: 2.0.1 Release: 1 License: GPL v2+ Group: X11/Applications/Networking Source0: http://sylpheed.good-day.net/sylpheed/v2.0/%{name}-%{version}.tar.bz2 -# Source0-md5: a7754f8820814089229b1ab5f0e4d855 +# Source0-md5: 7e8c8fdd427935349c4a57cf33fdf68a Patch0: %{name}-desktop.patch Patch1: %{name}-nolibs.patch BuildRequires: autoconf >= 2.50 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.168 2005/08/27 13:58:43 dzeus +- up to 2.0.1 + Revision 1.167 2005/07/28 22:11:33 freetz - 2.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167&r2=1.168&f=u From arekm at pld-linux.org Sat Aug 27 15:59:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: icecast.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:59:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: icecast.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/icecast.spec diff -u SPECS/icecast.spec:1.62 SPECS/icecast.spec:1.63 --- SPECS/icecast.spec:1.62 Sun May 1 19:31:30 2005 +++ SPECS/icecast.spec Sat Aug 27 15:59:00 2005 @@ -7,7 +7,7 @@ Summary(pt_BR): Um servidor de streams MP3, Ogg Name: icecast Version: 2.2.0 -Release: 1 +Release: 2 Epoch: 2 License: GPL Group: Networking/Daemons @@ -133,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/27 13:59:00 arekm +- rel 2 + Revision 1.62 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/icecast.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Sat Aug 27 15:59:12 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: sylpheed-2.0.1.tar.bz2 Message-ID: <9514.1125151152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.0/sylpheed-2.0.1.tar.bz2 7e8c8fdd427935349c4a57cf33fdf68a sylpheed-2.0.1.tar.bz2 Size: 2323171 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 16:09:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: scite.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:09:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: scite.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.12 SPECS/scite.spec:1.13 --- SPECS/scite.spec:1.12 Sat Aug 27 15:38:30 2005 +++ SPECS/scite.spec Sat Aug 27 16:09:41 2005 @@ -7,7 +7,7 @@ Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite Version: 1.66 -Release: 1 +Release: 2 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz @@ -17,7 +17,7 @@ URL: http://scintilla.org/SciTE.html %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} %{!?with_gtk1:BuildRequires: gtk+2-devel >= 1:2.0.0} -BuildRequires: scintilla-devel >= 1.63 +BuildRequires: scintilla-devel >= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 14:09:41 arekm +- rel 2 + Revision 1.12 2005/08/27 13:38:30 arekm - up to 1.66 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.12&r2=1.13&f=u From arekm at pld-linux.org Sat Aug 27 16:20:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: perl-Apache-Reload.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:20:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: perl-Apache-Reload.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/perl-Apache-Reload.spec diff -u SPECS/perl-Apache-Reload.spec:1.7 SPECS/perl-Apache-Reload.spec:1.8 --- SPECS/perl-Apache-Reload.spec:1.7 Wed Nov 3 20:36:55 2004 +++ SPECS/perl-Apache-Reload.spec Sat Aug 27 16:20:39 2005 @@ -6,7 +6,7 @@ Summary(pl): Prze?adowywanie zmodyfikowanych w trakcie pracy Apache'a modu??w Name: perl-Apache-Reload Version: 0.07 -Release: 1 +Release: 2 License: unknown Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 14:20:39 arekm +- rel 2 + Revision 1.7 2004/11/03 19:36:55 paladine - formatting ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-Apache-Reload.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Sat Aug 27 16:23:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:13 2005 Subject: SOURCES: evince-disable_dbus.patch (REMOVED) - evince finally work... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:23:56 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - evince finally works fine with dbus ---- Files affected: SOURCES: evince-disable_dbus.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Sat Aug 27 16:24:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: evince.spec - removed disable_dbus patch - works for me, re... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:24:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed disable_dbus patch - works for me, rel. 1 ---- Files affected: SPECS: evince.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.29 SPECS/evince.spec:1.30 --- SPECS/evince.spec:1.29 Sat Aug 27 00:57:44 2005 +++ SPECS/evince.spec Sat Aug 27 16:24:16 2005 @@ -6,19 +6,17 @@ Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 0.9 +Release: 1 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 # Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -# NOTE: disabled until less broken release BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript @@ -72,7 +70,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -145,6 +142,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/27 14:24:16 paladine +- removed disable_dbus patch +- works for me, rel. 1 + Revision 1.29 2005/08/26 22:57:44 aflinta - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Sat Aug 27 16:25:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: xchm-1.1.tar.gz Message-ID: <15891.1125152726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xchm/xchm-1.1.tar.gz 801ce6a079e559bc5b7d814e86861500 xchm-1.1.tar.gz Size: 331622 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 16:25:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xchm.spec - updated to 1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1 ---- Files affected: SPECS: xchm.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.36 SPECS/xchm.spec:1.37 --- SPECS/xchm.spec:1.36 Mon Jun 6 18:22:28 2005 +++ SPECS/xchm.spec Sat Aug 27 16:25:23 2005 @@ -2,12 +2,12 @@ Summary: CHM viewer for UNIX Summary(pl): Przegl?darka CHM dla Uniks?w Name: xchm -Version: 1.0 +Version: 1.1 Release: 1 License: GPL Group: Applications/File Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz -# Source0-md5: 808e87a2a00683b5142e9f74398a20b4 +# Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop URL: http://xchm.sourceforge.net/ BuildRequires: autoconf @@ -36,7 +36,6 @@ %{__automake} %configure \ WX_CONFIG_NAME=/usr/bin/wx-gtk2-ansi-config - %{__make} %install @@ -68,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/27 14:25:23 paladine +- updated to 1.1 + Revision 1.36 2005/06/06 16:22:28 koorek - updated to 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.36&r2=1.37&f=u From areq at pld-linux.org Sat Aug 27 16:26:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: chan_capi-cm-0.5.4.tar.gz Message-ID: <17655.1125152805@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/chan-capi/chan_capi-cm-0.5.4.tar.gz a7a9c0f90395909ee06528f17fc608d2 chan_capi-cm-0.5.4.tar.gz Size: 47714 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 16:26:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: asterisk-chan_capi.spec (NEW) - init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:26:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init PLD spec ---- Files affected: SPECS: asterisk-chan_capi.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u /dev/null SPECS/asterisk-chan_capi.spec:1.1 --- /dev/null Sat Aug 27 16:26:48 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 16:26:43 2005 @@ -0,0 +1,51 @@ +# $Revision$, $Date$ +Summary: Asterisk ISDN CAPI channel driver +Name: asterisk-chan_capi +Version: 0.5.4 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz +# Source0-md5: a7a9c0f90395909ee06528f17fc608d2 +URL: http://sourceforge.net/projects/chan-capi +BuildRequires: asterisk-devel +BuildRequires: capi-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP +Platform. + +%prep +%setup -q -n chan_capi-%{version} + +%build +%{__make} \ + CC="%{__cc}" \ + DEBUG="" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/usr/lib/asterisk/modules + +%{__make} install \ + INSTALL_PREFIX=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README capi.conf +/usr/lib/asterisk/modules/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 14:26:43 areq +- init PLD spec + + ================================================================ From arekm at pld-linux.org Sat Aug 27 16:37:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: openssl.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: openssl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/openssl.spec diff -u SPECS/openssl.spec:1.140 SPECS/openssl.spec:1.141 --- SPECS/openssl.spec:1.140 Sun Jul 24 18:36:14 2005 +++ SPECS/openssl.spec Sat Aug 27 16:37:04 2005 @@ -10,7 +10,7 @@ Summary(uk): ?????????? ?? ??????? ??? ?'?????? ????? Secure Sockets Layer Name: openssl Version: 0.9.7g -Release: 2 +Release: 3 License: Apache-style License Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz @@ -432,6 +432,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/27 14:37:04 arekm +- rel 3 + Revision 1.140 2005/07/24 16:36:14 qboosh - fix libdir in *.pc, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.140&r2=1.141&f=u From areq at pld-linux.org Sat Aug 27 16:44:25 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS (GCC4): gcc.spec - Release 0.3 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:44:25 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - Release 0.3 ---- Files affected: SPECS: gcc.spec (1.308.2.1 -> 1.308.2.2) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308.2.1 SPECS/gcc.spec:1.308.2.2 --- SPECS/gcc.spec:1.308.2.1 Thu Aug 25 12:47:16 2005 +++ SPECS/gcc.spec Sat Aug 27 16:44:19 2005 @@ -25,7 +25,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -Release: 0.1 +Release: 0.3 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1188,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.2 2005/08/27 14:44:19 areq +- Release 0.3 + Revision 1.308.2.1 2005/08/25 10:47:16 trojan - updated to 4.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308.2.1&r2=1.308.2.2&f=u From paszczus at pld-linux.org Sat Aug 27 17:01:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS (LINUX_2_6_11): iptables.spec - uncommented rm -f geoip (now... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 15:01:53 2005 GMT Module: SPECS Tag: LINUX_2_6_11 ---- Log message: - uncommented rm -f geoip (now builds) ---- Files affected: SPECS: iptables.spec (1.153.2.16 -> 1.153.2.17) ---- Diffs: ================================================================ Index: SPECS/iptables.spec diff -u SPECS/iptables.spec:1.153.2.16 SPECS/iptables.spec:1.153.2.17 --- SPECS/iptables.spec:1.153.2.16 Sun May 22 04:39:08 2005 +++ SPECS/iptables.spec Sat Aug 27 17:01:47 2005 @@ -136,7 +136,7 @@ %patch7 -p1 # removed broken ... -#rm -f extensions/.{set,quota,geoip}-test +rm -f extensions/.{set,quota,geoip}-test #rm -f extensions/.quota-test chmod 755 extensions/.*-test* @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.153.2.17 2005/08/27 15:01:47 paszczus +- uncommented rm -f geoip (now builds) + Revision 1.153.2.16 2005/05/22 02:39:08 averne - reverted ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iptables.spec?r1=1.153.2.16&r2=1.153.2.17&f=u From qboosh at pld-linux.org Sat Aug 27 17:05:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-util-util-macros.spec - existing Group, cleanup In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:05:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - existing Group, cleanup ---- Files affected: SPECS: xorg-util-util-macros.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.1 SPECS/xorg-util-util-macros.spec:1.2 --- SPECS/xorg-util-util-macros.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:05:06 2005 @@ -1,14 +1,11 @@ # $Revision$, $Date$ -# $Rev: 3222 $, $Date$ -# Summary: Autoconf macros for xorg Summary(pl): Makra autoconfa dla xorg Name: xorg-util-util-macros Version: 0.99.0 Release: 0.01 License: MIT -Group: X11/Development -###### Unknown group! +Group: X11/Development/Tools Source0: http://xorg.freedesktop.org/X11R7.0-RC0/util/util-macros-%{version}.tar.bz2 # Source0-md5: 5647ac7ca141725cae6c7fc73fd76dbd URL: http://xorg.freedesktop.org/ @@ -21,12 +18,11 @@ Autoconf macros for xorg. %description -l pl -Makra autoconfa dla xorg +Makra autoconfa dla xorg. %prep %setup -q -n util-macros-%{version} - %build %{__aclocal} %{__autoconf} @@ -35,29 +31,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_aclocaldir}/xorgversion.m4 - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:05:06 qboosh +- existing Group, cleanup + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.1&r2=1.2&f=u From aredridel at pld-linux.org Sat Aug 27 17:08:02 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: ndisc6-0.1.5.tar.bz2 Message-ID: <15044.1125155282@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.via.ecp.fr/~rem/ndisc6/v0.1/ndisc6-0.1.5.tar.bz2 349de20ade093e2e4017a1ad1009b6b2 ndisc6-0.1.5.tar.bz2 Size: 14931 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 17:08:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: ndisc6.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ndisc6.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u /dev/null SPECS/ndisc6.spec:1.1 --- /dev/null Sat Aug 27 17:08:04 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:07:59 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +# +Summary: Neighbor Discovery tools for IPv6 +Name: ndisc6 +Version: 0.1.5 +Release: 1 +License: GPLv2 +Group: Networking/Admin +Source0: http://people.via.ecp.fr/~rem/ndisc6/v0.1/%{name}-%{version}.tar.bz2 +# Source0-md5: 349de20ade093e2e4017a1ad1009b6b2 +URL: http://people.via.ecp.fr/~rem/ndisc6/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. + +%prep +%setup -q + +%build +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} + +install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README +%attr(755,root,root) %{_sbindir}/* +%{_mandir}/man8/* + +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 15:07:59 aredridel +- added + ================================================================ From aredridel at pld-linux.org Sat Aug 27 17:08:24 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: ndisc6.spec - adapterised In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterised ---- Files affected: SPECS: ndisc6.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.1 SPECS/ndisc6.spec:1.2 --- SPECS/ndisc6.spec:1.1 Sat Aug 27 17:07:59 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:08:19 2005 @@ -12,7 +12,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) +that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery +respectively. It is primarily meant for IPv6 networking diagnostics or +to detect rogue IPv6 nodes or routers on an Ethernet segment. %prep %setup -q @@ -36,11 +39,15 @@ %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/* +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:08:19 aredridel +- adapterised + Revision 1.1 2005/08/27 15:07:59 aredridel - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 17:45:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-util-util-macros.spec - use just name in BuildRoot In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:45:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use just name in BuildRoot ---- Files affected: SPECS: xorg-util-util-macros.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.2 SPECS/xorg-util-util-macros.spec:1.3 --- SPECS/xorg-util-util-macros.spec:1.2 Sat Aug 27 17:05:06 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:45:25 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRoot: %{tmpdir}/util-macros-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Autoconf macros for xorg. @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 15:45:25 qboosh +- use just name in BuildRoot + Revision 1.2 2005/08/27 15:05:06 qboosh - existing Group, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 18:12:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 16:12:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.1 -> 1.2) , xorg-proto-compositeproto.spec (1.2 -> 1.3) , xorg-proto-damageproto.spec (1.2 -> 1.3) , xorg-proto-dmxproto.spec (1.1 -> 1.2) , xorg-proto-evieext.spec (1.1 -> 1.2) , xorg-proto-fixesproto.spec (1.2 -> 1.3) , xorg-proto-fontcacheproto.spec (1.1 -> 1.2) , xorg-proto-fontsproto.spec (1.1 -> 1.2) , xorg-proto-glproto.spec (1.1 -> 1.2) , xorg-proto-inputproto.spec (1.1 -> 1.2) , xorg-proto-kbproto.spec (1.1 -> 1.2) , xorg-proto-panoramixproto.spec (1.2 -> 1.3) , xorg-proto-printproto.spec (1.1 -> 1.2) , xorg-proto-randrproto.spec (1.2 -> 1.3) , xorg-proto-recordproto.spec (1.2 -> 1.3) , xorg-proto-renderproto.spec (1.2 -> 1.3) , xorg-proto-resourceproto.spec (1.2 -> 1.3) , xorg-proto-scrnsaverproto.spec (1.1 -> 1.2) , xorg-proto-trapproto.spec (1.1 -> 1.2) , xorg-proto-videoproto.spec (1.1 -> 1.2) , xorg-proto-xcmiscproto.spec (1.1 -> 1.2) , xorg-proto-xextproto.spec (1.2 -> 1.3) , xorg-proto-xf86bigfontproto.spec (1.1 -> 1.2) , xorg-proto-xf86dgaproto.spec (1.1 -> 1.2) , xorg-proto-xf86driproto.spec (1.1 -> 1.2) , xorg-proto-xf86miscproto.spec (1.1 -> 1.2) , xorg-proto-xf86rushproto.spec (1.1 -> 1.2) , xorg-proto-xf86vidmodeproto.spec (1.1 -> 1.2) , xorg-proto-xproto.spec (1.2 -> 1.3) , xorg-proto-xproxymanagementprotocol.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.1 SPECS/xorg-proto-bigreqsproto.spec:1.2 --- SPECS/xorg-proto-bigreqsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3243 $, $Date$ -# Summary: BigReqs protocol and ancillary headers Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Name: xorg-proto-bigreqsproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/bigreqsproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,10 +23,9 @@ %description -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %package devel Summary: BigReqs protocol and ancillary headers -Summary(pl): bigreqsproto +Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Group: X11/Development/Libraries %description devel @@ -37,11 +34,9 @@ %description devel -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %prep %setup -q -n bigreqsproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -50,7 +45,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -58,23 +52,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/bigreqsproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.2 SPECS/xorg-proto-compositeproto.spec:1.3 --- SPECS/xorg-proto-compositeproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3259 $, $Date$ -# Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze Name: xorg-proto-compositeproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/compositeproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Composite i pomocnicze. - %package devel Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Composite i pomocnicze. - %prep %setup -q -n compositeproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/compositeproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.2 SPECS/xorg-proto-damageproto.spec:1.3 --- SPECS/xorg-proto-damageproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3262 $, $Date$ -# Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze Name: xorg-proto-damageproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/damageproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Damage i pomocnicze. - %package devel Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Damage i pomocnicze. - %prep %setup -q -n damageproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/damageproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.1 SPECS/xorg-proto-dmxproto.spec:1.2 --- SPECS/xorg-proto-dmxproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3325 $, $Date$ -# Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze Name: xorg-proto-dmxproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/dmxproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u DMX i pomocnicze. - %package devel Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze. @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u DMX i pomocnicze. - %prep %setup -q -n dmxproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/dmxproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.1 SPECS/xorg-proto-evieext.spec:1.2 --- SPECS/xorg-proto-evieext.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3274 $, $Date$ -# Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze Name: xorg-proto-evieext @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/evieext-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u EvIE i pomocnicze. - %package devel Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u EvIE i pomocnicze. - %prep %setup -q -n evieext-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/evieproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.2 SPECS/xorg-proto-fixesproto.spec:1.3 --- SPECS/xorg-proto-fixesproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3264 $, $Date$ -# Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze Name: xorg-proto-fixesproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fixesproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fixes i pomocnicze. - %package devel Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze @@ -40,11 +37,9 @@ %description devel -l pl Nag??wki protoko?u Fixes i pomocnicze. - %prep %setup -q -n fixesproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -53,7 +48,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -61,23 +55,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fixesproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.1 SPECS/xorg-proto-fontcacheproto.spec:1.2 --- SPECS/xorg-proto-fontcacheproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3275 $, $Date$ -# Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze Name: xorg-proto-fontcacheproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fontcacheproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %package devel Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %prep %setup -q -n fontcacheproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fontcacheproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.1 SPECS/xorg-proto-fontsproto.spec:1.2 --- SPECS/xorg-proto-fontsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3232 $, $Date$ -# Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze Name: xorg-proto-fontsproto @@ -15,7 +13,7 @@ BuildRequires: automake BuildRequires: pkg-config BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/fontsproto-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fonts i pomocnicze. - %package devel Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fonts i pomocnicze. - %prep %setup -q -n fontsproto-%{version} - %build %{__aclocal} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.1&r2=1.2&f=u From megabajt at pld-linux.org Sat Aug 27 19:29:10 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:14:13 2005 Subject: CVSROOT: users - changed email In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 17:29:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - changed email ---- Files affected: CVSROOT: users (1.387 -> 1.388) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.387 CVSROOT/users:1.388 --- CVSROOT/users:1.387 Fri Aug 26 16:07:03 2005 +++ CVSROOT/users Sat Aug 27 19:29:05 2005 @@ -148,7 +148,7 @@ matipl:matipl@ds.pg.gda.pl:Mateusz Kami?ski matkor:mateusz@ant.gliwice.pl:Mateusz Korniak matowy:matowy@tlen.pl:Mateusz Murawski -megabajt:mailinggrup@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl +megabajt:megabajt25@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl mguevara:mguevara@acn.waw.pl:Marek Guevara Braun michuz:michuz@linux.ipartner.com.pl:Micha? Zawalich mick3y:mmmick3y@gmail.com:Jakub Mateusz Mikusek ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.387&r2=1.388&f=u From wiget at pld-linux.org Sat Aug 27 19:37:45 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-lib-libXfont.spec - freebsd patch not needed on linux In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:37:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - freebsd patch not needed on linux ---- Files affected: SPECS: xorg-lib-libXfont.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.2 SPECS/xorg-lib-libXfont.spec:1.3 --- SPECS/xorg-lib-libXfont.spec:1.2 Wed Aug 17 22:10:46 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 19:37:40 2005 @@ -10,7 +10,6 @@ Group: X11/Libraries Source0: http://xorg.freedesktop.org/X11R7.0-RC0/lib/libXfont-%{version}.tar.bz2 # Source0-md5: 7566ddf06a209656c0e4814d5739e8c1 -Patch0: libXfont-freebsd.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake @@ -80,8 +79,6 @@ %prep %setup -q -n libXfont-%{version} -%patch0 -p1 - %build %{__libtoolize} @@ -138,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:37:40 wiget +- freebsd patch not needed on linux + Revision 1.2 2005/08/17 20:10:46 qboosh - Obsoletes for old xlibs or separate packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.2&r2=1.3&f=u From wiget at pld-linux.org Sat Aug 27 19:38:23 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-lib-libfontenc.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-libfontenc.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.1 SPECS/xorg-lib-libfontenc.spec:1.2 --- SPECS/xorg-lib-libfontenc.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:38:15 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xproto-devel %description devel @@ -123,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:15 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:38:53 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-lib-liblbxutil.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-liblbxutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.1 SPECS/xorg-lib-liblbxutil.spec:1.2 --- SPECS/xorg-lib-liblbxutil.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:38:48 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xextproto-devel %description devel @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:48 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:43:06 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 17:43:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - s/pkg-config/pkgconfig/ in BR: ---- Files affected: SPECS: xorg-app-appres.spec (1.1 -> 1.2) , xorg-app-bdftopcf.spec (1.1 -> 1.2) , xorg-app-beforelight.spec (1.1 -> 1.2) , xorg-app-bitmap.spec (1.1 -> 1.2) , xorg-app-editres.spec (1.1 -> 1.2) , xorg-app-fonttosfnt.spec (1.1 -> 1.2) , xorg-app-fslsfonts.spec (1.1 -> 1.2) , xorg-app-fstobdf.spec (1.1 -> 1.2) , xorg-app-iceauth.spec (1.1 -> 1.2) , xorg-app-ico.spec (1.1 -> 1.2) , xorg-app-lbxproxy.spec (1.1 -> 1.2) , xorg-app-listres.spec (1.1 -> 1.2) , xorg-app-luit.spec (1.1 -> 1.2) , xorg-app-mkfontdir.spec (1.1 -> 1.2) , xorg-app-mkfontscale.spec (1.1 -> 1.2) , xorg-app-oclock.spec (1.1 -> 1.2) , xorg-app-pclcomp.spec (1.1 -> 1.2) , xorg-app-proxymngr.spec (1.1 -> 1.2) , xorg-app-rgb.spec (1.1 -> 1.2) , xorg-app-rstart.spec (1.1 -> 1.2) , xorg-app-scripts.spec (1.1 -> 1.2) , xorg-app-setxkbmap.spec (1.1 -> 1.2) , xorg-app-showfont.spec (1.1 -> 1.2) , xorg-app-smproxy.spec (1.1 -> 1.2) , xorg-app-twm.spec (1.1 -> 1.2) , xorg-app-viewres.spec (1.1 -> 1.2) , xorg-app-x11perf.spec (1.1 -> 1.2) , xorg-app-xauth.spec (1.1 -> 1.2) , xorg-app-xbiff.spec (1.1 -> 1.2) , xorg-app-xcalc.spec (1.1 -> 1.2) , xorg-app-xclipboard.spec (1.1 -> 1.2) , xorg-app-xclock.spec (1.1 -> 1.2) , xorg-app-xcmsdb.spec (1.1 -> 1.2) , xorg-app-xconsole.spec (1.1 -> 1.2) , xorg-app-xcursorgen.spec (1.1 -> 1.2) , xorg-app-xdbedizzy.spec (1.1 -> 1.2) , xorg-app-xditview.spec (1.1 -> 1.2) , xorg-app-xdpyinfo.spec (1.1 -> 1.2) , xorg-app-xedit.spec (1.1 -> 1.2) , xorg-app-xev.spec (1.1 -> 1.2) , xorg-app-xeyes.spec (1.1 -> 1.2) , xorg-app-xf86dga.spec (1.1 -> 1.2) , xorg-app-xfd.spec (1.1 -> 1.2) , xorg-app-xfontsel.spec (1.1 -> 1.2) , xorg-app-xfs.spec (1.1 -> 1.2) , xorg-app-xfsinfo.spec (1.1 -> 1.2) , xorg-app-xfwp.spec (1.1 -> 1.2) , xorg-app-xgamma.spec (1.1 -> 1.2) , xorg-app-xgc.spec (1.1 -> 1.2) , xorg-app-xhost.spec (1.1 -> 1.2) , xorg-app-xkbcomp.spec (1.1 -> 1.2) , xorg-app-xkbevd.spec (1.1 -> 1.2) , xorg-app-xkbprint.spec (1.1 -> 1.2) , xorg-app-xkbutils.spec (1.1 -> 1.2) , xorg-app-xkill.spec (1.1 -> 1.2) , xorg-app-xlogo.spec (1.1 -> 1 .2) , xorg-app-xlsatoms.spec (1.1 -> 1.2) , xorg-app-xlsclients.spec (1.1 -> 1.2) , xorg-app-xlsfonts.spec (1.1 -> 1.2) , xorg-app-xmag.spec (1.1 -> 1.2) , xorg-app-xman.spec (1.1 -> 1.2) , xorg-app-xmessage.spec (1.1 -> 1.2) , xorg-app-xmh.spec (1.1 -> 1.2) , xorg-app-xmodmap.spec (1.1 -> 1.2) , xorg-app-xmore.spec (1.1 -> 1.2) , xorg-app-xphelloworld.spec (1.1 -> 1.2) , xorg-app-xplsprinters.spec (1.1 -> 1.2) , xorg-app-xpr.spec (1.1 -> 1.2) , xorg-app-xprehashprinterlist.spec (1.1 -> 1.2) , xorg-app-xprop.spec (1.1 -> 1.2) , xorg-app-xrandr.spec (1.1 -> 1.2) , xorg-app-xrdb.spec (1.1 -> 1.2) , xorg-app-xrefresh.spec (1.1 -> 1.2) , xorg-app-xset.spec (1.1 -> 1.2) , xorg-app-xsetmode.spec (1.1 -> 1.2) , xorg-app-xsetpointer.spec (1.1 -> 1.2) , xorg-app-xsetroot.spec (1.1 -> 1.2) , xorg-app-xsm.spec (1.1 -> 1.2) , xorg-app-xstdcmap.spec (1.1 -> 1.2) , xorg-app-xtrap.spec (1.1 -> 1.2) , xorg-app-xvidtune.spec (1.1 -> 1.2) , xorg-app-xvinfo.spec (1.1 -> 1.2) , xorg-app-xwd.spec (1.1 -> 1.2) , xorg-app-xwininfo.spec (1.1 -> 1.2) , xorg-app-xwud.spec (1.1 -> 1.2) , xorg-font-encodings.spec (1.1 -> 1.2) , xorg-font-font-adobe-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-type1.spec (1.1 -> 1.2) , xorg-font-font-alias.spec (1.1 -> 1.2) , xorg-font-font-arabic-misc.spec (1.1 -> 1.2) , xorg-font-font-bh-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-ttf.spec (1.1 -> 1.2) , xorg-font-font-bh-type1.spec (1.1 -> 1.2) , xorg-font-font-bitstream-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-type1.spec (1.1 -> 1.2) , xorg-font-font-cronyx-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-cursor-misc.spec (1.1 -> 1.2) , xorg-font-font-daewoo-misc.spec (1.1 -> 1.2) , xorg-font-font-dec-misc.spec (1.1 -> 1.2) , xorg -font-font-ibm-type1.spec (1.1 -> 1.2) , xorg-font-font-isas-misc.spec (1.1 -> 1.2) , xorg-font-font-jis-misc.spec (1.1 -> 1.2) , xorg-font-font-micro-misc.spec (1.1 -> 1.2) , xorg-font-font-misc-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-misc-misc.spec (1.1 -> 1.2) , xorg-font-font-mutt-misc.spec (1.1 -> 1.2) , xorg-font-font-schumacher-misc.spec (1.1 -> 1.2) , xorg-font-font-screen-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-sony-misc.spec (1.1 -> 1.2) , xorg-font-font-sun-misc.spec (1.1 -> 1.2) , xorg-font-font-util.spec (1.1 -> 1.2) , xorg-font-font-winitzki-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-xfree86-type1.spec (1.1 -> 1.2) , xorg-lib-libFS.spec (1.1 -> 1.2) , xorg-lib-libICE.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.2 -> 1.3) , xorg-lib-libX11.spec (1.2 -> 1.3) , xorg-lib-libXScrnSaver.spec (1.1 -> 1.2) , xorg-lib-libXTrap.spec (1.1 -> 1.2) , xorg-lib-libXau.spec (1.2 -> 1.3) , xorg-lib-libXaw.spec (1.2 -> 1.3) , xorg-lib-libXcomposite.spec (1.2 -> 1.3) , xorg-lib-libXcursor.spec (1.2 -> 1.3) , xorg-lib-libXdamage.spec (1.2 -> 1.3) , xorg-lib-libXdmcp.spec (1.2 -> 1.3) , xorg-lib-libXevie.spec (1.1 -> 1.2) , xorg-lib-libXext.spec (1.2 -> 1.3) , xorg-lib-libXfixes.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.1 -> 1.2) , xorg-lib-libXft.spec (1.2 -> 1.3) , xorg-lib-libXi.spec (1.2 -> 1.3) , xorg-lib-libXinerama.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.2 -> 1.3) , xorg-lib-libXpm.spec (1.2 -> 1.3) , xorg-lib-libXprintAppUtil.spec (1.1 -> 1.2) , xorg-lib-libXprintUtil.spec (1.1 -> 1.2) , xorg-lib-libXrandr.spec (1.2 -> 1.3) , xorg-lib-libXrender.spec (1.2 -> 1.3) , xorg-lib-libXres.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.2 -> 1.3) , xorg-lib-libXtst.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.2 -> 1.3) , xorg-lib-libXvMC.spec (1.1 -> 1.2) , xorg-lib-libXxf86dga.spec (1.1 -> 1.2) , xorg-lib-libXxf86misc.spec (1.1 -> 1.2) , xorg-lib-libXxf86vm.spec (1.1 -> 1.2) , xorg-lib-libdmx.spec (1.1 -> 1.2) , xorg-lib-libfontenc.s pec (1.2 -> 1.3) , xorg-lib-liblbxutil.spec (1.2 -> 1.3) , xorg-lib-liboldX.spec (1.1 -> 1.2) , xorg-lib-libxkbfile.spec (1.1 -> 1.2) , xorg-lib-libxkbui.spec (1.1 -> 1.2) , xorg-lib-xtrans.spec (1.2 -> 1.3) , xorg-proto-bigreqsproto.spec (1.2 -> 1.3) , xorg-proto-compositeproto.spec (1.3 -> 1.4) , xorg-proto-damageproto.spec (1.3 -> 1.4) , xorg-proto-dmxproto.spec (1.2 -> 1.3) , xorg-proto-evieext.spec (1.2 -> 1.3) , xorg-proto-fixesproto.spec (1.3 -> 1.4) , xorg-proto-fontcacheproto.spec (1.2 -> 1.3) , xorg-proto-fontsproto.spec (1.2 -> 1.3) , xorg-proto-glproto.spec (1.2 -> 1.3) , xorg-proto-inputproto.spec (1.2 -> 1.3) , xorg-proto-kbproto.spec (1.2 -> 1.3) , xorg-proto-panoramixproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.2 -> 1.3) , xorg-proto-randrproto.spec (1.3 -> 1.4) , xorg-proto-recordproto.spec (1.3 -> 1.4) , xorg-proto-renderproto.spec (1.3 -> 1.4) , xorg-proto-resourceproto.spec (1.3 -> 1.4) , xorg-proto-scrnsaverproto.spec (1.2 -> 1.3) , xorg-proto-trapproto.spec (1.2 -> 1.3) , xorg-proto-videoproto.spec (1.2 -> 1.3) , xorg-proto-xcmiscproto.spec (1.2 -> 1.3) , xorg-proto-xextproto.spec (1.3 -> 1.4) , xorg-proto-xf86bigfontproto.spec (1.2 -> 1.3) , xorg-proto-xf86dgaproto.spec (1.2 -> 1.3) , xorg-proto-xf86driproto.spec (1.2 -> 1.3) , xorg-proto-xf86miscproto.spec (1.2 -> 1.3) , xorg-proto-xf86rushproto.spec (1.2 -> 1.3) , xorg-proto-xf86vidmodeproto.spec (1.2 -> 1.3) , xorg-proto-xproto.spec (1.3 -> 1.4) , xorg-proto-xproxymanagementprotocol.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.1 SPECS/xorg-app-appres.spec:1.2 --- SPECS/xorg-app-appres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.1 SPECS/xorg-app-bdftopcf.spec:1.2 --- SPECS/xorg-app-bdftopcf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.1 SPECS/xorg-app-beforelight.spec:1.2 --- SPECS/xorg-app-beforelight.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.1 SPECS/xorg-app-bitmap.spec:1.2 --- SPECS/xorg-app-bitmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.1 SPECS/xorg-app-editres.spec:1.2 --- SPECS/xorg-app-editres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.1 SPECS/xorg-app-fonttosfnt.spec:1.2 --- SPECS/xorg-app-fonttosfnt.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.1 SPECS/xorg-app-fslsfonts.spec:1.2 --- SPECS/xorg-app-fslsfonts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.1 SPECS/xorg-app-fstobdf.spec:1.2 --- SPECS/xorg-app-fstobdf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.1 SPECS/xorg-app-iceauth.spec:1.2 --- SPECS/xorg-app-iceauth.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.1 SPECS/xorg-app-ico.spec:1.2 --- SPECS/xorg-app-ico.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/ico-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.1 SPECS/xorg-app-lbxproxy.spec:1.2 --- SPECS/xorg-app-lbxproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 19:42:47 2005 @@ -20,7 +20,7 @@ BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel BuildRoot: %{tmpdir}/lbxproxy-%{version}-root-%(id -u -n) @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.1 SPECS/xorg-app-listres.spec:1.2 --- SPECS/xorg-app-listres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/listres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.1 SPECS/xorg-app-luit.spec:1.2 --- SPECS/xorg-app-luit.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/luit-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.1 SPECS/xorg-app-mkfontdir.spec:1.2 --- SPECS/xorg-app-mkfontdir.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 19:42:47 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontdir-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.1 SPECS/xorg-app-mkfontscale.spec:1.2 --- SPECS/xorg-app-mkfontscale.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: freetype-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontscale-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.1 SPECS/xorg-app-oclock.spec:1.2 --- SPECS/xorg-app-oclock.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/oclock-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.1 SPECS/xorg-app-pclcomp.spec:1.2 --- SPECS/xorg-app-pclcomp.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/pclcomp-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.1 SPECS/xorg-app-proxymngr.spec:1.2 --- SPECS/xorg-app-proxymngr.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRoot: %{tmpdir}/proxymngr-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.1 SPECS/xorg-app-rgb.spec:1.2 --- SPECS/xorg-app-rgb.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel BuildRoot: %{tmpdir}/rgb-%{version}-root-%(id -u -n) @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.1 SPECS/xorg-app-rstart.spec:1.2 --- SPECS/xorg-app-rstart.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/rstart-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.1 SPECS/xorg-app-scripts.spec:1.2 --- SPECS/xorg-app-scripts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/scripts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.1 SPECS/xorg-app-setxkbmap.spec:1.2 --- SPECS/xorg-app-setxkbmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/setxkbmap-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.1 SPECS/xorg-app-showfont.spec:1.2 --- SPECS/xorg-app-showfont.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/showfont-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.1 SPECS/xorg-app-smproxy.spec:1.2 --- SPECS/xorg-app-smproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/smproxy-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.1 SPECS/xorg-app-twm.spec:1.2 --- SPECS/xorg-app-twm.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/twm-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 19:56:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-lib-libdmx.spec, xorg-lib-libfontenc.spec, xorg-lib-li... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 17:56:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, ported back to Linux ---- Files affected: SPECS: xorg-lib-libdmx.spec (1.2 -> 1.3) , xorg-lib-libfontenc.spec (1.3 -> 1.4) , xorg-lib-libFS.spec (1.2 -> 1.3) , xorg-lib-libICE.spec (1.3 -> 1.4) , xorg-lib-liblbxutil.spec (1.3 -> 1.4) , xorg-lib-liboldX.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.3 -> 1.4) , xorg-lib-libX11.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.3 -> 1.4) , xorg-lib-libXaw.spec (1.3 -> 1.4) , xorg-lib-libXcomposite.spec (1.3 -> 1.4) , xorg-lib-libXcursor.spec (1.3 -> 1.4) , xorg-lib-libXdamage.spec (1.3 -> 1.4) , xorg-lib-libXdmcp.spec (1.3 -> 1.4) , xorg-lib-libXevie.spec (1.2 -> 1.3) , xorg-lib-libXext.spec (1.3 -> 1.4) , xorg-lib-libXfixes.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.4 -> 1.5) , xorg-lib-libXft.spec (1.3 -> 1.4) , xorg-lib-libXinerama.spec (1.3 -> 1.4) , xorg-lib-libXi.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.2 -> 1.3) , xorg-lib-libxkbui.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.3 -> 1.4) , xorg-lib-libXpm.spec (1.3 -> 1.4) , xorg-lib-libXprintAppUtil.spec (1.2 -> 1.3) , xorg-lib-libXprintUtil.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.3 -> 1.4) , xorg-lib-libXrender.spec (1.3 -> 1.4) , xorg-lib-libXres.spec (1.3 -> 1.4) , xorg-lib-libXScrnSaver.spec (1.2 -> 1.3) , xorg-lib-libXTrap.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.3 -> 1.4) , xorg-lib-libXtst.spec (1.3 -> 1.4) , xorg-lib-libXvMC.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.2 -> 1.3) , xorg-lib-libXxf86misc.spec (1.2 -> 1.3) , xorg-lib-libXxf86vm.spec (1.2 -> 1.3) , xorg-lib-xtrans.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libdmx.spec diff -u SPECS/xorg-lib-libdmx.spec:1.2 SPECS/xorg-lib-libdmx.spec:1.3 --- SPECS/xorg-lib-libdmx.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libdmx.spec Sat Aug 27 19:56:05 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3328 $, $Date$ -# Summary: dmx library Summary(pl): Biblioteka dmx Name: xorg-lib-libdmx @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-dmxproto-devel -BuildRequires: xorg-lib-libXext-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-proto-dmxproto-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libdmx-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 %define _mandir %{_prefix}/man @@ -29,14 +27,13 @@ %description -l pl Biblioteka dmx. - %package devel Summary: Header files libdmx development Summary(pl): Pliki nag??wkowe do biblioteki libdmx Group: X11/Development/Libraries -Requires: xorg-lib-libdmx = %{version}-%{release} -Requires: xorg-proto-dmxproto-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXext-devel +Requires: xorg-proto-dmxproto-devel %description devel dmx library. @@ -50,12 +47,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libdmx. - %package static -Summary: Static libdmx libraries -Summary(pl): Biblioteki statyczne libdmx -Group: Development/Libraries -Requires: xorg-lib-libdmx-devel = %{version}-%{release} +Summary: Static libdmx library +Summary(pl): Biblioteka statyczna libdmx +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static dmx library. @@ -65,13 +61,11 @@ %description static -l pl Biblioteka dmx. -Pakiet zawiera statyczn? biblioteke libdmx. - +Pakiet zawiera statyczn? bibliotek? libdmx. %prep %setup -q -n libdmx-%{version} - %build %{__libtoolize} %{__aclocal} @@ -82,7 +76,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -90,40 +83,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libdmx.so.* - +%attr(755,root,root) %{_libdir}/libdmx.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdmx.so %{_libdir}/libdmx.la -%attr(755,root,wheel) %{_libdir}/libdmx.so %{_pkgconfigdir}/dmx.pc %{_mandir}/man3/*.3* - %files static %defattr(644,root,root,755) %{_libdir}/libdmx.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:05 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.3 SPECS/xorg-lib-libfontenc.spec:1.4 --- SPECS/xorg-lib-libfontenc.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3278 $, $Date$ -# Summary: fontenc library Summary(pl): Biblioteka fontenc Name: xorg-lib-libfontenc @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel -BuildRoot: %{tmpdir}/libfontenc-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka fontenc. - %package devel Summary: Header files libfontenc development Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries -Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel +Requires: zlib-devel %description devel fontenc library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libfontenc. - %package static -Summary: Static libfontenc libraries -Summary(pl): Biblioteki statyczne libfontenc -Group: Development/Libraries -Requires: xorg-lib-libfontenc-devel = %{version}-%{release} +Summary: Static libfontenc library +Summary(pl): Biblioteka statyczna libfontenc +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static fontenc library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczn? bibliotek? libfontenc. - %prep %setup -q -n libfontenc-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,40 +82,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libfontenc.so.* - +%attr(755,root,root) %{_libdir}/libfontenc.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libfontenc.so %{_libdir}/libfontenc.la -%attr(755,root,wheel) %{_libdir}/libfontenc.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/fontenc.pc - %files static %defattr(644,root,root,755) %{_libdir}/libfontenc.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.2 SPECS/xorg-lib-libFS.spec:1.3 --- SPECS/xorg-lib-libFS.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3245 $, $Date$ -# Summary: FS library Summary(pl): Biblioteka FS Name: xorg-lib-libFS @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-fontsproto-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel -BuildRoot: %{tmpdir}/libFS-%{version}-root-%(id -u -n) +BuildRequires: xorg-proto-fontsproto-devel +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka FS. - %package devel Summary: Header files libFS development Summary(pl): Pliki nag??wkowe do biblioteki libFS Group: X11/Development/Libraries -Requires: xorg-lib-libFS = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-fontsproto-devel %description devel @@ -48,12 +45,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libFS. - %package static -Summary: Static libFS libraries -Summary(pl): Biblioteki statyczne libFS -Group: Development/Libraries -Requires: xorg-lib-libFS-devel = %{version}-%{release} +Summary: Static libFS library +Summary(pl): Biblioteka statyczna libFS +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static FS library. @@ -65,11 +61,9 @@ Pakiet zawiera statyczn? bibliotek? libFS. - %prep %setup -q -n libFS-%{version} - %build %{__libtoolize} %{__aclocal} @@ -80,7 +74,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -88,40 +81,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libFS.so.* - +%attr(755,root,root) %{_libdir}/libFS.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libFS.so %{_libdir}/libFS.la -%attr(755,root,wheel) %{_libdir}/libFS.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/libfs.pc - %files static %defattr(644,root,root,755) %{_libdir}/libFS.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.3 SPECS/xorg-lib-libICE.spec:1.4 --- SPECS/xorg-lib-libICE.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ - -# Summary: Inter Client Exchange library Summary(pl): Biblioteka wymiany mi?dzy klientami Name: xorg-lib-libICE @@ -15,10 +13,10 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-util-util-macros Obsoletes: libICE -BuildRoot: %{tmpdir}/libICE-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka wymiany mi?dzy klientami. - %package devel Summary: Header files libICE development Summary(pl): Pliki nag??wkowe do biblioteki libICE Group: X11/Development/Libraries -Requires: xorg-lib-libICE = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel Obsoletes: libICE-devel @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libICE. - %package static -Summary: Static libICE libraries -Summary(pl): Biblioteki statyczne libICE -Group: Development/Libraries -Requires: xorg-lib-libICE-devel = %{version}-%{release} +Summary: Static libICE library +Summary(pl): Biblioteka statyczna libICE +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} Obsoletes: libICE-static %description static @@ -67,7 +63,6 @@ Pakiet zawiera statyczn? bibliotek? libICE. - %prep %setup -q -n libICE-%{version} @@ -93,21 +88,18 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/libICE.so.* - +%attr(755,root,root) %{_libdir}/libICE.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/ICE/*.h +%attr(755,root,root) %{_libdir}/libICE.so %{_libdir}/libICE.la -%attr(755,root,wheel) %{_libdir}/libICE.so +%{_includedir}/X11/ICE/*.h %{_pkgconfigdir}/ice.pc - %files static %defattr(644,root,root,755) %{_libdir}/libICE.a @@ -118,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.3 SPECS/xorg-lib-liblbxutil.spec:1.4 --- SPECS/xorg-lib-liblbxutil.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3331 $, $Date$ -# Summary: lbxutil library Summary(pl): Biblioteka lbxutil Name: xorg-lib-liblbxutil @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel -BuildRoot: %{tmpdir}/liblbxutil-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka lbxutil. - %package devel Summary: Header files liblbxutil development Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries -Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xextproto-devel +Requires: zlib-devel %description devel lbxutil library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki liblbxutil. - %package static -Summary: Static liblbxutil libraries -Summary(pl): Biblioteki statyczne liblbxutil -Group: Development/Libraries -Requires: xorg-lib-liblbxutil-devel = %{version}-%{release} +Summary: Static liblbxutil library +Summary(pl): Biblioteka statyczna liblbxutil +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static lbxutil library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczna bibliotek? liblbxutil. - %prep %setup -q -n liblbxutil-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,39 +82,36 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/liblbxutil.so.* - +%attr(755,root,root) %{_libdir}/liblbxutil.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liblbxutil.so %{_libdir}/liblbxutil.la -%attr(755,root,wheel) %{_libdir}/liblbxutil.so %{_pkgconfigdir}/lbxutil.pc - %files static %defattr(644,root,root,755) %{_libdir}/liblbxutil.a <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 19:57:44 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: vim.spec - removed setting perms in %install - sorted %veri... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 17:57:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed setting perms in %install - sorted %verify flags ---- Files affected: SPECS: vim.spec (1.308 -> 1.309) ---- Diffs: ================================================================ Index: SPECS/vim.spec diff -u SPECS/vim.spec:1.308 SPECS/vim.spec:1.309 --- SPECS/vim.spec:1.308 Wed Aug 10 12:44:43 2005 +++ SPECS/vim.spec Sat Aug 27 19:57:38 2005 @@ -1003,17 +1003,17 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/* %if %{with static} -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim -install -m755 src/bin/vim.static $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim +install src/bin/vim.static $RPM_BUILD_ROOT/bin/vi %else -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim %endif %if %{with ispell} -install -m755 src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell +install src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell %endif -install -m755 src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd -install -m755 src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor +install src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd +install src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1 @@ -1039,19 +1039,19 @@ install %{SOURCE14} $RPM_BUILD_ROOT%{_desktopdir} %if %{with athena} -install -m755 src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena +install src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena install %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with motif} -install -m755 src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif +install src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif install %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gnome} -install -m755 src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome +install src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome install %{SOURCE13} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gtk} -install -m755 src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk +install src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk ln -sf gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/gview @@ -1065,7 +1065,7 @@ install runtime/vim48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/vim.png %if %{with kde} -install -m755 src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim +install src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim install -d $RPM_BUILD_ROOT%{_desktopdir}/kde install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22}/actions install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps @@ -1083,7 +1083,7 @@ %if %{with bonobo} install -d $RPM_BUILD_ROOT%{_libdir}/bonobo/servers install src/bin/Vim_Control.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers -install -m755 src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} +install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} %endif bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -1174,8 +1174,8 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/vimtutor %dir %{_sysconfdir}/vim -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/vimrc -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/gvimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/vimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/gvimrc %dir %{_datadir}/vim %dir %{_datadir}/vim/v* @@ -1183,8 +1183,8 @@ %doc %{_datadir}/vim/v*/doc/*.txt %lang(pl) %doc %{_datadir}/vim/v*/doc/*.plx %attr(755,root,root) %{_datadir}/vim/v*/doc/*.pl -%verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags -%lang(pl) %verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags-pl +%verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags +%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags-pl %{_datadir}/vim/v*/ftplugin %{_datadir}/vim/v*/indent %{_datadir}/vim/v*/keymap @@ -1337,6 +1337,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.309 2005/08/27 17:57:38 darekr +- removed setting perms in %install +- sorted %verify flags + Revision 1.308 2005/08/10 10:44:43 saq - awk.patch for bug#945 (avoid gawk dependency) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.308&r2=1.309&f=u From qboosh at pld-linux.org Sat Aug 27 20:00:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-data-xbitmaps.spec, xorg-data-xcursor-themes.spec, xor... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:00:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ---- Files affected: SPECS: xorg-data-xbitmaps.spec (1.1 -> 1.2) , xorg-data-xcursor-themes.spec (1.1 -> 1.2) , xorg-data-xkbdata.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xbitmaps.spec diff -u SPECS/xorg-data-xbitmaps.spec:1.1 SPECS/xorg-data-xbitmaps.spec:1.2 --- SPECS/xorg-data-xbitmaps.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xbitmaps.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3338 $, $Date$ -# Summary: X bitmaps data Summary(pl): Bitmapy dla X Name: xorg-data-xbitmaps @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config -BuildRoot: %{tmpdir}/xbitmaps-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,11 +23,9 @@ %description -l pl Bitmapy dla X. - %prep %setup -q -n xbitmaps-%{version} - %build %{__aclocal} %{__autoconf} @@ -39,7 +35,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -47,23 +42,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_includedir}/X11/bitmaps %{_pkgconfigdir}/xbitmaps.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.1 SPECS/xorg-data-xcursor-themes.spec:1.2 --- SPECS/xorg-data-xcursor-themes.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3431 $, $Date$ -# Summary: Cursor themes Summary(pl): Motywy kursor?w Name: xorg-data-xcursor-themes @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xcursorgen -BuildRoot: %{tmpdir}/xcursor-themes-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Cursor themes. @@ -24,7 +22,6 @@ %description -l pl Motywy kursor?w. - %package -n xcursor-theme-handhelds Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" @@ -36,7 +33,6 @@ %description -n xcursor-theme-handhelds -l pl Motyw kursor?w "handhelds" dla X11. - %package -n xcursor-theme-redglass Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" @@ -48,7 +44,6 @@ %description -n xcursor-theme-redglass -l pl Motyw kursor?w "redglass" dla X11. - %package -n xcursor-theme-whiteglass Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" @@ -60,11 +55,9 @@ %description -n xcursor-theme-whiteglass -l pl Motyw kursor?w "whiteglass" dla X11. - %prep %setup -q -n xcursor-themes-%{version} - %build %{__aclocal} %{__autoconf} @@ -74,18 +67,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files -n xcursor-theme-handhelds %defattr(644,root,root,755) %{_iconsdir}/handhelds @@ -98,13 +88,15 @@ %defattr(644,root,root,755) %{_iconsdir}/whiteglass - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xkbdata.spec diff -u SPECS/xorg-data-xkbdata.spec:1.1 SPECS/xorg-data-xkbdata.spec:1.2 --- SPECS/xorg-data-xkbdata.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xkbdata.spec Sat Aug 27 20:00:37 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3432 $, $Date$ -# Summary: XKB data Summary(pl): Dane dla XKB Name: xorg-data-xkbdata @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xkbcomp -BuildRoot: %{tmpdir}/xkbdata-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -26,11 +24,9 @@ %description -l pl Dane dla XKB. - %prep %setup -q -n xkbdata-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/xkb - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:37 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xbitmaps.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xkbdata.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 20:02:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-data-xcursor-themes.spec - Obsoletes for XFree86/X11 X... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:02:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) ---- Files affected: SPECS: xorg-data-xcursor-themes.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.2 SPECS/xorg-data-xcursor-themes.spec:1.3 --- SPECS/xorg-data-xcursor-themes.spec:1.2 Sat Aug 27 20:00:36 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:02:54 2005 @@ -26,6 +26,7 @@ Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" Group: Themes +Obsoletes: XcursorTheme-handhelds %description -n xcursor-theme-handhelds Cursors theme "handhelds" for X11. @@ -37,6 +38,7 @@ Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" Group: Themes +Obsoletes: XcursorTheme-redglass %description -n xcursor-theme-redglass Cursors theme "redglass" for X11. @@ -48,6 +50,7 @@ Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" Group: Themes +Obsoletes: XcursorTheme-whiteglass %description -n xcursor-theme-whiteglass Cursors theme "whiteglass" for X11. @@ -94,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:02:54 qboosh +- Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) + Revision 1.2 2005/08/27 18:00:36 qboosh - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Sat Aug 27 20:20:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: tkabber.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:20:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/tkabber.spec diff -u SPECS/tkabber.spec:1.16 SPECS/tkabber.spec:1.17 --- SPECS/tkabber.spec:1.16 Thu Nov 4 12:22:33 2004 +++ SPECS/tkabber.spec Sat Aug 27 20:20:15 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client Summary(pl): Klient Jabbera oparty o Tk Name: tkabber -Version: 0.9.7 -Release: 3 +Version: 0.9.8 +Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 41a0f24239415edb8e3d2cd86e532f38 +Source0: http://files.jabberstudio.org/%{name}/%{name}-%{version}.tar.gz +# Source0-md5: 2112b44822e4ea7d9292fddc93a89fd1 Source1: %{name}.desktop Source2: %{name}.png Icon: tkabber.xpm @@ -58,6 +58,7 @@ %prep %setup -q +sed -i -e 's#ifaceck##g' Makefile %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 18:20:15 arekm +- up to 0.9.8 + Revision 1.16 2004/11/04 11:22:33 paladine - rel 3 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 20:20:33 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: tkabber-0.9.8.tar.gz Message-ID: <28603.1125166833@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-0.9.8.tar.gz 2112b44822e4ea7d9292fddc93a89fd1 tkabber-0.9.8.tar.gz Size: 719377 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: tkabber-plugins-0.9.8.tar.gz Message-ID: <1067.1125167037@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-plugins-0.9.8.tar.gz de03ba77d6b6d28f128acf5cfdd90d28 tkabber-plugins-0.9.8.tar.gz Size: 394599 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: tkabber-plugins.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:23:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber-plugins.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/tkabber-plugins.spec diff -u SPECS/tkabber-plugins.spec:1.1 SPECS/tkabber-plugins.spec:1.2 --- SPECS/tkabber-plugins.spec:1.1 Mon Nov 22 10:55:25 2004 +++ SPECS/tkabber-plugins.spec Sat Aug 27 20:23:50 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client plugins Summary(pl): Wtyczki do Klienta Jabbera opartego o Tk Name: tkabber-plugins -Version: 0.9.7 +Version: 0.9.8 Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 837d9e3de0cd7253a1dd6e2940d103d7 +Source0: http://files.jabberstudio.org/tkabber/%{name}-%{version}.tar.gz +# Source0-md5: de03ba77d6b6d28f128acf5cfdd90d28 URL: http://tkabber.jabber.ru/ Requires: tkabber >= %{version}-%{release} BuildArch: noarch @@ -44,6 +44,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:23:50 arekm +- up to 0.9.8 + Revision 1.1 2004/11/22 09:55:25 arekm - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber-plugins.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 20:29:14 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: tidy.spec - updated to 0.20050826;fix build In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:29:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.20050826;fix build ---- Files affected: SPECS: tidy.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/tidy.spec diff -u SPECS/tidy.spec:1.41 SPECS/tidy.spec:1.42 --- SPECS/tidy.spec:1.41 Sun Jul 17 19:37:46 2005 +++ SPECS/tidy.spec Sat Aug 27 20:29:09 2005 @@ -2,15 +2,15 @@ Summary: Utility to clean up and pretty print HTML files Summary(pl): Narz?dzie do porz?dkowania kodu HTML Name: tidy -Version: 0.20041025 +Version: 0.20050826 Release: 1 Epoch: 1 License: distributable Group: Applications/Text Source0: http://tidy.sourceforge.net/src/tidy_src.tgz -# Source0-md5: bf6cd062ed43babdba5ade9378be2db3 +# Source0-md5: 7c2ee7186b0384f92f65ec61266e0661 Source1: http://tidy.sourceforge.net/docs/tidy_docs.tgz -# Source1-md5: 04338149bdd3e10753101bc5dff8acd8 +# Source1-md5: 2e6533fc48b077ff6243deaf21a781de URL: http://tidy.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -69,9 +69,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -mv -f htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 %clean rm -rf $RPM_BUILD_ROOT @@ -84,7 +81,6 @@ %doc htmldoc/* %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* -%{_mandir}/man1/* %files devel %defattr(644,root,root,755) @@ -102,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 18:29:09 darekr +- updated to 0.20050826;fix build + Revision 1.41 2005/07/17 17:37:46 darekr - unify sourceforge URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tidy.spec?r1=1.41&r2=1.42&f=u From darekr at pld-linux.org Sat Aug 27 20:29:16 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: tidy_src.tgz tidy_docs.tgz Message-ID: <8564.1125167356@distfiles.pld-linux.org> Files fetched: 2 STORED: http://tidy.sourceforge.net/src/tidy_src.tgz 7c2ee7186b0384f92f65ec61266e0661 tidy_src.tgz Size: 255812 bytes STORED: http://tidy.sourceforge.net/docs/tidy_docs.tgz 2e6533fc48b077ff6243deaf21a781de tidy_docs.tgz Size: 150359 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 20:42:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-font-encodings.spec, xorg-font-font-adobe-100dpi.spec, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, better Group; TODO: use PLD fonts infrastructure ---- Files affected: SPECS: xorg-font-encodings.spec (1.2 -> 1.3) , xorg-font-font-adobe-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-type1.spec (1.2 -> 1.3) , xorg-font-font-alias.spec (1.2 -> 1.3) , xorg-font-font-arabic-misc.spec (1.2 -> 1.3) , xorg-font-font-bh-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-ttf.spec (1.2 -> 1.3) , xorg-font-font-bh-type1.spec (1.2 -> 1.3) , xorg-font-font-bitstream-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-type1.spec (1.2 -> 1.3) , xorg-font-font-cronyx-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-cursor-misc.spec (1.2 -> 1.3) , xorg-font-font-daewoo-misc.spec (1.2 -> 1.3) , xorg-font-font-dec-misc.spec (1.2 -> 1.3) , xorg-font-font-ibm-type1.spec (1.2 -> 1.3) , xorg-font-font-isas-misc.spec (1.2 -> 1.3) , xorg-font-font-jis-misc.spec (1.2 -> 1.3) , xorg-font-font-micro-misc.spec (1.2 -> 1.3) , xorg-font-font-misc-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-misc-misc.spec (1.2 -> 1.3) , xorg-font-font-mutt-misc.spec (1.2 -> 1.3) , xorg-font-font-schumacher-misc.spec (1.2 -> 1.3) , xorg-font-font-screen-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-sony-misc.spec (1.2 -> 1.3) , xorg-font-font-sun-misc.spec (1.2 -> 1.3) , xorg-font-font-util.spec (1.2 -> 1.3) , xorg-font-font-winitzki-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-xfree86-type1.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-font-encodings.spec diff -u SPECS/xorg-font-encodings.spec:1.2 SPECS/xorg-font-encodings.spec:1.3 --- SPECS/xorg-font-encodings.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-encodings.spec Sat Aug 27 20:42:17 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# $Rev: 3433 $, $Date$ -# -Summary: encodings -Summary(pl): encodings +Summary: X font encodings database +Summary(pl): Baza kodowa? font?w X Name: xorg-font-encodings Version: 0.99.0 Release: 0.02 @@ -14,23 +12,21 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-mkfontscale BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/encodings-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -encodings +X font encodings database. %description -l pl -encodings - +Baza kodowa? font?w X. %prep %setup -q -n encodings-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -39,29 +35,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_fontsdir}/encodings - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-100dpi.spec diff -u SPECS/xorg-font-font-adobe-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3190 $, $Date$ -# -Summary: font-adobe-100dpi -Summary(pl): font-adobe-100dpi +Summary: adobe-100dpi font +Summary(pl): Font adobe-100dpi Name: xorg-font-font-adobe-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-100dpi-%{version}.tar.bz2 # Source0-md5: a54f67c67177d2759efe92ad1f68a162 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-100dpi +adobe-100dpi font. %description -l pl -font-adobe-100dpi - +Font adobe-100dpi. %prep %setup -q -n font-adobe-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-75dpi.spec diff -u SPECS/xorg-font-font-adobe-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3189 $, $Date$ -# -Summary: font-adobe-75dpi -Summary(pl): font-adobe-75dpi +Summary: adobe-75dpi font +Summary(pl): Font adobe-75dpi Name: xorg-font-font-adobe-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-75dpi-%{version}.tar.bz2 # Source0-md5: 46c7a56e2085c087ca84f6836d91fd9c URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-75dpi +adobe-75dpi font. %description -l pl -font-adobe-75dpi - +Font adobe-75dpi. %prep %setup -q -n font-adobe-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-100dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3192 $, $Date$ -# -Summary: font-adobe-utopia-100dpi -Summary(pl): font-adobe-utopia-100dpi +Summary: adobe-utopia-100dpi font +Summary(pl): Font adobe-utopia-100dpi Name: xorg-font-font-adobe-utopia-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-100dpi-%{version}.tar.bz2 # Source0-md5: 71ef49367ab5a43209ecfd931aaf5d72 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-100dpi +adobe-utopia-100dpi font. %description -l pl -font-adobe-utopia-100dpi - +Font adobe-utopia-100dpi. %prep %setup -q -n font-adobe-utopia-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-75dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3191 $, $Date$ -# -Summary: font-adobe-utopia-75dpi -Summary(pl): font-adobe-utopia-75dpi +Summary: adobe-utopia-75dpi font +Summary(pl): Font adobe-utopia-75dpi Name: xorg-font-font-adobe-utopia-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-75dpi-%{version}.tar.bz2 # Source0-md5: c7084294f3038a5d26ffbafc2651864d URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-75dpi +adobe-utopia-75dpi font. %description -l pl -font-adobe-utopia-75dpi - +Font adobe-utopia-75dpi. %prep %setup -q -n font-adobe-utopia-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-type1.spec diff -u SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 SPECS/xorg-font-font-adobe-utopia-type1.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-type1.spec Sat Aug 27 20:42:17 2005 @@ -1,38 +1,34 @@ # $Revision$, $Date$ -# $Rev: 3193 $, $Date$ -# -Summary: font-adobe-utopia-type1 -Summary(pl): font-adobe-utopia-type1 +Summary: adobe-utopia-type1 font +Summary(pl): Font adobe-utopia-type1 Name: xorg-font-font-adobe-utopia-type1 Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-type1-%{version}.tar.bz2 # Source0-md5: 05e63b72340f34611de54db6940cb050 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: fontconfig +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-app-bdftopcf BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-type1-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-type1 +adobe-utopia-type1 font. %description -l pl -font-adobe-utopia-type1 - +Font adobe-utopia-type1. %prep %setup -q -n font-adobe-utopia-type1-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,29 +37,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/Type1/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-alias.spec diff -u SPECS/xorg-font-font-alias.spec:1.2 SPECS/xorg-font-font-alias.spec:1.3 --- SPECS/xorg-font-font-alias.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-alias.spec Sat Aug 27 20:42:17 2005 @@ -1,33 +1,29 @@ # $Revision$, $Date$ -# $Rev: 3194 $, $Date$ -# -Summary: font-alias -Summary(pl): font-alias +Summary: X font alias databases +Summary(pl): Baza alias?w font?w X Name: xorg-font-font-alias Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-alias-%{version}.tar.bz2 # Source0-md5: 31344a6fad2a6ec4c8ab995231d5a746 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-alias-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-alias +X font alias databases. %description -l pl -font-alias - +Baza alias?w font?w X. %prep %setup -q -n font-alias-%{version} - %build %{__aclocal} %{__autoconf} @@ -36,18 +32,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/fonts.alias @@ -55,13 +48,15 @@ %{_libdir}/X11/fonts/cyrillic/fonts.alias %{_libdir}/X11/fonts/misc/fonts.alias - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-arabic-misc.spec diff -u SPECS/xorg-font-font-arabic-misc.spec:1.2 SPECS/xorg-font-font-arabic-misc.spec:1.3 --- SPECS/xorg-font-font-arabic-misc.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-arabic-misc.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3195 $, $Date$ -# -Summary: font-arabic-misc -Summary(pl): font-arabic-misc +Summary: arabic-misc font +Summary(pl): Font arabic-misc Name: xorg-font-font-arabic-misc Version: 0.99.0 Release: 0.01 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 20:46:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-lib-libSM.spec, xorg-lib-libXdamage.spec, xorg-lib-lib... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:46:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - just name in BuildRoot ---- Files affected: SPECS: xorg-lib-libSM.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.4 SPECS/xorg-lib-libSM.spec:1.5 --- SPECS/xorg-lib-libSM.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-xtrans-devel BuildRequires: xorg-util-util-macros Obsoletes: libSM -BuildRoot: %{tmpdir}/libSM-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.4 SPECS/xorg-lib-libXdamage.spec:1.5 --- SPECS/xorg-lib-libXdamage.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-proto-damageproto-devel BuildRequires: xorg-util-util-macros Obsoletes: libXdamage -BuildRoot: %{tmpdir}/libXdamage-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.3 SPECS/xorg-lib-libXprintAppUtil.spec:1.4 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 20:46:09 2005 @@ -15,7 +15,7 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXprintUtil-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libXprintAppUtil-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.4 SPECS/xorg-lib-xtrans.spec:1.5 --- SPECS/xorg-lib-xtrans.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 20:46:09 2005 @@ -13,7 +13,7 @@ BuildRequires: automake BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/xtrans-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -81,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 20:48:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:13 2005 Subject: SOURCES: ncurses-ac_hack.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:48:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: ncurses-ac_hack.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sat Aug 27 20:49:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: mysql-ruby.spec - up to 2.7 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 18:49:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.7 ---- Files affected: SPECS: mysql-ruby.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/mysql-ruby.spec diff -u SPECS/mysql-ruby.spec:1.10 SPECS/mysql-ruby.spec:1.11 --- SPECS/mysql-ruby.spec:1.10 Mon Aug 15 11:07:00 2005 +++ SPECS/mysql-ruby.spec Sat Aug 27 20:48:57 2005 @@ -4,12 +4,12 @@ Summary: MySQL module for Ruby Summary(pl): Modu? MySQL dla j?zyka Ruby Name: mysql-ruby -Version: 2.6 +Version: 2.7 Release: 1 License: GPL Group: Development/Languages Source0: http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz -# Source0-md5: 1eefc5a170de0752816c5092869426b1 +# Source0-md5: c6668900e68f0d6a137612c818d5fd01 URL: http://www.tmtm.org/mysql/ruby/ BuildRequires: mysql-devel BuildRequires: ruby @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/27 18:48:57 aredridel +- up to 2.7 + Revision 1.10 2005/08/15 09:07:00 qboosh - updated Source0 URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-ruby.spec?r1=1.10&r2=1.11&f=u From aredridel at pld-linux.org Sat Aug 27 20:49:17 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:13 2005 Subject: DISTFILES: mysql-ruby-2.7.tar.gz Message-ID: <3202.1125168557@distfiles.pld-linux.org> Files fetched: 1 STORED: http://tmtm.org/downloads/mysql/ruby/mysql-ruby-2.7.tar.gz c6668900e68f0d6a137612c818d5fd01 mysql-ruby-2.7.tar.gz Size: 29620 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sat Aug 27 20:50:52 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: xorg-font-font-util.spec - kill /usr/X11R6 In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 18:50:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-font-font-util.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-font-font-util.spec diff -u SPECS/xorg-font-font-util.spec:1.3 SPECS/xorg-font-font-util.spec:1.4 --- SPECS/xorg-font-font-util.spec:1.3 Sat Aug 27 20:42:17 2005 +++ SPECS/xorg-font-font-util.spec Sat Aug 27 20:50:47 2005 @@ -15,10 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man -%define _datadir /usr/share - %description Font utilities. @@ -62,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:50:47 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 18:42:17 qboosh - cleanups, better Group; TODO: use PLD fonts infrastructure ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 20:58:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:13 2005 Subject: SPECS: cedega-commercial.spec - fix URL In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:58:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix URL ---- Files affected: SPECS: cedega-commercial.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/cedega-commercial.spec diff -u SPECS/cedega-commercial.spec:1.14 SPECS/cedega-commercial.spec:1.15 --- SPECS/cedega-commercial.spec:1.14 Mon Jul 25 22:20:58 2005 +++ SPECS/cedega-commercial.spec Sat Aug 27 20:58:11 2005 @@ -10,7 +10,7 @@ Source0: cedega_%{version}-1.i386.tgz # NoSource0-md5: 589a5d4a698e8c7336c67c1afb6d986d NoSource: 0 -URL: http://www.transgaming.com +URL: http://www.transgaming.com/ BuildRequires: sed >= 4.0 BuildRequires: tar Requires: OpenGL @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/27 18:58:11 darekr +- fix URL + Revision 1.14 2005/07/25 20:20:58 adamg - updated to 4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cedega-commercial.spec?r1=1.14&r2=1.15&f=u From darekr at pld-linux.org Sat Aug 27 21:32:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:13 2005 Subject: SOURCES: vim2html-VIM_HOME.patch (NEW) - fix VIM_HOME variable In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:32:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix VIM_HOME variable ---- Files affected: SOURCES: vim2html-VIM_HOME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vim2html-VIM_HOME.patch diff -u /dev/null SOURCES/vim2html-VIM_HOME.patch:1.1 --- /dev/null Sat Aug 27 21:32:03 2005 +++ SOURCES/vim2html-VIM_HOME.patch Sat Aug 27 21:31:57 2005 @@ -0,0 +1,12 @@ +--- vim2html-1.46/vim2html.orig 2005-08-27 21:24:57.000000000 +0200 ++++ vim2html-1.46/vim2html 2005-08-27 21:25:18.000000000 +0200 +@@ -16,7 +16,8 @@ + + #### begin user settings #### + +-VIM_HOME="`find /usr/share/vim -type d -mindepth 1 -maxdepth 1|sort|tail -1`" ++ ++VIM_HOME="`find /usr/share/vim -mindepth 1 -maxdepth 1 -type d |sort|head -1`" + # normally, no need to change this + + SYNTAX="$VIM_HOME/syntax/2html.vim" ================================================================ From wiget at pld-linux.org Sat Aug 27 21:33:04 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:33:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.3 -> 1.4) , xorg-proto-compositeproto.spec (1.4 -> 1.5) , xorg-proto-damageproto.spec (1.4 -> 1.5) , xorg-proto-dmxproto.spec (1.3 -> 1.4) , xorg-proto-evieext.spec (1.3 -> 1.4) , xorg-proto-fixesproto.spec (1.4 -> 1.5) , xorg-proto-fontcacheproto.spec (1.3 -> 1.4) , xorg-proto-fontsproto.spec (1.3 -> 1.4) , xorg-proto-inputproto.spec (1.3 -> 1.4) , xorg-proto-kbproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.3 -> 1.4) , xorg-proto-randrproto.spec (1.4 -> 1.5) , xorg-proto-recordproto.spec (1.4 -> 1.5) , xorg-proto-renderproto.spec (1.4 -> 1.5) , xorg-proto-resourceproto.spec (1.4 -> 1.5) , xorg-proto-scrnsaverproto.spec (1.3 -> 1.4) , xorg-proto-trapproto.spec (1.3 -> 1.4) , xorg-proto-videoproto.spec (1.3 -> 1.4) , xorg-proto-xcmiscproto.spec (1.3 -> 1.4) , xorg-proto-xextproto.spec (1.4 -> 1.5) , xorg-proto-xf86bigfontproto.spec (1.3 -> 1.4) , xorg-proto-xf86dgaproto.spec (1.3 -> 1.4) , xorg-proto-xf86driproto.spec (1.3 -> 1.4) , xorg-proto-xf86miscproto.spec (1.3 -> 1.4) , xorg-proto-xf86rushproto.spec (1.3 -> 1.4) , xorg-proto-xf86vidmodeproto.spec (1.3 -> 1.4) , xorg-proto-xproto.spec (1.4 -> 1.5) , xorg-proto-xproxymanagementprotocol.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.3 SPECS/xorg-proto-bigreqsproto.spec:1.4 --- SPECS/xorg-proto-bigreqsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description BigReqs protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.4 SPECS/xorg-proto-compositeproto.spec:1.5 --- SPECS/xorg-proto-compositeproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Composite protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.4 SPECS/xorg-proto-damageproto.spec:1.5 --- SPECS/xorg-proto-damageproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Damage protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.3 SPECS/xorg-proto-dmxproto.spec:1.4 --- SPECS/xorg-proto-dmxproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description DMX protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.3 SPECS/xorg-proto-evieext.spec:1.4 --- SPECS/xorg-proto-evieext.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description EvIE protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.4 SPECS/xorg-proto-fixesproto.spec:1.5 --- SPECS/xorg-proto-fixesproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fixes protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.3 SPECS/xorg-proto-fontcacheproto.spec:1.4 --- SPECS/xorg-proto-fontcacheproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fontcache protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.3 SPECS/xorg-proto-fontsproto.spec:1.4 --- SPECS/xorg-proto-fontsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fonts protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-inputproto.spec diff -u SPECS/xorg-proto-inputproto.spec:1.3 SPECS/xorg-proto-inputproto.spec:1.4 --- SPECS/xorg-proto-inputproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-inputproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Input protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-kbproto.spec diff -u SPECS/xorg-proto-kbproto.spec:1.3 SPECS/xorg-proto-kbproto.spec:1.4 --- SPECS/xorg-proto-kbproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-kbproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description KB protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-printproto.spec diff -u SPECS/xorg-proto-printproto.spec:1.3 SPECS/xorg-proto-printproto.spec:1.4 --- SPECS/xorg-proto-printproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-printproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Print protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-randrproto.spec diff -u SPECS/xorg-proto-randrproto.spec:1.4 SPECS/xorg-proto-randrproto.spec:1.5 --- SPECS/xorg-proto-randrproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-randrproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Randr protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-recordproto.spec diff -u SPECS/xorg-proto-recordproto.spec:1.4 SPECS/xorg-proto-recordproto.spec:1.5 --- SPECS/xorg-proto-recordproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-recordproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Record protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-renderproto.spec diff -u SPECS/xorg-proto-renderproto.spec:1.4 SPECS/xorg-proto-renderproto.spec:1.5 --- SPECS/xorg-proto-renderproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-renderproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Render protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-resourceproto.spec diff -u SPECS/xorg-proto-resourceproto.spec:1.4 SPECS/xorg-proto-resourceproto.spec:1.5 --- SPECS/xorg-proto-resourceproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-resourceproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Resource protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-scrnsaverproto.spec diff -u SPECS/xorg-proto-scrnsaverproto.spec:1.3 SPECS/xorg-proto-scrnsaverproto.spec:1.4 --- SPECS/xorg-proto-scrnsaverproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-scrnsaverproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description ScrnSaver protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-trapproto.spec diff -u SPECS/xorg-proto-trapproto.spec:1.3 SPECS/xorg-proto-trapproto.spec:1.4 --- SPECS/xorg-proto-trapproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-trapproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Trap protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-videoproto.spec diff -u SPECS/xorg-proto-videoproto.spec:1.3 SPECS/xorg-proto-videoproto.spec:1.4 --- SPECS/xorg-proto-videoproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-videoproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Video protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xcmiscproto.spec diff -u SPECS/xorg-proto-xcmiscproto.spec:1.3 SPECS/xorg-proto-xcmiscproto.spec:1.4 --- SPECS/xorg-proto-xcmiscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xcmiscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XCMisc protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xextproto.spec diff -u SPECS/xorg-proto-xextproto.spec:1.4 SPECS/xorg-proto-xextproto.spec:1.5 --- SPECS/xorg-proto-xextproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xextproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XExt protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86bigfontproto.spec diff -u SPECS/xorg-proto-xf86bigfontproto.spec:1.3 SPECS/xorg-proto-xf86bigfontproto.spec:1.4 --- SPECS/xorg-proto-xf86bigfontproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86bigfontproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86BigFont protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86dgaproto.spec diff -u SPECS/xorg-proto-xf86dgaproto.spec:1.3 SPECS/xorg-proto-xf86dgaproto.spec:1.4 --- SPECS/xorg-proto-xf86dgaproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86dgaproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DGA protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86driproto.spec diff -u SPECS/xorg-proto-xf86driproto.spec:1.3 SPECS/xorg-proto-xf86driproto.spec:1.4 --- SPECS/xorg-proto-xf86driproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86driproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DRI protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86miscproto.spec diff -u SPECS/xorg-proto-xf86miscproto.spec:1.3 SPECS/xorg-proto-xf86miscproto.spec:1.4 --- SPECS/xorg-proto-xf86miscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86miscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Misc protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86rushproto.spec diff -u SPECS/xorg-proto-xf86rushproto.spec:1.3 SPECS/xorg-proto-xf86rushproto.spec:1.4 --- SPECS/xorg-proto-xf86rushproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86rushproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Rush protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 21:33:31 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vim2html.spec - updated to 1.46 - added -VIM_HOME patch, fi... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:33:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.46 - added -VIM_HOME patch, fixed Source0 ---- Files affected: SPECS: vim2html.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/vim2html.spec diff -u SPECS/vim2html.spec:1.1 SPECS/vim2html.spec:1.2 --- SPECS/vim2html.spec:1.1 Sun May 2 13:41:10 2004 +++ SPECS/vim2html.spec Sat Aug 27 21:33:26 2005 @@ -2,13 +2,14 @@ Summary: Vim-editable file converter to HTML Summary(pl): Konwerter edytowalnych plik?w Vima do formatu HTML Name: vim2html -Version: 1.42 +Version: 1.46 Release: 1 License: GPL v2 Group: Applications/Text -Source0: http://norlug.org/~chipster/download_handler/cat5/%{name}-%{version}.tar.gz -# Source0-md5: da1a1c79b17181fdf3d69f2417f90e0b -URL: http://norlug.org/~chipster/vim2html +Source0: http://norlug.org/~chipster/resources/vim2html/%{name}-%{version}.tar.gz +# Source0-md5: 4fcccd28b2a28519bdc65e90120c7204 +URL: http://norlug.org/~chipster/vim2html/ +Patch0: %{name}-VIM_HOME.patch Requires: tidy BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -51,6 +53,10 @@ * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 19:33:26 darekr +- updated to 1.46 +- added -VIM_HOME patch, fixed Source0 + Revision 1.1 2004/05/02 11:41:10 yogib - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim2html.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 21:34:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: vim2html-1.46.tar.gz Message-ID: <6091.1125171251@distfiles.pld-linux.org> Files fetched: 1 STORED: http://norlug.org/~chipster/resources/vim2html/vim2html-1.46.tar.gz 4fcccd28b2a28519bdc65e90120c7204 vim2html-1.46.tar.gz Size: 12065 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sat Aug 27 21:38:15 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vis5d.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:38:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vis5d.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/vis5d.spec diff -u SPECS/vis5d.spec:1.17 SPECS/vis5d.spec:1.18 --- SPECS/vis5d.spec:1.17 Wed Mar 30 17:27:46 2005 +++ SPECS/vis5d.spec Sat Aug 27 21:38:10 2005 @@ -31,7 +31,7 @@ Summary: Vis5d - sample data Summary(pl): Vis5d - przyk?adowe dane Group: X11/Applications -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description data Sample data. @@ -43,7 +43,7 @@ Summary: Vis5d development information Summary(pl): Vis5d - informacje dla programist?w Group: Development -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel Vis5d development information. API and script info. @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/27 19:38:10 darekr +- strict deps + Revision 1.17 2005/03/30 15:27:46 darekr - missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vis5d.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sat Aug 27 21:38:14 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xorg-lib-libFS.spec, xorg-lib-libICE.spec, xorg-lib-libSM.s... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:38:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-lib-libFS.spec (1.3 -> 1.4) , xorg-lib-libICE.spec (1.4 -> 1.5) , xorg-lib-libSM.spec (1.5 -> 1.6) , xorg-lib-libX11.spec (1.4 -> 1.5) , xorg-lib-libXScrnSaver.spec (1.3 -> 1.4) , xorg-lib-libXTrap.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.4 -> 1.5) , xorg-lib-libXaw.spec (1.4 -> 1.5) , xorg-lib-libXcomposite.spec (1.4 -> 1.5) , xorg-lib-libXcursor.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.5 -> 1.6) , xorg-lib-libXdmcp.spec (1.4 -> 1.5) , xorg-lib-libXevie.spec (1.3 -> 1.4) , xorg-lib-libXext.spec (1.4 -> 1.5) , xorg-lib-libXfixes.spec (1.4 -> 1.5) , xorg-lib-libXfont.spec (1.5 -> 1.6) , xorg-lib-libXfontcache.spec (1.3 -> 1.4) , xorg-lib-libXft.spec (1.4 -> 1.5) , xorg-lib-libXi.spec (1.4 -> 1.5) , xorg-lib-libXinerama.spec (1.4 -> 1.5) , xorg-lib-libXmu.spec (1.4 -> 1.5) , xorg-lib-libXp.spec (1.4 -> 1.5) , xorg-lib-libXpm.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.4 -> 1.5) , xorg-lib-libXprintUtil.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.4 -> 1.5) , xorg-lib-libXrender.spec (1.4 -> 1.5) , xorg-lib-libXres.spec (1.4 -> 1.5) , xorg-lib-libXt.spec (1.4 -> 1.5) , xorg-lib-libXtst.spec (1.4 -> 1.5) , xorg-lib-libXv.spec (1.4 -> 1.5) , xorg-lib-libXvMC.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.3 -> 1.4) , xorg-lib-libXxf86misc.spec (1.3 -> 1.4) , xorg-lib-libXxf86vm.spec (1.3 -> 1.4) , xorg-lib-libdmx.spec (1.3 -> 1.4) , xorg-lib-libfontenc.spec (1.4 -> 1.5) , xorg-lib-liblbxutil.spec (1.4 -> 1.5) , xorg-lib-liboldX.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.3 -> 1.4) , xorg-lib-libxkbui.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.3 SPECS/xorg-lib-libFS.spec:1.4 --- SPECS/xorg-lib-libFS.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description FS library. @@ -109,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.4 SPECS/xorg-lib-libICE.spec:1.5 --- SPECS/xorg-lib-libICE.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ Obsoletes: libICE BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Inter Client Exchange library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.5 SPECS/xorg-lib-libSM.spec:1.6 --- SPECS/xorg-lib-libSM.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libSM BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Session Management library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libX11.spec diff -u SPECS/xorg-lib-libX11.spec:1.4 SPECS/xorg-lib-libX11.spec:1.5 --- SPECS/xorg-lib-libX11.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libX11.spec Sat Aug 27 21:38:03 2005 @@ -26,9 +26,6 @@ Obsoletes: libX11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X11 Base library. @@ -126,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXScrnSaver.spec diff -u SPECS/xorg-lib-libXScrnSaver.spec:1.3 SPECS/xorg-lib-libXScrnSaver.spec:1.4 --- SPECS/xorg-lib-libXScrnSaver.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXScrnSaver.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description XScrnSaver library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXTrap.spec diff -u SPECS/xorg-lib-libXTrap.spec:1.3 SPECS/xorg-lib-libXTrap.spec:1.4 --- SPECS/xorg-lib-libXTrap.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXTrap.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XTrap library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXau.spec diff -u SPECS/xorg-lib-libXau.spec:1.4 SPECS/xorg-lib-libXau.spec:1.5 --- SPECS/xorg-lib-libXau.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXau.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXau BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xau - Authorization Protocol for X. @@ -112,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXaw.spec diff -u SPECS/xorg-lib-libXaw.spec:1.4 SPECS/xorg-lib-libXaw.spec:1.5 --- SPECS/xorg-lib-libXaw.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXaw.spec Sat Aug 27 21:38:03 2005 @@ -20,9 +20,6 @@ Obsoletes: libXaw BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Athena Widgets library. @@ -118,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcomposite.spec diff -u SPECS/xorg-lib-libXcomposite.spec:1.4 SPECS/xorg-lib-libXcomposite.spec:1.5 --- SPECS/xorg-lib-libXcomposite.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcomposite.spec Sat Aug 27 21:38:03 2005 @@ -20,8 +20,6 @@ Obsoletes: libXcomposite BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Composite extension library. @@ -114,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcursor.spec diff -u SPECS/xorg-lib-libXcursor.spec:1.4 SPECS/xorg-lib-libXcursor.spec:1.5 --- SPECS/xorg-lib-libXcursor.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcursor.spec Sat Aug 27 21:38:03 2005 @@ -21,9 +21,6 @@ Obsoletes: xcursor BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Cursor - client-side cursor loading library. @@ -120,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.5 SPECS/xorg-lib-libXdamage.spec:1.6 --- SPECS/xorg-lib-libXdamage.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdamage BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Damage extension library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXdmcp.spec diff -u SPECS/xorg-lib-libXdmcp.spec:1.4 SPECS/xorg-lib-libXdmcp.spec:1.5 --- SPECS/xorg-lib-libXdmcp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdmcp.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdmcp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Display Manager Control Protocol library. @@ -113,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXevie.spec diff -u SPECS/xorg-lib-libXevie.spec:1.3 SPECS/xorg-lib-libXevie.spec:1.4 --- SPECS/xorg-lib-libXevie.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXevie.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Evie extension library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXext.spec diff -u SPECS/xorg-lib-libXext.spec:1.4 SPECS/xorg-lib-libXext.spec:1.5 --- SPECS/xorg-lib-libXext.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXext.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXext BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfixes.spec diff -u SPECS/xorg-lib-libXfixes.spec:1.4 SPECS/xorg-lib-libXfixes.spec:1.5 --- SPECS/xorg-lib-libXfixes.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfixes.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXfixes BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Fixes extension library. @@ -114,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.5 SPECS/xorg-lib-libXfont.spec:1.6 --- SPECS/xorg-lib-libXfont.spec:1.5 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 21:38:03 2005 @@ -22,8 +22,6 @@ Obsoletes: libXfont BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X font library used by the X server. @@ -124,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfontcache.spec diff -u SPECS/xorg-lib-libXfontcache.spec:1.3 SPECS/xorg-lib-libXfontcache.spec:1.4 --- SPECS/xorg-lib-libXfontcache.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfontcache.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xfontcache library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXft.spec diff -u SPECS/xorg-lib-libXft.spec:1.4 SPECS/xorg-lib-libXft.spec:1.5 --- SPECS/xorg-lib-libXft.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXft.spec Sat Aug 27 21:38:03 2005 @@ -23,9 +23,6 @@ Obsoletes: xft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xft is a font rendering library for X. @@ -127,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXi.spec diff -u SPECS/xorg-lib-libXi.spec:1.4 SPECS/xorg-lib-libXi.spec:1.5 --- SPECS/xorg-lib-libXi.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXi.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXi BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Input extension library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXinerama.spec diff -u SPECS/xorg-lib-libXinerama.spec:1.4 SPECS/xorg-lib-libXinerama.spec:1.5 --- SPECS/xorg-lib-libXinerama.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXinerama.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXinerama BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Xinerama extension library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXmu.spec diff -u SPECS/xorg-lib-libXmu.spec:1.4 SPECS/xorg-lib-libXmu.spec:1.5 --- SPECS/xorg-lib-libXmu.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXmu.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXmu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Miscellaneous Utilities library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXp.spec diff -u SPECS/xorg-lib-libXp.spec:1.4 SPECS/xorg-lib-libXp.spec:1.5 --- SPECS/xorg-lib-libXp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXp.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description DtPrint extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXpm.spec diff -u SPECS/xorg-lib-libXpm.spec:1.4 SPECS/xorg-lib-libXpm.spec:1.5 --- SPECS/xorg-lib-libXpm.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXpm.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: xpm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Pixmap library. @@ -130,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.4 SPECS/xorg-lib-libXprintAppUtil.spec:1.5 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.4 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 21:38:03 2005 @@ -17,8 +17,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XprintAppUtil library. @@ -108,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXprintUtil.spec diff -u SPECS/xorg-lib-libXprintUtil.spec:1.3 SPECS/xorg-lib-libXprintUtil.spec:1.4 --- SPECS/xorg-lib-libXprintUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintUtil.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.5&r2=1.6&f=u From darekr at pld-linux.org Sat Aug 27 21:51:43 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: darkstat.spec - removed NEWS from %doc (see ChangeLog) In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:51:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed NEWS from %doc (see ChangeLog) ---- Files affected: SPECS: darkstat.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/darkstat.spec diff -u SPECS/darkstat.spec:1.4 SPECS/darkstat.spec:1.5 --- SPECS/darkstat.spec:1.4 Thu Aug 4 10:22:49 2005 +++ SPECS/darkstat.spec Sat Aug 27 21:51:36 2005 @@ -42,7 +42,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog README %attr(755,root,root) %{_sbindir}/* %{_mandir}/man1/* @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:51:36 darekr +- removed NEWS from %doc (see ChangeLog) + Revision 1.4 2005/08/04 08:22:49 nail2k - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkstat.spec?r1=1.4&r2=1.5&f=u From areq at pld-linux.org Sat Aug 27 22:00:32 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: linux-2.6.12.5.tar.bz2 mISDN-CVS-2005-07-06.tar.bz2 Message-ID: <12167.1125172832@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.5.tar.bz2 076f0dc714112c764c790fbaef19e228 linux-2.6.12.5.tar.bz2 STORED: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-CVS-2005-07-06.tar.bz2 f8892d49e00e3fa26e65e22084edd472 mISDN-CVS-2005-07-06.tar.bz2 Size: 259290 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 22:00:29 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS (LINUX_2_6): kernel.spec - add mISDN (ix86 only) In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:00:29 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - add mISDN (ix86 only) ---- Files affected: SPECS: kernel.spec (1.441.2.1168 -> 1.441.2.1169) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1168 SPECS/kernel.spec:1.441.2.1169 --- SPECS/kernel.spec:1.441.2.1168 Fri Aug 26 14:52:05 2005 +++ SPECS/kernel.spec Sat Aug 27 22:00:19 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.4 +%define _rel 0.5 %define _netfilter_snap 20050801 @@ -115,6 +115,7 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 +%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -168,6 +169,10 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config +Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 +# Source100-md5: f8892d49e00e3fa26e65e22084edd472 + + Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -621,7 +626,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} +%setup -q -n linux-%{version}%{_rc} -a 100 %patch0 -p1 %patch1 -p0 @@ -743,6 +748,12 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig +# mISDN +%ifarch %{ix86} +cd mISDN-%{mISDN_version} +./std2kern -k ../ +%endif + %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1490,6 +1501,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1169 2005/08/27 20:00:19 areq +- add mISDN (ix86 only) + Revision 1.441.2.1168 2005/08/26 12:52:05 baggins - uncommented atm patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1168&r2=1.441.2.1169&f=u From wiget at pld-linux.org Sat Aug 27 22:00:58 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:00:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, kill /usr/X11R6 ---- Files affected: SPECS: xorg-app-appres.spec (1.2 -> 1.3) , xorg-app-bdftopcf.spec (1.2 -> 1.3) , xorg-app-beforelight.spec (1.2 -> 1.3) , xorg-app-bitmap.spec (1.2 -> 1.3) , xorg-app-editres.spec (1.2 -> 1.3) , xorg-app-fonttosfnt.spec (1.2 -> 1.3) , xorg-app-fslsfonts.spec (1.2 -> 1.3) , xorg-app-fstobdf.spec (1.2 -> 1.3) , xorg-app-iceauth.spec (1.2 -> 1.3) , xorg-app-ico.spec (1.2 -> 1.3) , xorg-app-lbxproxy.spec (1.2 -> 1.3) , xorg-app-listres.spec (1.2 -> 1.3) , xorg-app-luit.spec (1.2 -> 1.3) , xorg-app-mkfontdir.spec (1.2 -> 1.3) , xorg-app-mkfontscale.spec (1.2 -> 1.3) , xorg-app-oclock.spec (1.2 -> 1.3) , xorg-app-pclcomp.spec (1.2 -> 1.3) , xorg-app-proxymngr.spec (1.2 -> 1.3) , xorg-app-rgb.spec (1.2 -> 1.3) , xorg-app-rstart.spec (1.2 -> 1.3) , xorg-app-scripts.spec (1.2 -> 1.3) , xorg-app-setxkbmap.spec (1.2 -> 1.3) , xorg-app-showfont.spec (1.2 -> 1.3) , xorg-app-smproxy.spec (1.2 -> 1.3) , xorg-app-twm.spec (1.2 -> 1.3) , xorg-app-viewres.spec (1.2 -> 1.3) , xorg-app-x11perf.spec (1.2 -> 1.3) , xorg-app-xauth.spec (1.2 -> 1.3) , xorg-app-xbiff.spec (1.2 -> 1.3) , xorg-app-xcalc.spec (1.2 -> 1.3) , xorg-app-xclipboard.spec (1.2 -> 1.3) , xorg-app-xclock.spec (1.2 -> 1.3) , xorg-app-xcmsdb.spec (1.2 -> 1.3) , xorg-app-xconsole.spec (1.2 -> 1.3) , xorg-app-xcursorgen.spec (1.2 -> 1.3) , xorg-app-xdbedizzy.spec (1.2 -> 1.3) , xorg-app-xditview.spec (1.2 -> 1.3) , xorg-app-xdpyinfo.spec (1.2 -> 1.3) , xorg-app-xedit.spec (1.2 -> 1.3) , xorg-app-xev.spec (1.2 -> 1.3) , xorg-app-xeyes.spec (1.2 -> 1.3) , xorg-app-xf86dga.spec (1.2 -> 1.3) , xorg-app-xfd.spec (1.2 -> 1.3) , xorg-app-xfontsel.spec (1.2 -> 1.3) , xorg-app-xfs.spec (1.2 -> 1.3) , xorg-app-xfsinfo.spec (1.2 -> 1.3) , xorg-app-xfwp.spec (1.2 -> 1.3) , xorg-app-xgamma.spec (1.2 -> 1.3) , xorg-app-xgc.spec (1.2 -> 1.3) , xorg-app-xhost.spec (1.2 -> 1.3) , xorg-app-xkbcomp.spec (1.2 -> 1.3) , xorg-app-xkbevd.spec (1.2 -> 1.3) , xorg-app-xkbprint.spec (1.2 -> 1.3) , xorg-app-xkbutils.spec (1.2 -> 1.3) , xorg-app-xkill.spec (1.2 -> 1.3) , xorg-app-xlogo.spec (1.2 -> 1 .3) , xorg-app-xlsatoms.spec (1.2 -> 1.3) , xorg-app-xlsclients.spec (1.2 -> 1.3) , xorg-app-xlsfonts.spec (1.2 -> 1.3) , xorg-app-xmag.spec (1.2 -> 1.3) , xorg-app-xman.spec (1.2 -> 1.3) , xorg-app-xmessage.spec (1.2 -> 1.3) , xorg-app-xmh.spec (1.2 -> 1.3) , xorg-app-xmodmap.spec (1.2 -> 1.3) , xorg-app-xmore.spec (1.2 -> 1.3) , xorg-app-xphelloworld.spec (1.2 -> 1.3) , xorg-app-xplsprinters.spec (1.2 -> 1.3) , xorg-app-xpr.spec (1.2 -> 1.3) , xorg-app-xprehashprinterlist.spec (1.2 -> 1.3) , xorg-app-xprop.spec (1.2 -> 1.3) , xorg-app-xrandr.spec (1.2 -> 1.3) , xorg-app-xrdb.spec (1.2 -> 1.3) , xorg-app-xrefresh.spec (1.2 -> 1.3) , xorg-app-xset.spec (1.2 -> 1.3) , xorg-app-xsetmode.spec (1.2 -> 1.3) , xorg-app-xsetpointer.spec (1.2 -> 1.3) , xorg-app-xsetroot.spec (1.2 -> 1.3) , xorg-app-xsm.spec (1.2 -> 1.3) , xorg-app-xstdcmap.spec (1.2 -> 1.3) , xorg-app-xtrap.spec (1.2 -> 1.3) , xorg-app-xvidtune.spec (1.2 -> 1.3) , xorg-app-xvinfo.spec (1.2 -> 1.3) , xorg-app-xwd.spec (1.2 -> 1.3) , xorg-app-xwininfo.spec (1.2 -> 1.3) , xorg-app-xwud.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.2 SPECS/xorg-app-appres.spec:1.3 --- SPECS/xorg-app-appres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3335 $, $Date$ -# Summary: appres application Summary(pl): Aplikacja appres Name: xorg-app-appres @@ -17,10 +15,7 @@ BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description appres application. @@ -28,12 +23,10 @@ %description -l pl Aplikacja appres. - %prep %setup -q -n appres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -43,30 +36,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/appres %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.2 SPECS/xorg-app-bdftopcf.spec:1.3 --- SPECS/xorg-app-bdftopcf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3336 $, $Date$ -# Summary: bdftopcf application Summary(pl): Aplikacja bdftopcf Name: xorg-app-bdftopcf @@ -16,10 +14,7 @@ BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bdftopcf application. @@ -27,11 +22,9 @@ %description -l pl Aplikacja bdftopcf. - %prep %setup -q -n bdftopcf-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,30 +34,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.2 SPECS/xorg-app-beforelight.spec:1.3 --- SPECS/xorg-app-beforelight.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3339 $, $Date$ -# Summary: beforelight application Summary(pl): Aplikacja beforelight Name: xorg-app-beforelight @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description beforelight application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja beforelight. - %prep %setup -q -n beforelight-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light %attr(755,root,wheel) %{_bindir}/beforelight %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.2 SPECS/xorg-app-bitmap.spec:1.3 --- SPECS/xorg-app-bitmap.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3345 $, $Date$ -# Summary: bitmap application Summary(pl): Aplikacja bitmap Name: xorg-app-bitmap @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bitmap application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja bitmap. - %prep %setup -q -n bitmap-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,18 +37,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* @@ -63,13 +53,15 @@ %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.2 SPECS/xorg-app-editres.spec:1.3 --- SPECS/xorg-app-editres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3340 $, $Date$ -# Summary: editres application Summary(pl): Aplikacja editres Name: xorg-app-editres @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description editres application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja editres. - %prep %setup -q -n editres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.2 SPECS/xorg-app-fonttosfnt.spec:1.3 --- SPECS/xorg-app-fonttosfnt.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3341 $, $Date$ -# Summary: fonttosfnt application Summary(pl): Aplikacja fonttosfnt Name: xorg-app-fonttosfnt @@ -20,10 +18,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fonttosfnt application. @@ -31,12 +26,10 @@ %description -l pl Aplikacja fonttosfnt. - %prep %setup -q -n fonttosfnt-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -46,30 +39,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.2 SPECS/xorg-app-fslsfonts.spec:1.3 --- SPECS/xorg-app-fslsfonts.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3342 $, $Date$ -# Summary: fslsfonts application Summary(pl): Aplikacja fslsfonts Name: xorg-app-fslsfonts @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fslsfonts application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fslsfonts. - %prep %setup -q -n fslsfonts-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.2 SPECS/xorg-app-fstobdf.spec:1.3 --- SPECS/xorg-app-fstobdf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3344 $, $Date$ -# Summary: fstobdf application Summary(pl): Aplikacja fstobdf Name: xorg-app-fstobdf @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fstobdf application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fstobdf. - %prep %setup -q -n fstobdf-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.2 SPECS/xorg-app-iceauth.spec:1.3 --- SPECS/xorg-app-iceauth.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3346 $, $Date$ -# Summary: iceauth application Summary(pl): Aplikacja iceauth Name: xorg-app-iceauth @@ -8,7 +6,6 @@ Release: 0.02 License: MIT Group: X11/Application -###### Unknown group! Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/iceauth-%{version}.tar.bz2 # Source0-md5: 64ac4d6ebaf4eec9cdc4d968e0e9840b Patch0: iceauth-man.patch @@ -19,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) - <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.2&r2=1.3&f=u From darekr at pld-linux.org Sat Aug 27 22:01:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vkeybd.spec - kill obsolete "-c" install option In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:01:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill obsolete "-c" install option ---- Files affected: SPECS: vkeybd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vkeybd.spec diff -u SPECS/vkeybd.spec:1.13 SPECS/vkeybd.spec:1.14 --- SPECS/vkeybd.spec:1.13 Fri Nov 5 08:29:06 2004 +++ SPECS/vkeybd.spec Sat Aug 27 22:01:32 2005 @@ -47,8 +47,8 @@ %{__make} install-all \ DESTDIR=$RPM_BUILD_ROOT -install -c %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd -install -c %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd +install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} mv $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd.png rm -f $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_* @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:01:32 darekr +- kill obsolete "-c" install option + Revision 1.13 2004/11/05 07:29:06 ankry - amd64 build fix, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vkeybd.spec?r1=1.13&r2=1.14&f=u From areq at pld-linux.org Sat Aug 27 22:01:34 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES (LINUX_2_6): kernel-i386-smp.config, kernel-i386.config - ... In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:01:34 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - MISDN ---- Files affected: SOURCES: kernel-i386-smp.config (1.59.10.104 -> 1.59.10.105) , kernel-i386.config (1.82.10.109 -> 1.82.10.110) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.104 SOURCES/kernel-i386-smp.config:1.59.10.105 --- SOURCES/kernel-i386-smp.config:1.59.10.104 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386-smp.config Sat Aug 27 22:01:28 2005 @@ -1122,6 +1122,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1464,7 +1465,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.109 SOURCES/kernel-i386.config:1.82.10.110 --- SOURCES/kernel-i386.config:1.82.10.109 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386.config Sat Aug 27 22:01:28 2005 @@ -1136,6 +1136,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1480,7 +1481,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.104&r2=1.59.10.105&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.109&r2=1.82.10.110&f=u From wiget at pld-linux.org Sat Aug 27 22:04:21 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:04:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - standard permisions to binaries ---- Files affected: SPECS: xorg-app-appres.spec (1.3 -> 1.4) , xorg-app-bdftopcf.spec (1.3 -> 1.4) , xorg-app-beforelight.spec (1.3 -> 1.4) , xorg-app-bitmap.spec (1.3 -> 1.4) , xorg-app-editres.spec (1.3 -> 1.4) , xorg-app-fonttosfnt.spec (1.3 -> 1.4) , xorg-app-fslsfonts.spec (1.3 -> 1.4) , xorg-app-fstobdf.spec (1.3 -> 1.4) , xorg-app-iceauth.spec (1.3 -> 1.4) , xorg-app-ico.spec (1.3 -> 1.4) , xorg-app-lbxproxy.spec (1.3 -> 1.4) , xorg-app-listres.spec (1.3 -> 1.4) , xorg-app-luit.spec (1.3 -> 1.4) , xorg-app-mkfontdir.spec (1.3 -> 1.4) , xorg-app-mkfontscale.spec (1.3 -> 1.4) , xorg-app-oclock.spec (1.3 -> 1.4) , xorg-app-pclcomp.spec (1.3 -> 1.4) , xorg-app-proxymngr.spec (1.3 -> 1.4) , xorg-app-rgb.spec (1.3 -> 1.4) , xorg-app-rstart.spec (1.3 -> 1.4) , xorg-app-scripts.spec (1.3 -> 1.4) , xorg-app-setxkbmap.spec (1.3 -> 1.4) , xorg-app-showfont.spec (1.3 -> 1.4) , xorg-app-smproxy.spec (1.3 -> 1.4) , xorg-app-twm.spec (1.3 -> 1.4) , xorg-app-viewres.spec (1.3 -> 1.4) , xorg-app-x11perf.spec (1.3 -> 1.4) , xorg-app-xauth.spec (1.3 -> 1.4) , xorg-app-xbiff.spec (1.3 -> 1.4) , xorg-app-xcalc.spec (1.3 -> 1.4) , xorg-app-xclipboard.spec (1.3 -> 1.4) , xorg-app-xclock.spec (1.3 -> 1.4) , xorg-app-xcmsdb.spec (1.3 -> 1.4) , xorg-app-xconsole.spec (1.3 -> 1.4) , xorg-app-xcursorgen.spec (1.3 -> 1.4) , xorg-app-xdbedizzy.spec (1.3 -> 1.4) , xorg-app-xditview.spec (1.3 -> 1.4) , xorg-app-xdpyinfo.spec (1.3 -> 1.4) , xorg-app-xedit.spec (1.3 -> 1.4) , xorg-app-xev.spec (1.3 -> 1.4) , xorg-app-xeyes.spec (1.3 -> 1.4) , xorg-app-xf86dga.spec (1.3 -> 1.4) , xorg-app-xfd.spec (1.3 -> 1.4) , xorg-app-xfontsel.spec (1.3 -> 1.4) , xorg-app-xfs.spec (1.3 -> 1.4) , xorg-app-xfsinfo.spec (1.3 -> 1.4) , xorg-app-xfwp.spec (1.3 -> 1.4) , xorg-app-xgamma.spec (1.3 -> 1.4) , xorg-app-xgc.spec (1.3 -> 1.4) , xorg-app-xhost.spec (1.3 -> 1.4) , xorg-app-xkbcomp.spec (1.3 -> 1.4) , xorg-app-xkbevd.spec (1.3 -> 1.4) , xorg-app-xkbprint.spec (1.3 -> 1.4) , xorg-app-xkbutils.spec (1.3 -> 1.4) , xorg-app-xkill.spec (1.3 -> 1.4) , xorg-app-xlogo.spec (1.3 -> 1 .4) , xorg-app-xlsatoms.spec (1.3 -> 1.4) , xorg-app-xlsclients.spec (1.3 -> 1.4) , xorg-app-xlsfonts.spec (1.3 -> 1.4) , xorg-app-xmag.spec (1.3 -> 1.4) , xorg-app-xman.spec (1.3 -> 1.4) , xorg-app-xmessage.spec (1.3 -> 1.4) , xorg-app-xmh.spec (1.3 -> 1.4) , xorg-app-xmodmap.spec (1.3 -> 1.4) , xorg-app-xmore.spec (1.3 -> 1.4) , xorg-app-xphelloworld.spec (1.3 -> 1.4) , xorg-app-xplsprinters.spec (1.3 -> 1.4) , xorg-app-xpr.spec (1.3 -> 1.4) , xorg-app-xprehashprinterlist.spec (1.3 -> 1.4) , xorg-app-xprop.spec (1.3 -> 1.4) , xorg-app-xrandr.spec (1.3 -> 1.4) , xorg-app-xrdb.spec (1.3 -> 1.4) , xorg-app-xrefresh.spec (1.3 -> 1.4) , xorg-app-xset.spec (1.3 -> 1.4) , xorg-app-xsetmode.spec (1.3 -> 1.4) , xorg-app-xsetpointer.spec (1.3 -> 1.4) , xorg-app-xsetroot.spec (1.3 -> 1.4) , xorg-app-xsm.spec (1.3 -> 1.4) , xorg-app-xstdcmap.spec (1.3 -> 1.4) , xorg-app-xtrap.spec (1.3 -> 1.4) , xorg-app-xvidtune.spec (1.3 -> 1.4) , xorg-app-xvinfo.spec (1.3 -> 1.4) , xorg-app-xwd.spec (1.3 -> 1.4) , xorg-app-xwininfo.spec (1.3 -> 1.4) , xorg-app-xwud.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.3 SPECS/xorg-app-appres.spec:1.4 --- SPECS/xorg-app-appres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/appres +%attr(755,root,root) %{_bindir}/appres %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.3 SPECS/xorg-app-bdftopcf.spec:1.4 --- SPECS/xorg-app-bdftopcf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/bdftopcf +%attr(755,root,root) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.3 SPECS/xorg-app-beforelight.spec:1.4 --- SPECS/xorg-app-beforelight.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light -%attr(755,root,wheel) %{_bindir}/beforelight +%attr(755,root,root) %{_bindir}/beforelight %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.3 SPECS/xorg-app-bitmap.spec:1.4 --- SPECS/xorg-app-bitmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.3 SPECS/xorg-app-editres.spec:1.4 --- SPECS/xorg-app-editres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.3 SPECS/xorg-app-fonttosfnt.spec:1.4 --- SPECS/xorg-app-fonttosfnt.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.3 SPECS/xorg-app-fslsfonts.spec:1.4 --- SPECS/xorg-app-fslsfonts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.3 SPECS/xorg-app-fstobdf.spec:1.4 --- SPECS/xorg-app-fstobdf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.3 SPECS/xorg-app-iceauth.spec:1.4 --- SPECS/xorg-app-iceauth.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.3 SPECS/xorg-app-ico.spec:1.4 --- SPECS/xorg-app-ico.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.3 SPECS/xorg-app-lbxproxy.spec:1.4 --- SPECS/xorg-app-lbxproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 22:04:01 2005 @@ -54,7 +54,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.3 SPECS/xorg-app-listres.spec:1.4 --- SPECS/xorg-app-listres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.3 SPECS/xorg-app-luit.spec:1.4 --- SPECS/xorg-app-luit.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.3 SPECS/xorg-app-mkfontdir.spec:1.4 --- SPECS/xorg-app-mkfontdir.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 22:04:01 2005 @@ -44,7 +44,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.3 SPECS/xorg-app-mkfontscale.spec:1.4 --- SPECS/xorg-app-mkfontscale.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.3 SPECS/xorg-app-oclock.spec:1.4 --- SPECS/xorg-app-oclock.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.3 SPECS/xorg-app-pclcomp.spec:1.4 --- SPECS/xorg-app-pclcomp.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.3 SPECS/xorg-app-proxymngr.spec:1.4 --- SPECS/xorg-app-proxymngr.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/proxymngr/pmconfig %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.3 SPECS/xorg-app-rgb.spec:1.4 --- SPECS/xorg-app-rgb.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/rgb.txt %{_mandir}/man1/*.1* @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.3 SPECS/xorg-app-rstart.spec:1.4 --- SPECS/xorg-app-rstart.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 22:04:01 2005 @@ -47,9 +47,9 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/rstart/config -%attr(755,root,wheel) %{_libdir}/X11/rstart/rstartd.real +%attr(755,root,root) %{_libdir}/X11/rstart/rstartd.real %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.3 SPECS/xorg-app-scripts.spec:1.4 --- SPECS/xorg-app-scripts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.3 SPECS/xorg-app-setxkbmap.spec:1.4 --- SPECS/xorg-app-setxkbmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.3 SPECS/xorg-app-showfont.spec:1.4 --- SPECS/xorg-app-showfont.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.3 SPECS/xorg-app-smproxy.spec:1.4 --- SPECS/xorg-app-smproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.3 SPECS/xorg-app-twm.spec:1.4 --- SPECS/xorg-app-twm.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 22:04:57 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vera.spec - cosmetics, added %doc In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics, added %doc ---- Files affected: SPECS: vera.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/vera.spec diff -u SPECS/vera.spec:1.7 SPECS/vera.spec:1.8 --- SPECS/vera.spec:1.7 Fri Jul 11 14:28:24 2003 +++ SPECS/vera.spec Sat Aug 27 22:04:52 2005 @@ -9,8 +9,8 @@ Source0: ftp://ftp.gnu.org/gnu/vera/%{name}-%{version}.tar.gz # Source0-md5: ed6120dd9739c71580a92868a34776b0 Patch0: %{name}-direntry.patch -BuildRequires: texinfo URL: http://www.sacredchao.net/software/reed/ +BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -29,6 +29,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_infodir} + install vera.info* $RPM_BUILD_ROOT%{_infodir} %clean @@ -42,6 +43,7 @@ %files %defattr(644,root,root,755) +%doc README %{_infodir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -50,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:04:52 darekr +- cosmetics, added %doc + Revision 1.7 2003/07/11 12:28:24 ankry - URL fixes and other cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vera.spec?r1=1.7&r2=1.8&f=u From darekr at pld-linux.org Sat Aug 27 22:16:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vdkbuilder.spec - added -devel subpackage In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:16:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -devel subpackage ---- Files affected: SPECS: vdkbuilder.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.13 SPECS/vdkbuilder.spec:1.14 --- SPECS/vdkbuilder.spec:1.13 Sun Oct 31 15:59:29 2004 +++ SPECS/vdkbuilder.spec Sat Aug 27 22:16:00 2005 @@ -28,6 +28,18 @@ VDKBuilder jest narz?dziem RAD bazuj?cym na VDK, bibliotece wrapuj?cej znan? bibliotek? widget?w - GTK+. +%package devel +Summary: Header files for vdkbuilder +Summary(pl): Pliki nag??wkowe bibliotek vdkbuilder +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +vdkbuilder header files. + +%description devel -l pl +Pliki nag??wkowe blibliotek vdkbuilder. + %prep %setup -q @@ -58,18 +70,24 @@ %doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* -%{_libdir}/lib*.la -%{_includedir}/vdkb2 %{_mandir}/man1/* %{_pixmapsdir}/*.png %{_datadir}/vdkb2 +%files devel +%defattr(644,root,root,755) +%{_libdir}/lib*.la +%{_includedir}/vdkb2 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:16:00 darekr +- added -devel subpackage + Revision 1.13 2004/10/31 14:59:29 paladine - spaces->tabs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.13&r2=1.14&f=u From darekr at pld-linux.org Sat Aug 27 22:17:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: vdk.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:17:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vdk.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.22 SPECS/vdk.spec:1.23 --- SPECS/vdk.spec:1.22 Sat Nov 27 19:52:09 2004 +++ SPECS/vdk.spec Sat Aug 27 22:17:16 2005 @@ -37,7 +37,7 @@ Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: gtk+2-devel >= 2.0.0 %description devel @@ -50,7 +50,7 @@ Summary: VDK static libraries Summary(pl): Biblioteki statyczne VDK Group: X11/Development/Libraries -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{version}-%{release} %description static VDK static libraries. @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:17:16 darekr +- strict deps + Revision 1.22 2004/11/27 18:52:09 saq - massive attack: add missing gtk+2-devel epoch in BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sat Aug 27 22:23:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES: xchm-pl.po-update.patch (NEW) - pl.po update In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:23:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - pl.po update ---- Files affected: SOURCES: xchm-pl.po-update.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchm-pl.po-update.patch diff -u /dev/null SOURCES/xchm-pl.po-update.patch:1.1 --- /dev/null Sat Aug 27 22:23:50 2005 +++ SOURCES/xchm-pl.po-update.patch Sat Aug 27 22:23:45 2005 @@ -0,0 +1,32 @@ +--- xchm-1.1/po/pl.po.orig 2005-08-26 22:39:37.000000000 +0200 ++++ xchm-1.1/po/pl.po 2005-08-27 20:55:48.746583032 +0200 +@@ -1,15 +1,15 @@ + # Polish translation for xchm. + # This file is distributed under the same license as the xchm package. +-# Jakub Bogusz , 2004. ++# Jakub Bogusz , 2004-2005. + # + # vi:encoding=utf-8 + # + msgid "" + msgstr "" +-"Project-Id-Version: xchm 0.9\n" ++"Project-Id-Version: xchm 1.1\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-08-26 23:39+0300\n" +-"PO-Revision-Date: 2004-03-01 22:50+0100\n" ++"PO-Revision-Date: 2005-08-27 20:52+0200\n" + "Last-Translator: Jakub Bogusz \n" + "Language-Team: Polish \n" + "MIME-Version: 1.0\n" +@@ -241,9 +241,8 @@ + msgstr "W &ty??" + + #: src/chmhtmlwindow.cpp:43 +-#, fuzzy + msgid "Copy &link location" +-msgstr "&Kopiuj zaznaczenie" ++msgstr "Kopiuj po??o??enie &odno??nika" + + #: src/chmhtmlwindow.cpp:46 + msgid "&Copy selection" ================================================================ From qboosh at pld-linux.org Sat Aug 27 22:24:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xchm.spec - added pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added pl.po-update patch ---- Files affected: SPECS: xchm.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.37 SPECS/xchm.spec:1.38 --- SPECS/xchm.spec:1.37 Sat Aug 27 16:25:23 2005 +++ SPECS/xchm.spec Sat Aug 27 22:24:44 2005 @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz # Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop +Patch0: %{name}-pl.po-update.patch URL: http://xchm.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -27,6 +28,9 @@ %prep %setup -q +%patch0 -p1 + +rm -f po/stamp-po %build %{__gettextize} @@ -67,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:24:44 qboosh +- added pl.po-update patch + Revision 1.37 2005/08/27 14:25:23 paladine - updated to 1.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.37&r2=1.38&f=u From arekm at pld-linux.org Sat Aug 27 22:28:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: dspam.spec - add verbose bcond In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 20:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add verbose bcond ---- Files affected: SPECS: dspam.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/dspam.spec diff -u SPECS/dspam.spec:1.37 SPECS/dspam.spec:1.38 --- SPECS/dspam.spec:1.37 Wed Aug 10 15:48:34 2005 +++ SPECS/dspam.spec Sat Aug 27 22:28:06 2005 @@ -18,6 +18,7 @@ %bcond_with pgsql # enable PostgreSQL storage driver (disable sqlite/mysql driver) %bcond_with sqlite # enable SQLite3 storage driver %bcond_with daemon +%bcond_with verbose %if %{with mysql} && %{with pgsql} %undefine with_pgsql @@ -178,6 +179,7 @@ %{__autoconf} %{__automake} %configure \ + %{?with_verbose: --enable-debug --enable-verbose-debug} \ --enable-trusted-user-security \ --enable-bayesian-dobly \ --enable-chained-tokens \ @@ -368,6 +370,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:28:06 arekm +- add verbose bcond + Revision 1.37 2005/08/10 13:48:34 glen - make it possible to have all db backend bconds on at same time (for future) - fixes to make vim syntax work properly ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.37&r2=1.38&f=u From qboosh at pld-linux.org Sat Aug 27 22:41:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES: man-man2html.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:41:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: man-man2html.patch (1.8 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: Sman-0.96.tar.gz Message-ID: <17354.1125175619@distfiles.pld-linux.org> Files fetched: 1 STORED: http://joshr.com/src/sman/Sman-0.96.tar.gz fe3bf53899b35dd7b0e736ea290d4641 Sman-0.96.tar.gz Size: 27053 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: Sman.spec - up to 0.96 In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:46:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.96 ---- Files affected: SPECS: Sman.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.2 SPECS/Sman.spec:1.3 --- SPECS/Sman.spec:1.2 Wed Aug 24 19:50:07 2005 +++ SPECS/Sman.spec Sat Aug 27 22:46:54 2005 @@ -7,13 +7,13 @@ Summary: Searcher for Man pages Summary(pl): Wyszukiwarka stron Man Name: Sman -Version: 0.95 +Version: 0.96 Release: 0.1 # "same as perl" License: Artistic Group: Development/Languages/Perl Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz -# Source0-md5: b786338eba068a4a110bf2bbda51e695 +# Source0-md5: fe3bf53899b35dd7b0e736ea290d4641 URL: http://joshr.com/src/sman/ BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib @@ -121,6 +121,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:46:54 twittner +- up to 0.96 + Revision 1.2 2005/08/24 17:50:07 qboosh - pl, missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 22:47:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: serialmail.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:47:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: serialmail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/serialmail.spec diff -u SPECS/serialmail.spec:1.22 SPECS/serialmail.spec:1.23 --- SPECS/serialmail.spec:1.22 Sat Jul 23 17:58:55 2005 +++ SPECS/serialmail.spec Sat Aug 27 22:47:52 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # TODO # - check license -Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities. -Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty. +Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities +Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty Name: serialmail Version: 0.75 Release: 1 @@ -16,13 +16,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -serialmail is a collection of tools for passing mail across serial links. It -works with qmail: you use qmail to deliver messages to a maildir, and then -serialmail to deliver messages out of the maildir. +serialmail is a collection of tools for passing mail across serial +links. It works with qmail: you use qmail to deliver messages to a +maildir, and then serialmail to deliver messages out of the maildir. serialmail supports SMTP, including ESMTP PIPELINING, and QMTP. -#description -l pl +%description -l pl +serialmail to zestaw narz?dzi do przekazywania poczty po ??czach +szeregowych. Dzia?a z qmailem - qmaila u?ywa si? do dostarczania +wiadomo?ci do maildir?w, a nast?pnie serialmaila do dostarczania +wiadomo?ci z maildir?w. %prep %setup -q @@ -61,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:47:52 qboosh +- pl desc + Revision 1.22 2005/07/23 15:58:55 glen - more appropriate license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/serialmail.spec?r1=1.22&r2=1.23&f=u From twittner at pld-linux.org Sat Aug 27 22:50:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: Sman.spec - added _noautoreq 'perl(Sman::IndexVersion)' In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq 'perl(Sman::IndexVersion)' ---- Files affected: SPECS: Sman.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.3 SPECS/Sman.spec:1.4 --- SPECS/Sman.spec:1.3 Sat Aug 27 22:46:54 2005 +++ SPECS/Sman.spec Sat Aug 27 22:50:23 2005 @@ -24,6 +24,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'perl(Sman::IndexVersion)' + %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:50:23 twittner +- added _noautoreq 'perl(Sman::IndexVersion)' + Revision 1.3 2005/08/27 20:46:54 twittner - up to 0.96 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 22:50:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: ayam.spec - removed unused prefix define, some cleanups In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:50:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed unused prefix define, some cleanups ---- Files affected: SPECS: ayam.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/ayam.spec diff -u SPECS/ayam.spec:1.7 SPECS/ayam.spec:1.8 --- SPECS/ayam.spec:1.7 Thu Jul 21 12:57:24 2005 +++ SPECS/ayam.spec Sat Aug 27 22:50:22 2005 @@ -16,8 +16,6 @@ BuildRequires: tk-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define prefix /usr - %description Ayam is a free (as in free speech, BSD-licensed) 3D modelling environment for the RenderMan interface. Free means that neither the @@ -75,13 +73,12 @@ %build mv src/affine/src/write.c src/affine/src/write.cpp -# TODO: optflags %{__make} -C src -f Makefile.shared clean +# TODO: optflags %{__make} -C src -f Makefile.shared %install rm -rf $RPM_BUILD_ROOT -# create directories if necessary install -d $RPM_BUILD_ROOT %{__make} -C src -f Makefile.shared install \ @@ -93,16 +90,9 @@ %files %defattr(644,root,root,755) %doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO - -# if _sysconfdir != /etc: -#%%dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/* - %attr(755,root,root) %{_bindir}/* - %{_datadir}/%{name} - -# initscript and its config %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} @@ -112,6 +102,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:50:22 qboosh +- removed unused prefix define, some cleanups + Revision 1.7 2005/07/21 10:57:24 cieciwa - removed precompilant and building oncagain. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ayam.spec?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sat Aug 27 22:57:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: syslogger.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:57:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: syslogger.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/syslogger.spec diff -u SPECS/syslogger.spec:1.4 SPECS/syslogger.spec:1.5 --- SPECS/syslogger.spec:1.4 Wed May 28 15:02:09 2003 +++ SPECS/syslogger.spec Sat Aug 27 22:56:58 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -Summary: copy lines from stdin to syslog -Summary(pl): kopiowanie linii ze standardowego wej?cia do sysloga +# TODO: optflags +Summary: Copy lines from stdin to syslog +Summary(pl): Kopiowanie linii ze standardowego wej?cia do sysloga Name: syslogger Version: 1.03 Release: 1 @@ -13,7 +14,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Syslogger copies lines from the standard input, and logs them to syslog. +Syslogger copies lines from the standard input, and logs them to +syslog. %description -l pl Syslogger kopiuje linie ze standardowego wej?cia i zapisuje je do @@ -30,7 +32,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8} - install %{name} $RPM_BUILD_ROOT%{_bindir} install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -48,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 20:56:58 qboosh +- cosmetics + Revision 1.4 2003/05/28 13:02:09 malekith - massive attack: source-md5 @@ -60,4 +64,3 @@ Revision 1.1 2003/03/03 09:19:50 zagrodzki - initial revision - STBR - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslogger.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:01:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: OilWar.spec - cleanup/cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:01:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanup/cosmetics ---- Files affected: SPECS: OilWar.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/OilWar.spec diff -u SPECS/OilWar.spec:1.11 SPECS/OilWar.spec:1.12 --- SPECS/OilWar.spec:1.11 Mon Aug 18 10:07:52 2003 +++ SPECS/OilWar.spec Sat Aug 27 23:01:41 2005 @@ -12,10 +12,10 @@ Source2: %{name}.desktop Patch0: %{name}-am_remove_install-data-local.patch URL: http://www.2ndpoint.fi/projektit/oilwar.html -BuildRequires: autoconf -BuildRequires: automake BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel +BuildRequires: autoconf +BuildRequires: automake BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -25,17 +25,16 @@ the mother land... %description -l pl -OilWar jest prost? gr? w kt?rej strzelasz do ?o?nierzy i czo?g?w -nieprzyjaciela za pomoc? myszki. Armia wroga atakuje twoje terytorium -i stara si? ukra?? zasoby oleju. Twoja misja: zniszczy? naje?d?c?w, -chroni? olej, chroni? ojczyzn?... +OilWar jest prost? gr? w kt?rej strzela si? do ?o?nierzy i czo?g?w +nieprzyjaciela za pomoc? myszki. Armia wroga atakuje terytorium gracza +i stara si? ukra?? zasoby oleju. Misja: zniszczy? naje?d?c?w, chroni? +olej, chroni? ojczyzn?... %prep -%setup -q +%setup -q %patch0 -p1 %build -rm -f missing %{__aclocal} %{__autoconf} %{__automake} @@ -69,7 +68,11 @@ %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org + $Log$ +Revision 1.12 2005/08/27 21:01:41 qboosh +- cleanup/cosmetics + Revision 1.11 2003/08/18 08:07:52 gotar - mass commit: cosmetics (removed trailing white spaces) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/OilWar.spec?r1=1.11&r2=1.12&f=u From paladine at pld-linux.org Sat Aug 27 23:02:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: dbus.spec - updated to 0.36.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:02:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36.1 ---- Files affected: SPECS: dbus.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.93 SPECS/dbus.spec:1.94 --- SPECS/dbus.spec:1.93 Wed Aug 24 17:08:15 2005 +++ SPECS/dbus.spec Sat Aug 27 23:02:32 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.36 +Version: 0.36.1 Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: c969d0a11599e5950fb28eeed8b353ba +# Source0-md5: 48bcfc0806bb7bc914cc5cd2f7d40d69 Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -545,6 +545,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/27 21:02:32 paladine +- updated to 0.36.1 + Revision 1.93 2005/08/24 15:08:15 paladine - updated to 0.36 - removed python_types patch (already in sources) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.93&r2=1.94&f=u From paladine at pld-linux.org Sat Aug 27 23:02:44 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: dbus-0.36.1.tar.gz Message-ID: <7426.1125176564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.1.tar.gz 48bcfc0806bb7bc914cc5cd2f7d40d69 dbus-0.36.1.tar.gz Size: 1596804 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 23:11:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: capi4k-utils.spec - 2005.07.18 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 21:11:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005.07.18 ---- Files affected: SPECS: capi4k-utils.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/capi4k-utils.spec diff -u SPECS/capi4k-utils.spec:1.12 SPECS/capi4k-utils.spec:1.13 --- SPECS/capi4k-utils.spec:1.12 Sun May 22 01:43:23 2005 +++ SPECS/capi4k-utils.spec Sat Aug 27 23:11:40 2005 @@ -6,14 +6,14 @@ Summary(de): CAPI 2.0 Werkzeuge f?r verschiedene ISDN Karten Summary(pl): Biblioteki i narz?dzia konfiguracyjne CAPI 2.0 Name: capi4k-utils -Version: 2004.10.06 -Release: 3 +Version: 2005.07.18 +Release: 1 License: GPL Group: Applications/Communications -Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2004-10-06.tar.gz -# Source0-md5: 54992ff362ca44629fdf59773a6864cd +Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2005-07-18.tar.gz +# Source0-md5: c745759b6b3d64e19763727176648cdf Source1: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES -# Source1-md5: 054b9f2bf1b0c0fc1eb5010ca0c9380d +# Source1-md5: 03739a0170eba14f03f7dc7ccc58bba8 Source10: capi.conf Source11: capi.init Patch0: %{name}-make.patch @@ -259,6 +259,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 21:11:40 areq +- 2005.07.18 + Revision 1.12 2005/05/21 23:43:23 averne - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/capi4k-utils.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sat Aug 27 23:12:01 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: capi4k-utils-2005-07-18.tar.gz CHANGES Message-ID: <20352.1125177121@distfiles.pld-linux.org> Files fetched: 2 STORED: ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz c745759b6b3d64e19763727176648cdf capi4k-utils-2005-07-18.tar.gz Size: 862826 bytes STORED: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES 03739a0170eba14f03f7dc7ccc58bba8 CHANGES Size: 10191 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 23:15:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: xorg-lib-libXvMC.spec - it contains libXvMCW as well - obso... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:15:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - it contains libXvMCW as well - obsolete standalone version ---- Files affected: SPECS: xorg-lib-libXvMC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXvMC.spec diff -u SPECS/xorg-lib-libXvMC.spec:1.4 SPECS/xorg-lib-libXvMC.spec:1.5 --- SPECS/xorg-lib-libXvMC.spec:1.4 Sat Aug 27 21:38:03 2005 +++ SPECS/xorg-lib-libXvMC.spec Sat Aug 27 23:15:17 2005 @@ -17,6 +17,8 @@ BuildRequires: xorg-lib-libXv-devel BuildRequires: xorg-proto-videoproto-devel BuildRequires: xorg-util-util-macros +Provides: libXvMCW = %{version} +Obsoletes: libXvMCW BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,6 +33,8 @@ Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXv-devel +Provides: libXvMCW-devel = %{version} +Obsoletes: libXvMCW-devel %description devel XvMC library. @@ -49,16 +53,18 @@ Summary(pl): Biblioteki statyczne libXvMC Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Provides: libXvMCW-static = %{version} +Obsoletes: libXvMCW-static %description static XvMC library. -This package contains the static libXvMC library. +This package contains the static libXvMC libraries. %description static -l pl Biblioteka XvMC. -Pakiet zawiera statyczn? bibliotek? libXvMC. +Pakiet zawiera statyczne biblioteki libXvMC. %prep %setup -q -n libXvMC-%{version} @@ -108,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:15:17 qboosh +- it contains libXvMCW as well - obsolete standalone version + Revision 1.4 2005/08/27 19:38:03 wiget - kill /usr/X11R6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:18:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: ndisc6.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:18:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ndisc6.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.2 SPECS/ndisc6.spec:1.3 --- SPECS/ndisc6.spec:1.2 Sat Aug 27 17:08:19 2005 +++ SPECS/ndisc6.spec Sat Aug 27 23:18:50 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -# +# TODO: optflags Summary: Neighbor Discovery tools for IPv6 +Summary(pl): Narz?dzia do rozpoznawania s?siad?w dla IPv6 Name: ndisc6 Version: 0.1.5 Release: 1 @@ -17,6 +18,14 @@ respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +%description -l pl +ndisc6 zawiera dwa ma?e narz?dzia dzia?aj?ce z linii polece? (ndisc6 i +rdisc6) wykonuj?ce odpowiednio ICMPv6 Neighbor Discovery +(rozpoznawanie s?siad?w) i ICMPv6 Router Discovery (rozpoznawanie +router?w). S? przeznaczone g??wnie do diagnostyki sieci IPv6 oraz +wykrywania bezprawnych w?z??w lub router?w IPv6 w segmencie sieci +Ethernet. + %prep %setup -q @@ -28,7 +37,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} -install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -45,9 +54,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 21:18:50 qboosh +- pl + Revision 1.2 2005/08/27 15:08:19 aredridel - adapterised Revision 1.1 2005/08/27 15:07:59 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 23:20:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: asterisk-chan_capi.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:20:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: asterisk-chan_capi.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u SPECS/asterisk-chan_capi.spec:1.1 SPECS/asterisk-chan_capi.spec:1.2 --- SPECS/asterisk-chan_capi.spec:1.1 Sat Aug 27 16:26:43 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 23:20:30 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Asterisk ISDN CAPI channel driver +Summary(pl): Sterownik kana?u CAPI ISDN dla Asteriska Name: asterisk-chan_capi Version: 0.5.4 Release: 0.1 @@ -7,7 +8,7 @@ Group: Applications Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz # Source0-md5: a7a9c0f90395909ee06528f17fc608d2 -URL: http://sourceforge.net/projects/chan-capi +URL: http://sourceforge.net/projects/chan-capi/ BuildRequires: asterisk-devel BuildRequires: capi-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -16,6 +17,10 @@ ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP Platform. +%description -l pl +Sterownik kana?u CAPI ISDN (chan_capi) dla Asteriska - platformy VOIP +o otwartych ?r?d?ach. + %prep %setup -q -n chan_capi-%{version} @@ -45,7 +50,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 21:20:30 qboosh +- pl + Revision 1.1 2005/08/27 14:26:43 areq - init PLD spec - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asterisk-chan_capi.spec?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Sat Aug 27 23:25:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES: hal-pld_policy.patch In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:25:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: ---- Files affected: SOURCES: hal-pld_policy.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.1 SOURCES/hal-pld_policy.patch:1.2 --- SOURCES/hal-pld_policy.patch:1.1 Sun Aug 7 21:53:42 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:25:53 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sat Aug 27 23:28:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: SPE.spec - up to 0.7.5.c (new working url for Source0) - SP... In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:28:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.5.c (new working url for Source0) - SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} - added desktop and icon files ---- Files affected: SPECS: SPE.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.15 SPECS/SPE.spec:1.16 --- SPECS/SPE.spec:1.15 Thu Jun 2 20:14:45 2005 +++ SPECS/SPE.spec Sat Aug 27 23:28:16 2005 @@ -1,24 +1,24 @@ # $Revision$, $Date$ # TODO: # - fix %%files (doc to %%doc, no .py, remove unused files) - -%define _wx 2.5.4.1 +%define _wx 2.6.1.0 %define _bl 2.35 Summary: SPE - Stani's Python Editor Summary(pl): SPE - pythonowy edytor Staniego Name: SPE -Version: 0.7.3.a +Version: 0.7.5.c Release: 0.1 License: LGPL 2.1+ (except sm library and sm_idle ) Group: Applications/Text -Source0: http://projects.blender.org/frs/download.php/271/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.zip -# Source0-md5: 52b1d02f179bab7a71b57f5698343230 +Source0: http://download.berlios.de/python/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.tar.gz +# Source0-md5: c40a24a3ed79ebba8c4fb208c000f67c +Source1: %{name}.desktop +Source2: %{name}.png URL: http://spe.pycs.net/ BuildRequires: python BuildRequires: python-devel BuildRequires: python-modules -BuildRequires: unzip %pyrequires_eq python-modules Requires: python-wxPython >= %{_wx} BuildArch: noarch @@ -52,12 +52,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} python setup.py install \ --optimize=2 \ --root=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.py' -exec rm "{}" ";" +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} + +# SPE doesn't work without *.py files so don't remove them +#%%py_postclean %clean rm -rf $RPM_BUILD_ROOT @@ -67,6 +72,8 @@ %doc README.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/* +%{_desktopdir}/* +%{_pixmapsdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -74,6 +81,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/27 21:28:16 twittner +- up to 0.7.5.c (new working url for Source0) +- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- added desktop and icon files + Revision 1.15 2005/06/02 18:14:45 glen - findutils already required by rpm-build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.15&r2=1.16&f=u From twittner at pld-linux.org Sat Aug 27 23:28:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Message-ID: <10385.1125178130@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/python/SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz c40a24a3ed79ebba8c4fb208c000f67c SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Size: 2917691 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:29:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES: hal-pld_policy.patch - reverted last commit In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:29:00 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SOURCES: hal-pld_policy.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.2 SOURCES/hal-pld_policy.patch:1.3 --- SOURCES/hal-pld_policy.patch:1.2 Sat Aug 27 23:25:53 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:28:55 2005 @@ -1,6 +1,6 @@ -diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 -+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 +diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 ++++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 @@ -6,11 +6,11 @@ @@ -17,60 +17,7 @@ true -@@ -44,6 +44,19 @@ - - - -+ -+ -+ true -+ true -+ -+ -+ -+ true -+ -+ -+ true -+ -+ - - - -@@ -51,25 +64,25 @@ - auto - cdrom - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - - -@@ -96,6 +109,9 @@ +@@ -96,6 +96,9 @@ @@ -80,18 +27,3 @@ true -@@ -195,5 +211,14 @@ - hald-addon-storage - - -+ -+ -+ -+ -+ -+ true -+ -+ -+ - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Sat Aug 27 23:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: SOURCES: hal-pld_policy.patch - some fixes from other distros In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:30:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - some fixes from other distros ---- Files affected: SOURCES: hal-pld_policy.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.3 SOURCES/hal-pld_policy.patch:1.4 --- SOURCES/hal-pld_policy.patch:1.3 Sat Aug 27 23:28:55 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:30:40 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.3&r2=1.4&f=u From paladine at pld-linux.org Sat Aug 27 23:31:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: DISTFILES: hal-0.5.4.tar.gz Message-ID: <14060.1125178265@distfiles.pld-linux.org> Files fetched: 1 STORED: http://freedesktop.org/~david/dist/hal-0.5.4.tar.gz 2f84ddbc22bc35baa9388e7794d1fa31 hal-0.5.4.tar.gz Size: 1476396 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:31:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: hal.spec - merged from DEVEL and updated to final 0.5.4 - c... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:31:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to final 0.5.4 - changed and uncommented pld_policy patch - sorted %%configure options - dropped fstab-sync support again (back to pmount) ---- Files affected: SPECS: hal.spec (1.82 -> 1.83) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.82 SPECS/hal.spec:1.83 --- SPECS/hal.spec:1.82 Wed Aug 24 13:02:29 2005 +++ SPECS/hal.spec Sat Aug 27 23:30:56 2005 @@ -1,17 +1,18 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without docs # disable documentation building +%bcond_without docs # disable documentation building +%bcond_with fstab_sync # build with fstab-sync # Summary: HAL - Hardware Abstraction Layer Summary(pl): HAL - abstrakcyjna warstwa dost?pu do sprz?tu Name: hal -Version: 0.5.3 -Release: 3 +Version: 0.5.4 +Release: 0.1 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz -# Source0-md5: bc4005ef21c7c8bfe3444cf0f3fa6d68 +# Source0-md5: 2f84ddbc22bc35baa9388e7794d1fa31 Source1: %{name}daemon.init Source2: %{name}d.sysconfig Source3: %{name}-device-manager.desktop @@ -100,8 +101,8 @@ Summary(pl): Zarz?dca urz?dze? HALa dla GNOME Group: X11/Applications Requires: python-gnome-ui -Requires: python-pygtk-glade Requires: python-gnome-vfs +Requires: python-pygtk-glade Requires: %{name} = %{version}-%{release} %description device-manager @@ -114,9 +115,11 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 %build +%{__glib_gettextize} +%{__intltoolize} %{__libtoolize} %{__aclocal} %{__autoheader} @@ -124,19 +127,21 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ + %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ - --with-hwdata=%{_sysconfdir} \ - --enable-fstab-sync \ --enable-verbose-mode \ + --with-hwdata=%{_sysconfdir} \ --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ - $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir},/var/run/hald} \ + $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir}} \ $RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe} %{__make} install \ @@ -182,13 +187,10 @@ %attr(755,root,root) %{_bindir}/hal-set-property %attr(755,root,root) %{_bindir}/lshal %attr(755,root,root) %{_libdir}/hald-* -%{_mandir}/man8/fstab-sync.8* %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/%{name} - %{_sysconfdir}/%{name}/fdi %{_sysconfdir}/hotplug.d/default/* - %attr(754,root,root) /etc/rc.d/init.d/* %attr(755,root,root) %{_libdir}/hal.hotplug %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald @@ -196,7 +198,8 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/fdi -%dir /var/run/hald +%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*} +%{_examplesdir}/%{name}-%{version} %files libs %defattr(644,root,root,755) @@ -231,6 +234,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83 2005/08/27 21:30:56 paladine +- merged from DEVEL and updated to final 0.5.4 +- changed and uncommented pld_policy patch +- sorted %%configure options +- dropped fstab-sync support again (back to pmount) + Revision 1.82 2005/08/24 11:02:29 paladine - changed pid file - commentedout pld_policy patch @@ -255,6 +264,19 @@ - dropped fstab-sync support (we got pmount now), fixed %%files, added missing hal.hotplug symlink (yeah, it works now like a charm), cleanup, dropped mount-options patch (not needed anymore), rel.1 + +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + +Revision 1.75.2.3 2005/08/03 17:29:36 wiget +- don't duplicate %{_datadir}/%{name}/device-manger + +Revision 1.75.2.2 2005/08/03 10:26:38 freetz +- cosmetics + +Revision 1.75.2.1 2005/08/02 22:08:47 freetz +- for brave ones: 0.5.4 20050801 snap, fstab-sync bconded (we don't need it + anymore - obsoleted by pmount), more pldize macros Revision 1.75 2005/08/02 15:54:12 saq - reqs from NEWS ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.82&r2=1.83&f=u From twittner at pld-linux.org Sat Aug 27 23:43:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:14 2005 Subject: SPECS: FHS.spec, SPE.spec - fixed typos in my commitlogs In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:43:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed typos in my commitlogs ---- Files affected: SPECS: FHS.spec (1.103 -> 1.104) , SPE.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/FHS.spec diff -u SPECS/FHS.spec:1.103 SPECS/FHS.spec:1.104 --- SPECS/FHS.spec:1.103 Thu Jun 30 22:15:26 2005 +++ SPECS/FHS.spec Sat Aug 27 23:43:22 2005 @@ -234,11 +234,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.103 2005/06/30 20:15:26 twittner - changed location for cgi programs: %%{_libdir}/cgi-bin -> %%{_prefix}/lib/cgi-bin . There's no need to have two different directories on - diffrent archs (/usr/lib vs. /usr/lib64 issue) - one + different archs (/usr/lib vs. /usr/lib64 issue) - one /usr/lib/cgi-bin is sufficient and good for all archs. - rel. 12 ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.16 SPECS/SPE.spec:1.17 --- SPECS/SPE.spec:1.16 Sat Aug 27 23:28:16 2005 +++ SPECS/SPE.spec Sat Aug 27 23:43:22 2005 @@ -81,9 +81,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.16 2005/08/27 21:28:16 twittner - up to 0.7.5.c (new working url for Source0) -- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- SPE doesn't work without *.py files - don't remove them from %%{py_sitescriptdir} - added desktop and icon files Revision 1.15 2005/06/02 18:14:45 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/FHS.spec?r1=1.103&r2=1.104&f=u http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Sat Aug 27 23:46:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: qboosh Date: Sat Aug 27 21:46:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: xorg-app-appres.spec (1.4 -> 1.5) , xorg-app-bdftopcf.spec (1.4 -> 1.5) , xorg-app-beforelight.spec (1.4 -> 1.5) , xorg-app-bitmap.spec (1.4 -> 1.5) , xorg-app-editres.spec (1.4 -> 1.5) , xorg-app-fonttosfnt.spec (1.4 -> 1.5) , xorg-app-fslsfonts.spec (1.4 -> 1.5) , xorg-app-fstobdf.spec (1.4 -> 1.5) , xorg-app-iceauth.spec (1.4 -> 1.5) , xorg-app-ico.spec (1.4 -> 1.5) , xorg-app-lbxproxy.spec (1.4 -> 1.5) , xorg-app-listres.spec (1.4 -> 1.5) , xorg-app-luit.spec (1.4 -> 1.5) , xorg-app-mkfontdir.spec (1.4 -> 1.5) , xorg-app-mkfontscale.spec (1.4 -> 1.5) , xorg-app-oclock.spec (1.4 -> 1.5) , xorg-app-pclcomp.spec (1.4 -> 1.5) , xorg-app-proxymngr.spec (1.4 -> 1.5) , xorg-app-rgb.spec (1.4 -> 1.5) , xorg-app-rstart.spec (1.4 -> 1.5) , xorg-app-scripts.spec (1.4 -> 1.5) , xorg-app-setxkbmap.spec (1.4 -> 1.5) , xorg-app-showfont.spec (1.4 -> 1.5) , xorg-app-smproxy.spec (1.4 -> 1.5) , xorg-app-twm.spec (1.4 -> 1.5) , xorg-app-viewres.spec (1.4 -> 1.5) , xorg-app-x11perf.spec (1.4 -> 1.5) , xorg-app-xauth.spec (1.4 -> 1.5) , xorg-app-xbiff.spec (1.4 -> 1.5) , xorg-app-xcalc.spec (1.4 -> 1.5) , xorg-app-xclipboard.spec (1.4 -> 1.5) , xorg-app-xclock.spec (1.4 -> 1.5) , xorg-app-xcmsdb.spec (1.4 -> 1.5) , xorg-app-xconsole.spec (1.4 -> 1.5) , xorg-app-xcursorgen.spec (1.4 -> 1.5) , xorg-app-xdbedizzy.spec (1.4 -> 1.5) , xorg-app-xditview.spec (1.4 -> 1.5) , xorg-app-xdpyinfo.spec (1.4 -> 1.5) , xorg-app-xedit.spec (1.4 -> 1.5) , xorg-app-xev.spec (1.4 -> 1.5) , xorg-app-xeyes.spec (1.4 -> 1.5) , xorg-app-xf86dga.spec (1.4 -> 1.5) , xorg-app-xfd.spec (1.4 -> 1.5) , xorg-app-xfontsel.spec (1.4 -> 1.5) , xorg-app-xfsinfo.spec (1.4 -> 1.5) , xorg-app-xfs.spec (1.4 -> 1.5) , xorg-app-xfwp.spec (1.4 -> 1.5) , xorg-app-xgamma.spec (1.4 -> 1.5) , xorg-app-xgc.spec (1.4 -> 1.5) , xorg-app-xhost.spec (1.4 -> 1.5) , xorg-app-xkbcomp.spec (1.4 -> 1.5) , xorg-app-xkbevd.spec (1.4 -> 1.5) , xorg-app-xkbprint.spec (1.4 -> 1.5) , xorg-app-xkbutils.spec (1.4 -> 1.5) , xorg-app-xkill.spec (1.4 -> 1.5) , xorg-app-xlogo.spec (1.4 -> 1 .5) , xorg-app-xlsatoms.spec (1.4 -> 1.5) , xorg-app-xlsclients.spec (1.4 -> 1.5) , xorg-app-xlsfonts.spec (1.4 -> 1.5) , xorg-app-xmag.spec (1.4 -> 1.5) , xorg-app-xman.spec (1.4 -> 1.5) , xorg-app-xmessage.spec (1.4 -> 1.5) , xorg-app-xmh.spec (1.4 -> 1.5) , xorg-app-xmodmap.spec (1.4 -> 1.5) , xorg-app-xmore.spec (1.4 -> 1.5) , xorg-app-xphelloworld.spec (1.4 -> 1.5) , xorg-app-xplsprinters.spec (1.4 -> 1.5) , xorg-app-xprehashprinterlist.spec (1.4 -> 1.5) , xorg-app-xprop.spec (1.4 -> 1.5) , xorg-app-xpr.spec (1.4 -> 1.5) , xorg-app-xrandr.spec (1.4 -> 1.5) , xorg-app-xrdb.spec (1.4 -> 1.5) , xorg-app-xrefresh.spec (1.4 -> 1.5) , xorg-app-xsetmode.spec (1.4 -> 1.5) , xorg-app-xsetpointer.spec (1.4 -> 1.5) , xorg-app-xsetroot.spec (1.4 -> 1.5) , xorg-app-xset.spec (1.4 -> 1.5) , xorg-app-xsm.spec (1.4 -> 1.5) , xorg-app-xstdcmap.spec (1.4 -> 1.5) , xorg-app-xtrap.spec (1.4 -> 1.5) , xorg-app-xvidtune.spec (1.4 -> 1.5) , xorg-app-xvinfo.spec (1.4 -> 1.5) , xorg-app-xwd.spec (1.4 -> 1.5) , xorg-app-xwininfo.spec (1.4 -> 1.5) , xorg-app-xwud.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.4 SPECS/xorg-app-appres.spec:1.5 --- SPECS/xorg-app-appres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 23:46:17 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.4 SPECS/xorg-app-bdftopcf.spec:1.5 --- SPECS/xorg-app-bdftopcf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 23:46:17 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.4 SPECS/xorg-app-beforelight.spec:1.5 --- SPECS/xorg-app-beforelight.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.4 SPECS/xorg-app-bitmap.spec:1.5 --- SPECS/xorg-app-bitmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.4 SPECS/xorg-app-editres.spec:1.5 --- SPECS/xorg-app-editres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.4 SPECS/xorg-app-fonttosfnt.spec:1.5 --- SPECS/xorg-app-fonttosfnt.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 23:46:17 2005 @@ -13,11 +13,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-data-xbitmaps BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.4 SPECS/xorg-app-fslsfonts.spec:1.5 --- SPECS/xorg-app-fslsfonts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.4 SPECS/xorg-app-fstobdf.spec:1.5 --- SPECS/xorg-app-fstobdf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.4 SPECS/xorg-app-iceauth.spec:1.5 --- SPECS/xorg-app-iceauth.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 23:46:18 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.4 SPECS/xorg-app-ico.spec:1.5 --- SPECS/xorg-app-ico.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.4 SPECS/xorg-app-lbxproxy.spec:1.5 --- SPECS/xorg-app-lbxproxy.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 23:46:18 2005 @@ -13,14 +13,14 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.4 SPECS/xorg-app-listres.spec:1.5 --- SPECS/xorg-app-listres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.4 SPECS/xorg-app-luit.spec:1.5 --- SPECS/xorg-app-luit.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 23:46:18 2005 @@ -13,10 +13,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.4 SPECS/xorg-app-mkfontdir.spec:1.5 --- SPECS/xorg-app-mkfontdir.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 23:46:18 2005 @@ -11,15 +11,15 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description mkfontdir application. %description -l pl -Aplikacja mkfontdir +Aplikacja mkfontdir. %prep %setup -q -n mkfontdir-%{version} @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.4 SPECS/xorg-app-mkfontscale.spec:1.5 --- SPECS/xorg-app-mkfontscale.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.4 SPECS/xorg-app-oclock.spec:1.5 --- SPECS/xorg-app-oclock.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.4 SPECS/xorg-app-pclcomp.spec:1.5 --- SPECS/xorg-app-pclcomp.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 23:46:18 2005 @@ -12,8 +12,8 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.4 SPECS/xorg-app-proxymngr.spec:1.5 --- SPECS/xorg-app-proxymngr.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 23:46:18 2005 @@ -12,11 +12,11 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.4 SPECS/xorg-app-rgb.spec:1.5 --- SPECS/xorg-app-rgb.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.4 SPECS/xorg-app-rstart.spec:1.5 --- SPECS/xorg-app-rstart.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.4 SPECS/xorg-app-scripts.spec:1.5 --- SPECS/xorg-app-scripts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.4 SPECS/xorg-app-setxkbmap.spec:1.5 --- SPECS/xorg-app-setxkbmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 23:46:18 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.4&r2=1.5&f=u From arekm at pld-linux.org Sun Aug 28 00:01:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: python-pydspam.spec (NEW) - new; unfortunately only dspam 2... In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 22:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new; unfortunately only dspam 2.x supported ---- Files affected: SPECS: python-pydspam.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u /dev/null SPECS/python-pydspam.spec:1.1 --- /dev/null Sun Aug 28 00:01:51 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:01:44 2005 @@ -0,0 +1,54 @@ +# $Revision$, $Date$ +Summary: Python interface for dspam library +Summary(pl): Interfejs Pythona do biblioteki dspam +%define module pydspam +Name: python-%{module} +Version: 1.1.9 +Release: 1 +License: GPL +Group: Libraries/Python +Source0: http://dl.sourceforge.net/pymilter/%{module}-%{version}.tar.gz +# Source0-md5: 1caff10d2fa3968ed8e0def126f74b40 +Patch0: %{name}-setup.patch +URL: http://www.bmsi.com/python/dspam.html +BuildRequires: dspam-devel +BuildRequires: python-devel >= 2.2.1 +%pyrequires_eq python-modules +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Python interface for dspam library. + +%description -l pl +Interfejs Pythona do biblioteki dspam + +%prep +%setup -q -n %{module}-%{version} +%patch0 -p1 + +%build + +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT + +python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc NEWS dspam.html +%attr(755,root,root) %{py_sitedir}/*.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 22:01:44 arekm +- new; unfortunately only dspam 2.x supported + ================================================================ From arekm at pld-linux.org Sun Aug 28 00:01:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: pydspam-1.1.9.tar.gz Message-ID: <24796.1125180116@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pymilter/pydspam-1.1.9.tar.gz 1caff10d2fa3968ed8e0def126f74b40 pydspam-1.1.9.tar.gz Size: 56996 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 00:04:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: python-pydspam.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:04:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: python-pydspam.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u SPECS/python-pydspam.spec:1.1 SPECS/python-pydspam.spec:1.2 --- SPECS/python-pydspam.spec:1.1 Sun Aug 28 00:01:44 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:04:46 2005 @@ -20,14 +20,13 @@ Python interface for dspam library. %description -l pl -Interfejs Pythona do biblioteki dspam +Interfejs Pythona do biblioteki dspam. %prep %setup -q -n %{module}-%{version} %patch0 -p1 %build - python setup.py build %install @@ -49,6 +48,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 22:04:46 qboosh +- cosmetics + Revision 1.1 2005/08/27 22:01:44 arekm - new; unfortunately only dspam 2.x supported - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pydspam.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 00:05:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: crossmingw32-binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:05:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: crossmingw32-binutils.spec (1.55 -> 1.56) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-binutils.spec diff -u SPECS/crossmingw32-binutils.spec:1.55 SPECS/crossmingw32-binutils.spec:1.56 --- SPECS/crossmingw32-binutils.spec:1.55 Mon Aug 15 02:22:31 2005 +++ SPECS/crossmingw32-binutils.spec Sun Aug 28 00:05:43 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - Mingw32 binutils Summary(tr): GNU geli?tirme ara?lar? - Mingw32 binutils Name: crossmingw32-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.56 2005/08/27 22:05:43 qboosh +- updated to 2.16.91.0.3 + Revision 1.55 2005/08/15 00:22:31 qboosh - updated to 2.16.91.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-binutils.spec?r1=1.55&r2=1.56&f=u From qboosh at pld-linux.org Sun Aug 28 00:11:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: crossmingw32-pcre.spec - updated to 6.3 (fixes CAN-2005-249... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:11:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 6.3 (fixes CAN-2005-2491) - removed obsolete cxx patch ---- Files affected: SPECS: crossmingw32-pcre.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-pcre.spec diff -u SPECS/crossmingw32-pcre.spec:1.13 SPECS/crossmingw32-pcre.spec:1.14 --- SPECS/crossmingw32-pcre.spec:1.13 Sat Aug 6 15:30:27 2005 +++ SPECS/crossmingw32-pcre.spec Sun Aug 28 00:11:23 2005 @@ -3,13 +3,12 @@ Summary: Perl-Compatible Regular Expression library - Mingw32 cross version Summary(pl): Biblioteka perlowych wyra?e? regularnych - wersja skro?na dla Mingw32 Name: crossmingw32-%{realname} -Version: 6.2 +Version: 6.3 Release: 1 License: BSD (see LICENCE) Group: Libraries Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{realname}-%{version}.tar.bz2 -# Source0-md5: d8a2024eb56c331bb5c55601c3cd9ce1 -Patch0: pcre-cxx.patch +# Source0-md5: e6779ead12cd20fa055fb3a05b004f2c URL: http://www.pcre.org/ BuildRequires: autoconf BuildRequires: automake @@ -58,7 +57,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 %build CC=%{target}-gcc ; export CC @@ -123,6 +121,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 22:11:23 qboosh +- updated to 6.3 (fixes CAN-2005-2491) +- removed obsolete cxx patch + Revision 1.13 2005/08/06 13:30:27 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-pcre.spec?r1=1.13&r2=1.14&f=u From aredridel at pld-linux.org Sun Aug 28 02:18:48 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: PTlink6.19.4.tar.gz Message-ID: <3131.1125188328@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.4.tar.gz e7c1ac8e0f6eb5486378b84d3949cc2b PTlink6.19.4.tar.gz Size: 786808 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sun Aug 28 02:18:41 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: ircd-ptlink.spec - up to 6.19.4 In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 00:18:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 6.19.4 ---- Files affected: SPECS: ircd-ptlink.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/ircd-ptlink.spec diff -u SPECS/ircd-ptlink.spec:1.13 SPECS/ircd-ptlink.spec:1.14 --- SPECS/ircd-ptlink.spec:1.13 Sun May 1 19:31:30 2005 +++ SPECS/ircd-ptlink.spec Sun Aug 28 02:18:34 2005 @@ -9,12 +9,12 @@ Summary: Internet Relay Chat Server Summary(pl): Serwer IRC Name: ircd-ptlink -Version: 6.19.3 +Version: 6.19.4 Release: 1 License: GPL v2 Group: Daemons Source0: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink%{version}.tar.gz -# Source0-md5: d46979f76e28757fedc508544dd0b5fa +# Source0-md5: e7c1ac8e0f6eb5486378b84d3949cc2b Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-config.patch @@ -64,7 +64,8 @@ %{__autoconf} CFLAGS="%{rpmcflags} %{?debug:-DDEBUGMODE}" %configure \ - %{?with_ipv6:--enable-ipv6} + %{?with_ipv6:--enable-ipv6} \ + --enable-utf-8 %{__make} \ LIBDIR=%{_libdir} @@ -117,7 +118,8 @@ %doc doc/{*.txt,*.conf,server-version-info,Tao-of-IRC.940110} doc_hybrid6/* CHANGES README %attr(755,root,root) %{_sbindir}/* %attr(770,root,ircd) %dir %{_sysconfdir} -%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ircd.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.dconf %attr(754,root,root) /etc/rc.d/init.d/ircd %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/ircd %dir %{_libdir}/ircd @@ -131,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/28 00:18:34 aredridel +- up to 6.19.4 + Revision 1.13 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ircd-ptlink.spec?r1=1.13&r2=1.14&f=u From twittner at pld-linux.org Sun Aug 28 02:25:11 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: vdkbuilder-ac_FLAGS.patch (NEW) - don't introduce own fla... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:25:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configue (for vdkbuilder-2.4.0) ---- Files affected: SOURCES: vdkbuilder-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder-ac_FLAGS.patch diff -u /dev/null SOURCES/vdkbuilder-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:25:11 2005 +++ SOURCES/vdkbuilder-ac_FLAGS.patch Sun Aug 28 02:25:06 2005 @@ -0,0 +1,37 @@ +diff -Nurb o.vdkbuilder2-2.4.0/configure.in n.vdkbuilder2-2.4.0/configure.in +--- o.vdkbuilder2-2.4.0/configure.in 2004-05-18 14:31:17.000000000 +0200 ++++ n.vdkbuilder2-2.4.0/configure.in 2005-08-28 01:40:11.341036792 +0200 +@@ -65,8 +65,6 @@ + dnl------------------- + AC_ARG_ENABLE(devel, [ --enable-devel[=yes/no] Compile VDKBuilder with all info for debug [default=no]],,enable_devel=no) + +-AC_ARG_ENABLE(opt, [ --enable-opt[=OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) +- + dnl AC_ARG_ENABLE(gnome,[ --enable-gnome=[yes/no] Enable use of gnome[default=no], not required if vdk was compiled with gnome-support], + dnl gnome=$enableval, gnome=no) + +@@ -85,22 +83,11 @@ + dnl check user options + dnl ------------------- + if test "x$enable_devel" = "xyes"; then +- cflag="-g" + AC_DEFINE(VDKBDEBUG) +-else +- cflag="-s" +-fi +- +-if test "x$enable_opt" != "xno"; then +- cflag="$cflag -O$enable_opt" +-fi +- +-if test "x$prefix" = "xNONE"; then +- prefix="/usr/local" + fi + +-CFLAGS="$cflag -I../include -Wall" +-CXXFLAGS="$cflag -I../include -Wall" ++CFLAGS="-I../include -Wall $CFLAGS" ++CXXFLAGS="-I../include -Wall $CXXFLAGS" + + dnl check vdkxdb support + if test "x$enable_vdkxdb" == "xyes"; then ================================================================ From twittner at pld-linux.org Sun Aug 28 02:26:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz Message-ID: <13583.1125188810@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz Size: 1079112 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 02:26:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: vdkbuilder.spec - up to 2.4.0 - added -ac_FLAGS.patch (don'... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:26:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdkbuilder.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.14 SPECS/vdkbuilder.spec:1.15 --- SPECS/vdkbuilder.spec:1.14 Sat Aug 27 22:16:00 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 02:26:44 2005 @@ -2,19 +2,20 @@ Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder -Version: 2.0.1 -Release: 2 +Version: 2.4.0 +Release: 0.1 License: GPL Group: Development/Tools -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: 6a004c7a8ed51a30722383eb50ee69f8 +Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz +# Source0-md5: 91216ce6659e447862b2bdc7335074fc +Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel >= 2.0.0 BuildRequires: glib2-devel >= 2.0.0 BuildRequires: libtool -BuildRequires: vdk-devel >= 2.0.1 +BuildRequires: vdk-devel >= 2.4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _omf_dest_dir %(scrollkeeper-config --omfdir) @@ -41,10 +42,10 @@ Pliki nag??wkowe blibliotek vdkbuilder. %prep -%setup -q +%setup -q -n %{name}2-%{version} +%patch0 -p1 %build -#CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" %{__libtoolize} %{__aclocal} %{__autoconf} @@ -67,7 +68,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* @@ -85,6 +86,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/28 00:26:44 twittner +- up to 2.4.0 +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.14 2005/08/27 20:16:00 darekr - added -devel subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Sun Aug 28 02:31:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: vdk-ac_FLAGS.patch (NEW) - don't introduce own flags - ho... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:31:44 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u /dev/null SOURCES/vdk-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:31:44 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 02:31:39 2005 @@ -0,0 +1,54 @@ +diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in +--- o.vdk-2.4.1/configure.in 2004-11-06 19:16:43.000000000 +0100 ++++ n.vdk-2.4.1/configure.in 2005-08-28 02:02:50.092475176 +0200 +@@ -2,8 +2,6 @@ + AC_PREREQ(2.52) + AC_INIT(vdk/vdk.h) + +-cflags_set=${CFLAGS+set} +- + VDK_VERSION_MAJOR=2 + VDK_VERSION_MINOR=4 + VDK_VERSION_MICRO=1 +@@ -121,28 +119,15 @@ + dnl ========================== + dnl user configurable options + dnl ========================== +-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) +-AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) ++AC_ARG_ENABLE(vdkdebug, [ --enable-vdkdebug=[no/yes] enable vdkdebug information [default=no]],,enable_debug=no) + AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) + dnl doxygen options + AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) + AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) + AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) + +-if test "x$enable_debug" = "xminimum"; then +- AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-s" +-else +- if test "x$enable_debug" = "xyes"; then ++if test "x$enable_vdkdebug" = "xyes"; then + AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-g" +- else +- CXXFLAGS="-s" +- fi +-fi +- +-if test "x$enable_opt" != "xno"; then +- CXXFLAGS="$CXXFLAGS -O$enable_opt" + fi + + if test "x$enable_testvdk" = "xyes"; then +@@ -179,10 +164,6 @@ + TAG_SIGC="" + fi + +-if test "x$enable_devel" = "xyes"; then +- cflag="-g" +-fi +- + if test "x$enable_doc_latex" = "xyes"; then + GENERATE_LATEX=YES + # TAG_SIGC=USE_SIGCPLUSPLUS ================================================================ From twittner at pld-linux.org Sun Aug 28 02:39:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: vdk.spec - up to 2.4.1 - removed -ac-am-fixes.patch (mostly... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:39:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdk.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.23 SPECS/vdk.spec:1.24 --- SPECS/vdk.spec:1.23 Sat Aug 27 22:17:16 2005 +++ SPECS/vdk.spec Sun Aug 28 02:39:21 2005 @@ -1,21 +1,26 @@ # $Revision$, $Date$ +# +# Conditional build: +# +%bcond_without static_libs # don't build static libraries +# %include /usr/lib/rpm/macros.perl -Summary: C++ Wrapper over GTK+ 2.0.x library -Summary(pl): Wrapper C++ dla GTK+ 2.0.x +Summary: C++ Wrapper over GTK+ 2.x library +Summary(pl): Wrapper C++ dla GTK+ 2.x Name: vdk -Version: 2.0.3 -Release: 2 +Version: 2.4.1 +Release: 0.1 License: LGPL Group: X11/Libraries -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: b76be21a0014d089c176442ba68bd3c7 -Patch0: %{name}-ac-am-fixes.patch -URL: http://vdkbuilder.sourceforge.net/ -BuildRequires: autoconf +Source0: http://kent.dl.sourceforge.net/sourceforge/vdklib/%{name}-%{version}.tar.gz +# Source0-md5: f388bf265a476880e98ddec7ac4e63f7 +Patch0: %{name}-ac_FLAGS.patch +URL: http://www.mariomotta.it/vdklib/ +BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.0.0 +BuildRequires: gtk+2-devel >= 1:2.4.0 BuildRequires: imlib-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel @@ -28,17 +33,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -C++ Wrapper over GTK+ 2.0.x library. +C++ Wrapper over GTK+ 2.x library. %description -l pl -Wrapper C++ dla GTK+ 2.0.x. +Wrapper C++ dla GTK+ 2.x. %package devel Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 2.0.0 +Requires: gtk+2-devel >= 1:2.4.0 %description devel Header files and development documentation for VDK library. @@ -70,7 +75,8 @@ %{__autoconf} %{__automake} %configure \ - --enable-static=yes + %{?with_static_libs:--enable-static=yes} \ + %{!?with_static_libs:--enable-static=no} %{__make} %{__make} docs @@ -104,10 +110,13 @@ %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_pkgconfigdir}/* +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/lib*.a +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -115,6 +124,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 00:39:21 twittner +- up to 2.4.1 +- removed -ac-am-fixes.patch (mostly contains content from vim backup files) +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.23 2005/08/27 20:17:16 darekr - strict deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.23&r2=1.24&f=u From twittner at pld-linux.org Sun Aug 28 02:39:38 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: vdk-2.4.1.tar.gz Message-ID: <29335.1125189578@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kent.dl.sourceforge.net/sourceforge/vdklib/vdk-2.4.1.tar.gz f388bf265a476880e98ddec7ac4e63f7 vdk-2.4.1.tar.gz Size: 1062475 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 03:01:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: vdk-ac_FLAGS.patch - don't append the same things (CXXFLA... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:01:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't append the same things (CXXFLAGS) twice. ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u SOURCES/vdk-ac_FLAGS.patch:1.1 SOURCES/vdk-ac_FLAGS.patch:1.2 --- SOURCES/vdk-ac_FLAGS.patch:1.1 Sun Aug 28 02:31:39 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 03:01:19 2005 @@ -52,3 +52,25 @@ if test "x$enable_doc_latex" = "xyes"; then GENERATE_LATEX=YES # TAG_SIGC=USE_SIGCPLUSPLUS +diff -Nurb o.vdk-2.4.1/testvdk/Makefile.am n.vdk-2.4.1/testvdk/Makefile.am +--- o.vdk-2.4.1/testvdk/Makefile.am 2004-11-06 18:47:14.000000000 +0100 ++++ n.vdk-2.4.1/testvdk/Makefile.am 2005-08-28 02:45:08.377597184 +0200 +@@ -5,7 +5,6 @@ + EXTRA_PROGRAMS = testvdk testvdkstring + + INCLUDES = @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + testvdk_LDFLAGS = $(GTK_LIBS) + testvdk_LDADD = $(top_srcdir)/vdk/libvdk.la +diff -Nurb o.vdk-2.4.1/vdk/Makefile.am n.vdk-2.4.1/vdk/Makefile.am +--- o.vdk-2.4.1/vdk/Makefile.am 2004-11-06 18:47:10.000000000 +0100 ++++ n.vdk-2.4.1/vdk/Makefile.am 2005-08-28 02:45:22.032521320 +0200 +@@ -186,7 +186,6 @@ + -version-info $(LT_VDK_CURRENT):$(LT_VDK_REVISION):$(LT_VDK_AGE) + + INCLUDES = -I$(top_srcdir)/include @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + AM_LDFLAGS = $(GTK_CFLAGS) + LIBS = $(GTK_LIBS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac_FLAGS.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:03:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: vdk-ac-am-fixes.patch - replaced by vdk-ac_FLAGS.patch In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:03:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac-am-fixes.patch diff -u SOURCES/vdk-ac-am-fixes.patch:1.1 SOURCES/vdk-ac-am-fixes.patch:1.2 --- SOURCES/vdk-ac-am-fixes.patch:1.1 Sat Apr 10 00:05:35 2004 +++ SOURCES/vdk-ac-am-fixes.patch Sun Aug 28 03:03:11 2005 @@ -47,722 +47,6 @@ dnl contrib/Makefile -diff -burN vdk-2.0.3-oryg/configure.in~ vdk-2.0.3/configure.in~ ---- vdk-2.0.3-oryg/configure.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in~ 2004-04-09 22:51:14.000000000 +0200 -@@ -0,0 +1,345 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ fi -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ -+AC_SUBST(SIGCDEFINE) -+ -+ -+if test "x$enable_testsigc" = "xyes" && test "$SIGCDEFINE" != ""; then -+ TESTSIGCVDK="testsigcvdk" -+ WITHTESTSIGCVDK="yes" -+else -+ TESTSIGCVDK="" -+ WITHTESTSIGCVDK="no" -+fi -+ -+AC_SUBST(TESTSIGCVDK) -+ -+dnl doxygen support -+ -+if test "x$enable_doc_html" = "xyes"; then -+ GENERATE_HTML=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_HTML=NO -+ TAG_SIGC="" -+fi -+ -+if test "x$enable_devel" = "xyes"; then -+ cflag="-g" -+fi -+ -+if test "x$enable_doc_latex" = "xyes"; then -+ GENERATE_LATEX=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_LATEX=NO -+fi -+ -+if test "x$enable_doc_man" = "xyes"; then -+ GENERATE_MAN=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_MAN=NO -+ -+fi -+ -+AC_SUBST(GENERATE_HTML) -+AC_SUBST(GENERATE_LATEX) -+AC_SUBST(GENERATE_MAN) -+AC_SUBST(TAG_SIGC) -+ -+ -+GNOMEDEFINE="" -+GNOME_CFLAGS="" -+GNOME_LIBS="" -+GNOME_VDK="" -+ -+AC_SUBST(GNOMEDEFINE) -+AC_SUBST(GNOME_LIBS) -+AC_SUBST(GNOME_CFLAGS) -+AC_SUBST(GNOME_VDK) -+ -+# just to be fully gtk2.x compliant... -+dnlCXXFLAGS="$CXXFLAGS -DGTK_DISABLE_DEPRECATED -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+CXXFLAGS="$CXXFLAGS -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+INCLUDES="$GTK_CFLAGS $SIGC_CFLAGS $SIGCDEFINE" -+ -+ -+dnl contrib/Makefile -+dnl testvdk/pixmap/Makefile -+dnl sigcvdktest/Makefile -+dnl vdk.spec \ -+ -+AC_OUTPUT([Makefile \ -+ vdk/Makefile \ -+ vdk/vdkfeatures.h \ -+ testvdk/Makefile \ -+ sigcvdktest/Makefile \ -+ example/Makefile \ -+ doc/Makefile \ -+ doc/doxy/Makefile \ -+ doc/doxy/Doxyfile \ -+ vdk-2.m4 \ -+ vdk-config-2], \ -+ [chmod +x vdk-config-2]) -+ -+if test -z $DOXYGEN; then -+ echo "*****************************************************"; -+ echo "* doxygen was not found, i will not be able to *"; -+ echo "* generate the docs by myself. *"; -+ echo "* Doxygen is recommended, please check: *"; -+ echo "* http://www.doxygen.org/download.html *"; -+ echo "* for the latest version of doxygen. *"; -+ echo "*****************************************************"; -+ WITHDOCHTML="no" -+else -+ WITHDOCHTML="yes" -+fi -+ -+echo "" -+echo "VDK configure finished" -+echo "VDK configuration:" -+echo " - Version : $VERSION" -+echo " - Make static lib : $enable_static" -+echo " - Make vdk test program : $enable_testvdk" -+echo " - Libsigc++ signal extension support: $WITHSIGC" -+echo " - Make signal extension test program: $WITHTESTSIGCVDK" -+if test "x$WITHSIGC" = "xyes"; then -+echo "**************************************************************" -+echo "You have choosed to use Libsigc++ with VDK which is" -+echo "deprecated and will be unsupported in the near future" -+echo "**************************************************************" -+fi -+echo " - Gnome support : $WITHGNOME" -+echo " - Debug : $enable_debug" -+echo " - Optimization : $enable_opt" -+echo " - Make docs on html format : $WITHDOCHTML" -+echo " * Host : $host" -+echo " * Installation Prefix : $prefix" -+echo " * Compiler version :" `g++ --version` -+echo " * Target machine :" `c++ -dumpmachine` -+#echo " * CPU :" `cat /proc/cpuinfo` -diff -burN vdk-2.0.3-oryg/configure.in-oryg vdk-2.0.3/configure.in-oryg ---- vdk-2.0.3-oryg/configure.in-oryg 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in-oryg 2004-04-09 22:40:13.000000000 +0200 -@@ -0,0 +1,362 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) -+AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-s" -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-g" -+ else -+ CXXFLAGS="-s" -+ fi -+fi -+ -+if test "x$enable_opt" != "xno"; then -+ CXXFLAGS="$CXXFLAGS -O$enable_opt" -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac-am-fixes.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:06:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: vdk-ac-am-fixes.patch (REMOVED) - replaced by vdk-ac_FLAG... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:06:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch (next rm attempt) ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:36:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: rhythmbox-gtk2.8-crash.patch (NEW) - added - evil hack to... In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:36:53 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added - evil hack to fix crash ---- Files affected: SOURCES: rhythmbox-gtk2.8-crash.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rhythmbox-gtk2.8-crash.patch diff -u /dev/null SOURCES/rhythmbox-gtk2.8-crash.patch:1.1 --- /dev/null Sun Aug 28 03:36:53 2005 +++ SOURCES/rhythmbox-gtk2.8-crash.patch Sun Aug 28 03:36:47 2005 @@ -0,0 +1,12 @@ +diff -ur rhythmbox-0.9.0-o/shell/main.c rhythmbox-0.9.0/shell/main.c +--- rhythmbox-0.9.0-o/shell/main.c 2005-08-10 07:23:28.000000000 -0600 ++++ rhythmbox-0.9.0/shell/main.c 2005-08-27 19:14:43.000000000 -0600 +@@ -166,6 +166,8 @@ + = (void *) gst_init_get_popt_table (); + #endif + ++ gtk_init(NULL, NULL); ++ + gtk_set_locale (); + program = gnome_program_init (PACKAGE, VERSION, + LIBGNOMEUI_MODULE, argc+1, new_argv, ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:37:14 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS (DEVEL): rhythmbox.spec - added gtk 2.8 crash patch In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:37:14 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added gtk 2.8 crash patch ---- Files affected: SPECS: rhythmbox.spec (1.46.2.8 -> 1.46.2.9) ---- Diffs: ================================================================ Index: SPECS/rhythmbox.spec diff -u SPECS/rhythmbox.spec:1.46.2.8 SPECS/rhythmbox.spec:1.46.2.9 --- SPECS/rhythmbox.spec:1.46.2.8 Thu Aug 18 13:45:50 2005 +++ SPECS/rhythmbox.spec Sun Aug 28 03:37:08 2005 @@ -10,6 +10,7 @@ # Source0-md5: 3e01834c5085af7fc11d0b98b76b9354 Patch0: %{name}-desktop.patch Patch1: %{name}-broken_locale.patch +Patch2: %{name}-gtk2.8-crash.patch URL: http://www.rhythmbox.org/ BuildRequires: autoconf BuildRequires: automake @@ -53,6 +54,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # broken rm po/{ar,mn}.po @@ -129,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.9 2005/08/28 01:37:08 aredridel +- added gtk 2.8 crash patch + Revision 1.46.2.8 2005/08/18 11:45:50 aflinta - rebuild with cair, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rhythmbox.spec?r1=1.46.2.8&r2=1.46.2.9&f=u From qboosh at pld-linux.org Sun Aug 28 09:16:38 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: vdk.spec - updated gtk+2 epoch; sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:16:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated gtk+2 epoch; sorted BRs ---- Files affected: SPECS: vdk.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.24 SPECS/vdk.spec:1.25 --- SPECS/vdk.spec:1.24 Sun Aug 28 02:39:21 2005 +++ SPECS/vdk.spec Sun Aug 28 09:16:28 2005 @@ -1,7 +1,6 @@ # $Revision$, $Date$ # # Conditional build: -# %bcond_without static_libs # don't build static libraries # %include /usr/lib/rpm/macros.perl @@ -20,8 +19,10 @@ BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.4.0 +BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel +# both??? +BuildRequires: libsigc++1-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool @@ -29,7 +30,6 @@ BuildRequires: pkgconfig BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: zlib-devel -BuildRequires: libsigc++1-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,7 +43,7 @@ Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 1:2.4.0 +Requires: gtk+2-devel >= 2:2.4.0 %description devel Header files and development documentation for VDK library. @@ -69,7 +69,6 @@ %build # exceptions and rtti are used in this package --misiek -rm -f missing %{__libtoolize} %{__aclocal} %{__autoconf} @@ -103,13 +102,13 @@ %files devel %defattr(644,root,root,755) %doc README ChangeLog AUTHORS NEWS BUGS TODO doc/doxy/html -%{_examplesdir}/%{name}-%{version} +%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%attr(755,root,root) %{_bindir}/* %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_examplesdir}/%{name}-%{version} %{_pkgconfigdir}/* %if %{with static_libs} @@ -124,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 07:16:28 qboosh +- updated gtk+2 epoch; sorted BRs + Revision 1.24 2005/08/28 00:39:21 twittner - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 09:19:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: uClibc-gcc4.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:19:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: uClibc-gcc4.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 09:20:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: uClibc-newsoname.patch, uClibc-sparc.patch - updated for ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:20:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.9.28 ---- Files affected: SOURCES: uClibc-newsoname.patch (1.2 -> 1.3) , uClibc-sparc.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-newsoname.patch diff -u SOURCES/uClibc-newsoname.patch:1.2 SOURCES/uClibc-newsoname.patch:1.3 --- SOURCES/uClibc-newsoname.patch:1.2 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-newsoname.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,5 @@ -diff -urN uClibc-0.9.26.org/libpthread/Makefile uClibc-0.9.26/libpthread/Makefile ---- uClibc-0.9.26.org/libpthread/Makefile 2004-01-25 15:20:49.547594064 +0100 -+++ uClibc-0.9.26/libpthread/Makefile 2004-01-25 15:33:34.026392026 +0100 +--- uClibc-0.9.28/libpthread/Makefile.orig 2005-08-18 00:49:49.000000000 +0200 ++++ uClibc-0.9.28/libpthread/Makefile 2005-08-28 00:04:19.595072696 +0200 @@ -21,7 +21,8 @@ #Adjust the soname version to avoid namespace collisions with glibc's libpthread @@ -11,12 +10,12 @@ LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so LIBTHREAD_DB=libthread_db.a -@@ -90,6 +91,8 @@ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \ - $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ -+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ -+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION); \ - fi; - if [ -f $(LIBTHREAD_DB) ] ; then \ - set -e; \ +@@ -84,6 +85,8 @@ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED) + $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) ++ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ ++ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION) + endif + ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y) + $(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols -soname=$(LIBTHREAD_DB_SHARED).1 \ ================================================================ Index: SOURCES/uClibc-sparc.patch diff -u SOURCES/uClibc-sparc.patch:1.4 SOURCES/uClibc-sparc.patch:1.5 --- SOURCES/uClibc-sparc.patch:1.4 Sun Jan 16 17:36:25 2005 +++ SOURCES/uClibc-sparc.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,6 @@ ---- uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c.orig 2005-01-16 10:50:58.798433255 +0000 -+++ uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c 2005-01-16 10:57:08.966876531 +0000 -@@ -93,7 +93,7 @@ +--- uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c 2005-08-28 00:19:02.940783736 +0200 +@@ -81,7 +81,7 @@ if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) { @@ -9,149 +9,51 @@ _dl_progname, reloc_type); _dl_exit(30); }; -@@ -140,8 +140,10 @@ +@@ -128,8 +128,10 @@ got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff)); #endif +#if defined (__SUPPORT_LD_DEBUG__) -+ if (_dl_debug_bindings) ++ if (_dl_debug_bindings) _dl_dprintf(2, "Address = %x\n",new_addr); - _dl_exit(32); +#endif return (unsigned int) new_addr; } -@@ -154,20 +156,20 @@ - int reloc_type; - int symtab_index; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - struct elf_resolve * tpnt = rpnt->dyn; - - /* Now parse the relocation information */ -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i += sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i += sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - - switch(reloc_type){ - case R_SPARC_NONE: -@@ -194,22 +196,22 @@ - int reloc_type; - int goof = 0; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - unsigned int symbol_addr; - int symtab_index; - struct elf_resolve * tpnt = rpnt->dyn; - /* Now parse the relocation information */ - -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - symbol_addr = 0; - - if(symtab_index) { -@@ -229,33 +231,33 @@ - case R_SPARC_NONE: - break; - case R_SPARC_32: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_DISP32: -- *reloc_addr = symbol_addr + rpnt->r_addend - (unsigned int) reloc_addr; -+ *reloc_addr = symbol_addr + relpnt->r_addend - (unsigned int) reloc_addr; - break; - case R_SPARC_GLOB_DAT: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_JMP_SLOT: - reloc_addr[1] = 0x03000000 | ((symbol_addr >> 10) & 0x3fffff); - reloc_addr[2] = 0x81c06000 | (symbol_addr & 0x3ff); - break; - case R_SPARC_RELATIVE: -- *reloc_addr += (unsigned int) tpnt->loadaddr + rpnt->r_addend; -+ *reloc_addr += (unsigned int) tpnt->loadaddr + relpnt->r_addend; - break; - case R_SPARC_HI22: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & 0xffc00000)|(symbol_addr >> 10); - break; - case R_SPARC_LO10: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & ~0x3ff)|(symbol_addr & 0x3ff); - break; - case R_SPARC_WDISP30: ---- uClibc-0.9.27/ldso/ldso/ldso.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/ldso.c 2005-01-16 11:21:49.751151256 +0000 -@@ -648,7 +648,7 @@ +--- uClibc-0.9.28/ldso/ldso/ldso.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/ldso.c 2005-08-28 00:19:31.295473168 +0200 +@@ -597,7 +597,7 @@ + for (; runp; runp = runp->next) { + if (runp->tpnt == tcurr) { struct elf_resolve *here = init_fini_list[k]; - #ifdef __SUPPORT_LD_DEBUG__ - if(_dl_debug) -- _dl_dprintf(2, "Move %s from pos %d to %d in INIT/FINI list.\n", here->libname, k, j); -+ _dl_dprintf(2, "Move %s from pos %x to %x in INIT/FINI list.\n", here->libname, k, j); - #endif +- _dl_if_debug_dprint("Move %s from pos %d to %d in INIT/FINI list\n", here->libname, k, j); ++ _dl_if_debug_dprint("Move %s from pos %x to %x in INIT/FINI list\n", here->libname, k, j); for (i = (k - j); i; --i) init_fini_list[i+j] = init_fini_list[i+j-1]; -@@ -911,7 +911,7 @@ + init_fini_list[j] = here; +@@ -837,7 +837,7 @@ + void *retval; #if 0 - #ifdef __SUPPORT_LD_DEBUG_EARLY__ -- _dl_dprintf(2, "malloc: request for %d bytes\n", size); -+ _dl_dprintf(2, "malloc: request for %x bytes\n", size); - #endif +- _dl_debug_early("request for %d bytes\n", size); ++ _dl_debug_early("request for %x bytes\n", size); #endif ---- uClibc-0.9.27/ldso/ldso/dl-elf.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/dl-elf.c 2005-01-16 11:23:39.541794934 +0000 -@@ -827,7 +827,8 @@ + if (_dl_malloc_function) +--- uClibc-0.9.28/ldso/ldso/dl-elf.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/dl-elf.c 2005-08-28 00:20:16.525597144 +0200 +@@ -813,7 +813,8 @@ else _dl_write(fd, string, _dl_strlen(string)); break; - +#ifndef __sparc__ -+ /* _dl_simple_ltoa uses undefined .udiv */ ++ /* _dl_simple_ltoa() uses undefined .udiv */ case 'i': case 'd': { -@@ -838,6 +839,7 @@ +@@ -824,6 +825,7 @@ _dl_write(fd, string, _dl_strlen(string)); break; } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/uClibc-sparc.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: uClibc.spec - updated to 0.9.28 (x86_64 port introduced) - ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:25:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ---- Files affected: SPECS: uClibc.spec (1.111 -> 1.112) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.111 SPECS/uClibc.spec:1.112 --- SPECS/uClibc.spec:1.111 Thu Feb 17 00:19:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:25:22 2005 @@ -2,25 +2,24 @@ Summary: C library optimized for size Summary(pl): Biblioteka C zoptymalizowana na rozmiar Name: uClibc -Version: 0.9.27 -Release: 1.1 +Version: 0.9.28 +Release: 0.1 Epoch: 2 License: LGPL Group: Libraries Source0: http://uclibc.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 6250bd6524283bd8e7bc976d43a46ec0 +# Source0-md5: 1ada58d919a82561061e4741fb6abd29 Patch0: %{name}-newsoname.patch Patch1: %{name}-alpha.patch Patch2: %{name}-toolchain-wrapper.patch Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch -Patch6: %{name}-gcc4.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 BuildRequires: which -ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 +ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) @@ -68,7 +67,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -e ' %ifarch sparc sparc64 sparcv9 @@ -80,6 +78,9 @@ %ifarch ppc ppc64 s/default TARGET_i386/default TARGET_powerpc/ %endif +%ifarch %{x8664} + s/default TARGET_i386/default TARGET_x86_64/ +%endif ' extra/Configs/Config.in > Conf.in.tmp mv -f Conf.in.tmp extra/Configs/Config.in @@ -156,7 +157,6 @@ ln -sf /usr/include/asm-sparc64 $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/asm-sparc64 %endif ln -sf /usr/include/linux $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/linux -rm $RPM_BUILD_ROOT/%{_prefix}/*-linux-uclibc/usr/include/.cvsignore %clean rm -rf $RPM_BUILD_ROOT @@ -164,7 +164,7 @@ %files %defattr(644,root,root,755) %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif @@ -178,7 +178,7 @@ %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -193,6 +193,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.112 2005/08/28 07:25:22 qboosh +- updated to 0.9.28 (x86_64 port introduced) +- updated newsoname,sparc patches, removed obsolete gcc4 patch + Revision 1.111 2005/02/16 23:19:22 tommat - be more compatible with our glibc, allow to build for example ash ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.111&r2=1.112&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: uClibc-0.9.28.tar.bz2 Message-ID: <3841.1125213933@distfiles.pld-linux.org> Files fetched: 1 STORED: http://uclibc.org/downloads/uClibc-0.9.28.tar.bz2 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 Size: 1763847 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 09:54:26 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: uClibc.spec - fix ldso prefix (use runtime, not devel) In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:54:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix ldso prefix (use runtime, not devel) ---- Files affected: SPECS: uClibc.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.112 SPECS/uClibc.spec:1.113 --- SPECS/uClibc.spec:1.112 Sun Aug 28 09:25:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:54:20 2005 @@ -109,7 +109,8 @@ sed -e 's/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/; s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; - s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/ + s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; + s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/28 07:54:20 qboosh +- fix ldso prefix (use runtime, not devel) + Revision 1.112 2005/08/28 07:25:22 qboosh - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.112&r2=1.113&f=u From arekm at pld-linux.org Sun Aug 28 10:14:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: kexec-tools.spec - up to 1.101 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.101 ---- Files affected: SPECS: kexec-tools.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.8 SPECS/kexec-tools.spec:1.9 --- SPECS/kexec-tools.spec:1.8 Tue Dec 14 21:56:49 2004 +++ SPECS/kexec-tools.spec Sun Aug 28 10:13:53 2005 @@ -1,26 +1,22 @@ # $Revision$, $Date$ -# TODO: -# - %desc en and pl are out of sync -# - kernel version needs to reviewed. -%define kernel_version 2.5.73 Summary: Tool for starting new kernel without reboot Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools -Version: 1.98 -Release: 0.5 +Version: 1.101 +Release: 0.1 License: GPL Group: Applications/System -Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tgz -# Source0-md5: 834823637153e07a85d4544b02944080 +Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz +# Source0-md5: b4f7ffcc294d41a6a4c40d6e44b7734d Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 -Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: glibc-static -Requires: kernel >= %{kernel_version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description kexec is a set of system calls that allows you to load another kernel from the currently executing Linux kernel. The current implementation @@ -38,21 +34,19 @@ %prep %setup -q -%patch -p1 %build -# why is this here? -%{?debug:find ./objdir -type f | xargs rm -f} - +%configure %{__make} \ CC="%{__cc}" \ OPTFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sbindir},/sbin} -install objdir/build/sbin/kexec $RPM_BUILD_ROOT/sbin -install objdir/build/bin/kexec_test $RPM_BUILD_ROOT%{_sbindir} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE2} README @@ -61,10 +55,9 @@ %files %defattr(644,root,root,755) -%doc TODO News README -%attr(755,root,root) %{_sbindir}/do-kexec.sh -%attr(755,root,root) %{_sbindir}/kexec_test -%attr(755,root,root) /sbin/kexec +%doc AUTHORS TODO News README +%attr(755,root,root) %{_sbindir}/* +%attr(755,root,root) %{_libdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 08:13:53 arekm +- up to 1.101 + Revision 1.8 2004/12/14 20:56:49 glen - updated to 1.98 - put kexec to /sbin (rc.shutdown expects it there) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sun Aug 28 10:14:04 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: kexec-tools-1.101.tar.gz README Message-ID: <3428.1125216844@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz Size: 206785 bytes ALREADY GOT: http://www.xmission.com/~ebiederm/files/kexec/README b80e99096ec4ef37b09ecb5707233fb3 README -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: proxytunnel-1.5.0.tgz Message-ID: <9445.1125217106@distfiles.pld-linux.org> Files fetched: 1 STORED: http://proxytunnel.sourceforge.net/files/proxytunnel-1.5.0.tgz 2a36409580391e25421fc06e82eed4ce proxytunnel-1.5.0.tgz Size: 56775 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: proxytunnel.spec (NEW) - Init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 08:18:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Init PLD spec ---- Files affected: SPECS: proxytunnel.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u /dev/null SPECS/proxytunnel.spec:1.1 --- /dev/null Sun Aug 28 10:18:26 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 10:18:20 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +Summary: Proxy Tunnel ssh-over-https hack +Name: proxytunnel +Version: 1.5.0 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://proxytunnel.sourceforge.net/files/%{name}-%{version}.tgz +# Source0-md5: 2a36409580391e25421fc06e82eed4ce +URL: http://proxytunnel.sourceforge.net/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ProxyTunnel is a program that connects stdin and stdout to a server +somewhere on the network, through a standard HTTPS proxy. We mostly +use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to +do many things that wouldn't be possible without ProxyTunnel. +Proxytunnel can currently do the following: +- Create tunnels using HTTP and HTTPS proxies (That understand the + HTTP CONNECT command). +- Work as a back-end driver for an OpenSSH client, and create SSH + connections through HTTP(S) proxies. +- Work as a stand-alone application, listening on a port for + connections, and then tunneling these connections to a specified + destination. + +%prep +%setup -q + +%build + +%{__make} \ + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" + +%install +rm -rf $RPM_BUILD_ROOT + +install -D proxytunnel $RPM_BUILD_ROOT%{_bindir}/proxytunnel +install -D debian/proxytunnel.1 $RPM_BUILD_ROOT%{_mandir}/man1/proxytunnel.1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CREDITS CHANGES README +%attr(755,root,root) %{_bindir}/* +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 08:18:20 areq +- Init PLD spec + ================================================================ From arekm at pld-linux.org Sun Aug 28 10:22:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: kexec-tools.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:22:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: kexec-tools.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.9 SPECS/kexec-tools.spec:1.10 --- SPECS/kexec-tools.spec:1.9 Sun Aug 28 10:13:53 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:22:00 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools Version: 1.101 -Release: 0.1 +Release: 1 License: GPL Group: Applications/System Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 08:22:00 arekm +- rel 1 + Revision 1.9 2005/08/28 08:13:53 arekm - up to 1.101 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Sun Aug 28 10:26:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: mysqlcc.spec - rel 9; drop charset patch (use mysql-client.... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:26:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 9; drop charset patch (use mysql-client.conf for charset) ---- Files affected: SPECS: mysqlcc.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/mysqlcc.spec diff -u SPECS/mysqlcc.spec:1.28 SPECS/mysqlcc.spec:1.29 --- SPECS/mysqlcc.spec:1.28 Sat May 28 22:24:29 2005 +++ SPECS/mysqlcc.spec Sun Aug 28 10:26:12 2005 @@ -7,7 +7,7 @@ Name: mysqlcc Group: Applications/Databases Version: 0.9.4 -Release: 8 +Release: 9 License: GPL Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLCC/%{name}-%{version}-src.tar.gz # Source0-md5: 26ee3528dce690b227d8bfb71b46ae66 @@ -16,7 +16,6 @@ Patch1: %{name}-m4.patch Patch2: %{name}-shutdown.patch Patch3: %{name}-enablessl.patch -Patch4: %{name}-utf8-4.1.patch URL: http://www.mysql.com/products/mysqlcc/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -43,7 +42,6 @@ %patch1 -p1 %{?!with_mysql40:%patch2 -p1} %patch3 -p1 -%patch4 -p1 %build cp -f /usr/share/automake/config.sub . @@ -95,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/28 08:26:12 arekm +- rel 9; drop charset patch (use mysql-client.conf for charset) + Revision 1.28 2005/05/28 20:24:29 twittner - added bcond --with mysql40 - for building with mysql-4.0.x ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysqlcc.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Sun Aug 28 10:28:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: kexec-tools.spec - update BR In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update BR ---- Files affected: SPECS: kexec-tools.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.10 SPECS/kexec-tools.spec:1.11 --- SPECS/kexec-tools.spec:1.10 Sun Aug 28 10:22:00 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:28:30 2005 @@ -12,7 +12,8 @@ Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 URL: http://www.xmission.com/~ebiederm/files/kexec/ -BuildRequires: glibc-static +BuildRequires: glibc-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -65,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/28 08:28:30 arekm +- update BR + Revision 1.10 2005/08/28 08:22:00 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Sun Aug 28 10:31:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: uClibc-targetcpu.patch - don't add extra / at the end of ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:31:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't add extra / at the end of prefixes ---- Files affected: SOURCES: uClibc-targetcpu.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-targetcpu.patch diff -u SOURCES/uClibc-targetcpu.patch:1.4 SOURCES/uClibc-targetcpu.patch:1.5 --- SOURCES/uClibc-targetcpu.patch:1.4 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-targetcpu.patch Sun Aug 28 10:31:14 2005 @@ -5,7 +5,7 @@ config RUNTIME_PREFIX string "uClibc runtime library directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc" help RUNTIME_PREFIX is the directory into which the uClibc runtime libraries will be installed. The result will look something @@ -14,7 +14,7 @@ config DEVEL_PREFIX string "uClibc development environment directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/usr/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc/usr" help DEVEL_PREFIX is the directory into which the uClibc development environment will be installed. The result will look something ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-targetcpu.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 10:32:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: uClibc-toolchain-wrapper.patch - add runtime lib dir to -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:32:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add runtime lib dir to -rpath-link/-rpath (to catch ld-uClibc.so) ---- Files affected: SOURCES: uClibc-toolchain-wrapper.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/uClibc-toolchain-wrapper.patch diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.3 SOURCES/uClibc-toolchain-wrapper.patch:1.4 --- SOURCES/uClibc-toolchain-wrapper.patch:1.3 Sat Jan 15 23:36:50 2005 +++ SOURCES/uClibc-toolchain-wrapper.patch Sun Aug 28 10:32:19 2005 @@ -1,7 +1,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c --- uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c 2003-08-28 07:51:04.000000000 +0200 -@@ -0,0 +1,660 @@ +@@ -0,0 +1,666 @@ +/* vi: set sw=4 ts=4: */ +/* + * Copyright (C) 2000 Manuel Novoa III @@ -190,6 +190,7 @@ + char *dlstr; + char *incstr; + char *devprefix; ++ char *runprefix; + char *builddir; + char *libstr; + char *build_dlstr = 0; @@ -253,6 +254,11 @@ + devprefix = UCLIBC_DEVEL_PREFIX; + } + ++ runprefix = getenv("UCLIBC_RUNTIME_PREFIX"); ++ if (!runprefix) { ++ runprefix = UCLIBC_RUNTIME_PREFIX; ++ } ++ + builddir = getenv("UCLIBC_BUILD_DIR"); + if (!builddir) { + builddir = UCLIBC_BUILD_DIR; @@ -275,10 +281,10 @@ + } + + -+ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath_link[1]), "-Wl,-rpath-link,", builddir, "/lib", NULL); + -+ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL); + + xstrcat(&(uClibc_inc[0]), devprefix, "/include/", NULL); @@ -665,7 +671,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uClibc/Makefile --- uClibc-0.9.26.org/extra/gcc-uClibc/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-25 16:06:22.372828491 +0100 -@@ -0,0 +1,92 @@ +@@ -0,0 +1,93 @@ +# Makefile for building a fake gcc/binutils toolchain +# that simply spoofs the location of the C library +# @@ -686,6 +692,7 @@ + @echo "/* this file was autogenerated by make */" > gcc-uClibc.h + @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h ++ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h + @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h + @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 10:33:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: uClibc.spec - updated targetcpu, toolchain-wrapper patches -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:33:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ---- Files affected: SPECS: uClibc.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.113 SPECS/uClibc.spec:1.114 --- SPECS/uClibc.spec:1.113 Sun Aug 28 09:54:20 2005 +++ SPECS/uClibc.spec Sun Aug 28 10:33:15 2005 @@ -110,7 +110,7 @@ s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; - s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ + s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)/lib", ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/28 08:33:15 qboosh +- updated targetcpu,toolchain-wrapper patches - now dynamic linking works again + Revision 1.113 2005/08/28 07:54:20 qboosh - fix ldso prefix (use runtime, not devel) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.113&r2=1.114&f=u From arekm at pld-linux.org Sun Aug 28 10:41:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: mysqlcc-utf8-4.1.patch (REMOVED) - drop In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:41:43 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - drop ---- Files affected: SOURCES: mysqlcc-utf8-4.1.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:15:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: mysql-administrator-termcap.patch (NEW), mysql-administra... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:15:38 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: mysql-administrator-termcap.patch (NONE -> 1.1) (NEW), mysql-administrator-lua.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mysql-administrator-termcap.patch diff -u /dev/null SOURCES/mysql-administrator-termcap.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-termcap.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,20 @@ +diff -urN mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 11:00:00.974042616 +0200 +@@ -28,7 +28,7 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + + +@@ -39,6 +39,6 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ Index: SOURCES/mysql-administrator-lua.patch diff -u /dev/null SOURCES/mysql-administrator-lua.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-lua.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,73 @@ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in mysql-administrator-1.0.22a/mysql-gui-common/configure.in +--- mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in 2005-06-02 05:20:50.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/configure.in 2005-08-28 10:58:26.907342928 +0200 +@@ -77,14 +77,14 @@ + + + # Lua Stuff +-LUA_CFLAGS= +-LUA_LDFLAGS=-llua ++LUA_CFLAGS=-I/usr/include/lua50 ++LUA_LDFLAGS="-llua50 -llualib50" + AC_ARG_WITH(lua-includes, + [ --with-lua-includes directory where Lua headers are located], + [LUA_CFLAGS=-I$withval]) + AC_ARG_WITH(lua-libs, + [ --with-lua-libs directory where Lua libraries are located], +- [LUA_LDFLAGS="$withval -llua"]) ++ [LUA_LDFLAGS="$withval -llua50 -llualib50"]) + AC_SUBST(LUA_CFLAGS) + AC_SUBST(LUA_LDFLAGS) + +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am 2005-04-14 04:48:08.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -8,7 +8,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrt_a_SOURCES=myx_grt.c\ + myx_grt_module.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-04-30 01:25:58.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -10,7 +10,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrtmods_a_SOURCES=\ + myx_grt_base.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-05-16 15:12:10.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973976 +0200 +@@ -18,7 +18,7 @@ + $(JAVA_INC)\ + @GTHREAD_CFLAGS@ @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ + @PYTHON_CFLAGS@ @ENABLED_MODULES@\ +- @GTK_CFLAGS@ ++ @GTK_CFLAGS@ @LUA_CFLAGS@ + + + grtsh_LDADD=\ +@@ -29,7 +29,7 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + + + agentest_LDADD=\ +@@ -40,5 +40,5 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:18:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: xpdf-intoverflow.patch (REMOVED), xpdf-freetype-includes.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:18:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: xpdf-intoverflow.patch (1.1 -> NONE) (REMOVED), xpdf-freetype-includes.patch (1.1 -> NONE) (REMOVED), xpdf-3.00pl2.patch (1.3 -> NONE) (REMOVED), xpdf-3.00pl3.patch (1.1 -> NONE) (REMOVED), xpdf-CAN-2005-2097.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:19:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: mysql-administrator.spec - up to 1.0.22a In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:19:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.22a ---- Files affected: SPECS: mysql-administrator.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/mysql-administrator.spec diff -u SPECS/mysql-administrator.spec:1.11 SPECS/mysql-administrator.spec:1.12 --- SPECS/mysql-administrator.spec:1.11 Tue May 24 20:58:52 2005 +++ SPECS/mysql-administrator.spec Sun Aug 28 11:19:02 2005 @@ -1,19 +1,27 @@ # $Revision$, $Date$ +%bcond_with canvas +%bcond_with grt Summary: A MySQL server management, configuration and monitoring tool Summary(pl): Narz?dzie do zarz?dzania, konfiguracji i monitorowania pracy serwera MySQL Name: mysql-administrator -Version: 1.0.19 -Release: 0.2 +Version: 1.0.22a +Release: 1 License: GPL Group: Applications/Databases Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/%{name}-%{version}.tar.gz -# Source0-md5: b495755208b55333cb9c060c09246fe2 +# Source0-md5: ed0f1af3eb7be03c2785ad9057492b75 +Patch0: %{name}-lua.patch +Patch1: %{name}-termcap.patch URL: http://www.mysql.com/products/administrator/ -BuildRequires: gtkmm-devel <= 2.2.0 +BuildRequires: autoconf +BuildRequires: automake +%{?with_canvas:BuildRequires: ftgl-devel} +BuildRequires: gtkmm22-devel BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: pcre-devel >= 3.9 BuildRequires: pkgconfig BuildRequires: mysql-devel +BuildRequires: lua50-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -27,15 +35,22 @@ %description -l pl MySQL Administrator jest pot??nym graficznym narz?dziem umo?liwiaj?cym ?atwe administrowanie ca?ym ?rodowiskiem MySQL. Dzi?ki przejrzystemu -interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy -i intuicyjny w obs?udze. +interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy i +intuicyjny w obs?udze. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build cd mysql-gui-common +%{__aclocal} +%{__autoconf} +%{__automake} %configure \ + %{?with_canvas:--enable-canvas} \ + %{?with_grt:--enable-grt} \ --with-commondirname=administrator %{__make} @@ -50,21 +65,19 @@ %{__make} -C mysql-gui-common install \ DESTDIR=$RPM_BUILD_ROOT -cd ../%{name} %{__make} -C %{name} install \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator -cp -a doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator +cp -a mysql-administrator/doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog res/FAQ -%attr(755,root,root) %{_bindir}/mysql-administrator -%attr(755,root,root) %{_bindir}/mysql-administrator-bin +%doc mysql-administrator/ChangeLog mysql-administrator/res/FAQ +%attr(755,root,root) %{_bindir}/* %{_desktopdir}/*.desktop %{_datadir}/mysql-gui/*.png %dir %{_datadir}/mysql-gui/administrator @@ -78,6 +91,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:19:02 arekm +- up to 1.0.22a + Revision 1.11 2005/05/24 18:58:52 darekr - use _desktopdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-administrator.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 11:19:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: mysql-administrator-1.0.22a.tar.gz Message-ID: <32473.1125220755@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/mysql-administrator-1.0.22a.tar.gz ed0f1af3eb7be03c2785ad9057492b75 mysql-administrator-1.0.22a.tar.gz Size: 7444056 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:19:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: xpdf-remove_protections.patch - updated for 3.01 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:19:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 3.01 ---- Files affected: SOURCES: xpdf-remove_protections.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/xpdf-remove_protections.patch diff -u SOURCES/xpdf-remove_protections.patch:1.4 SOURCES/xpdf-remove_protections.patch:1.5 --- SOURCES/xpdf-remove_protections.patch:1.4 Wed Mar 26 18:34:22 2003 +++ SOURCES/xpdf-remove_protections.patch Sun Aug 28 11:19:36 2005 @@ -1,40 +1,19 @@ -diff -Nur xpdf-2.01.orig/xpdf/XPDFCore.cc xpdf-2.01/xpdf/XPDFCore.cc ---- xpdf-2.01.orig/xpdf/XPDFCore.cc Sun Nov 3 23:15:37 2002 -+++ xpdf-2.01/xpdf/XPDFCore.cc Mon Nov 4 21:08:51 2002 -@@ -906,9 +906,6 @@ - // global variables (currentSelection and currentSelectionOwner). +--- xpdf-3.01/xpdf/XPDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/XPDFCore.cc 2005-08-28 11:07:57.279864520 +0200 +@@ -377,9 +377,6 @@ + int pg; + double ulx, uly, lrx, lry; - void XPDFCore::copySelection() { - if (!doc->okToCopy()) { - return; - } - if (currentSelection) { - delete currentSelection; - } -@@ -947,9 +944,6 @@ - } - - GString *XPDFCore::extractText(int xMin, int yMin, int xMax, int yMax) { -- if (!doc->okToCopy()) { -- return NULL; -- } - return out->getText(xMin, yMin, xMax, yMax); - } - -@@ -958,9 +952,6 @@ - TextOutputDev *textOut; - GString *s; - -- if (!doc->okToCopy()) { -- return NULL; -- } - textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse); - if (!textOut->isOk()) { - delete textOut; -@@ -1585,10 +1576,9 @@ + if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { + //~ for multithreading: need a mutex here + if (currentSelection) { +@@ -1108,10 +1105,9 @@ #ifndef NO_TEXT_SELECT - if (core->selectXMin != core->selectXMax && - core->selectYMin != core->selectYMax) { + if (core->selectULX != core->selectLRX && + core->selectULY != core->selectLRY) { - if (core->doc->okToCopy()) { - core->copySelection(); - } else { @@ -86,3 +65,15 @@ } // construct text file name +--- xpdf-3.01/xpdf/PDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/PDFCore.cc 2005-08-28 11:08:37.884691648 +0200 +@@ -1273,9 +1273,6 @@ + int x0, y0, x1, y1, t; + GString *s; + +- if (!doc->okToCopy()) { +- return NULL; +- } + if ((page = findPage(pg))) { + cvtUserToDev(pg, xMin, yMin, &x0, &y0); + cvtUserToDev(pg, xMax, yMax, &x1, &y1); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/xpdf-remove_protections.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 11:22:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: uClibc-x86_64.patch (NEW) - gcc (3.3.6) doesn't allow ' i... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:22:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - gcc (3.3.6) doesn't allow ' in warning #without quotes ---- Files affected: SOURCES: uClibc-x86_64.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/uClibc-x86_64.patch diff -u /dev/null SOURCES/uClibc-x86_64.patch:1.1 --- /dev/null Sun Aug 28 11:22:09 2005 +++ SOURCES/uClibc-x86_64.patch Sun Aug 28 11:22:04 2005 @@ -0,0 +1,11 @@ +--- uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c.orig 2005-08-28 10:59:32.000000000 +0200 ++++ uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c 2005-08-28 10:58:49.000000000 +0200 +@@ -27,7 +27,7 @@ + + + #if defined __NR_rt_sigaction +-#warning Yes there are two warnings here. Don't worry about it. ++#warning "Yes there are two warnings here. Don't worry about it." + static void restore_rt (void) asm ("__restore_rt"); + static void restore (void) asm ("__restore"); + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:23:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: uClibc.spec - disable shared on x86_64 (not ready yet), add... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable shared on x86_64 (not ready yet), added x86_64 patch; builds now - more docs (and base docs moved to base) ---- Files affected: SPECS: uClibc.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.114 SPECS/uClibc.spec:1.115 --- SPECS/uClibc.spec:1.114 Sun Aug 28 10:33:15 2005 +++ SPECS/uClibc.spec Sun Aug 28 11:23:31 2005 @@ -15,6 +15,7 @@ Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch +Patch6: %{name}-x86_64.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 @@ -23,7 +24,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) -%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/') +%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/') %description Small libc for building embedded applications. @@ -67,8 +68,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -sed -e ' +sed -i -e ' %ifarch sparc sparc64 sparcv9 s/default TARGET_i386/default TARGET_sparc/ %endif @@ -81,13 +83,12 @@ %ifarch %{x8664} s/default TARGET_i386/default TARGET_x86_64/ %endif - ' extra/Configs/Config.in > Conf.in.tmp -mv -f Conf.in.tmp extra/Configs/Config.in + ' extra/Configs/Config.in -grep -v 'HAVE_NO_SHARED\|ARCH_HAS_NO_LDSO' extra/Configs/Config.sparc > C.tmp -mv -f C.tmp extra/Configs/Config.sparc -grep -v 'HAS_NO_THREADS' extra/Configs/Config.alpha > C.tmp -mv -f C.tmp extra/Configs/Config.alpha +# ldso on x86_64 not ready yet (missing resolve.S) +sed -i -e '/HAS_NO_THREADS/a\\n\tselect HAVE_NO_SHARED\n\tselect ARCH_HAS_NO_LDSO' \ + extra/Configs/Config.x86_64 +sed -i -e '/HAS_NO_THREADS/d' extra/Configs/Config.alpha %ifarch sparc sparc64 sparcv9 ln -sf /usr/include/asm-sparc include/asm-sparc @@ -164,22 +165,23 @@ %files %defattr(644,root,root,755) +%doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif %files devel %defattr(644,root,root,755) -%doc README TODO docs/threads.txt docs/uclibc.org/*.html +%doc docs/uclibc.org/* %attr(755,root,root) %{_bindir}/* %{_prefix}/*-linux-uclibc/usr/lib/*.o %dir %{_prefix}/*-linux-uclibc/usr %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -194,6 +196,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/28 09:23:31 qboosh +- disable shared on x86_64 (not ready yet), added x86_64 patch; builds now +- more docs (and base docs moved to base) + Revision 1.114 2005/08/28 08:33:15 qboosh - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.114&r2=1.115&f=u From qboosh at pld-linux.org Sun Aug 28 11:25:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xpdf.spec - updated to 3.01 - removed obsolete intoverflow, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:25:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.01 - removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches - updated remove_protections patch ---- Files affected: SPECS: xpdf.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/xpdf.spec diff -u SPECS/xpdf.spec:1.90 SPECS/xpdf.spec:1.91 --- SPECS/xpdf.spec:1.90 Tue Aug 16 10:29:04 2005 +++ SPECS/xpdf.spec Sun Aug 28 11:25:53 2005 @@ -3,7 +3,6 @@ # Conditional build: %bcond_without protections # remove protections against fair use (printing and copying) # - Summary: Portable Document Format (PDF) file viewer Summary(es): Visualizador de archivos PDF Summary(ja): X Window System ???? PDF ???????????????? @@ -12,24 +11,19 @@ Summary(ru): ????????? ??? ????????? PDF ?????? Summary(uk): ???????? ??? ????????? PDF ?????? Name: xpdf -Version: 3.00 -Release: 10 +Version: 3.01 +Release: 1 License: GPL Group: X11/Applications Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz -# Source0-md5: 95294cef3031dd68e65f331e8750b2c2 +# Source0-md5: e004c69c7dddef165d768b1362b44268 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}rc Patch0: %{name}-remove_protections.patch -Patch1: %{name}-freetype-includes.patch -Patch2: %{name}-fontdirs.patch +Patch1: %{name}-fontdirs.patch # probably obsolete -Patch3: %{name}-nonumericlocale.patch -Patch4: %{name}-intoverflow.patch -Patch5: %{name}-%{version}pl2.patch -Patch6: %{name}-%{version}pl3.patch -Patch7: %{name}-CAN-2005-2097.patch +Patch2: %{name}-nonumericlocale.patch URL: http://www.foolabs.com/xpdf/ Icon: xpdfIcon.gif BuildRequires: XFree86-devel @@ -107,11 +101,6 @@ %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %build %{__autoconf} @@ -172,6 +161,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/28 09:25:53 qboosh +- updated to 3.01 +- removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches +- updated remove_protections patch + Revision 1.90 2005/08/16 08:29:04 adamg - fix for a DoS vulnerability (CAN-2005-2097) - release 10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf.spec?r1=1.90&r2=1.91&f=u From qboosh at pld-linux.org Sun Aug 28 11:26:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: xpdf-3.01.tar.gz Message-ID: <10072.1125221164@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01.tar.gz e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz Size: 599778 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: xpdf-chinese-simplified-2004-jul-27.tar.gz Message-ID: <4839.1125222366@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz 6c3b04008000948e62530b8582e7f37c xpdf-chinese-simplified-2004-jul-27.tar.gz Size: 835960 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:17 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xpdf-chinese-traditional.spec - updated to 2004-jul-27, rel... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 5 ---- Files affected: SPECS: xpdf-chinese-traditional.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-traditional.spec diff -u SPECS/xpdf-chinese-traditional.spec:1.11 SPECS/xpdf-chinese-traditional.spec:1.12 --- SPECS/xpdf-chinese-traditional.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-chinese-traditional.spec Sun Aug 28 11:46:11 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania Big5 i Big5ascii dla xpdf Name: xpdf-chinese-traditional Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 1dd68bc924273e30534031d66f8a37c7 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: b7fa7f1850f7cfa28498701507079abb URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:11 qboosh +- updated to 2004-jul-27, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-traditional.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xpdf-japanese.spec - updated to 2004-jul-27, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 4 ---- Files affected: SPECS: xpdf-japanese.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-japanese.spec diff -u SPECS/xpdf-japanese.spec:1.11 SPECS/xpdf-japanese.spec:1.12 --- SPECS/xpdf-japanese.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-japanese.spec Sun Aug 28 11:46:22 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-JP, EUC-JP i Shift-JIS dla xpdf Name: xpdf-japanese Version: 1.0 -Release: 3 +Release: 4 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 2fe6d4701482af0d69084c574fe14d90 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: a11ee6476d0f381983664fc614f7a95e URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:22 qboosh +- updated to 2004-jul-27, release 4 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-japanese.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xpdf-chinese-simplified.spec - updated to 2004-jul-27, rele... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 6 ---- Files affected: SPECS: xpdf-chinese-simplified.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-simplified.spec diff -u SPECS/xpdf-chinese-simplified.spec:1.12 SPECS/xpdf-chinese-simplified.spec:1.13 --- SPECS/xpdf-chinese-simplified.spec:1.12 Wed Aug 25 11:49:22 2004 +++ SPECS/xpdf-chinese-simplified.spec Sun Aug 28 11:45:57 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-CN, EUC-CN i GBK dla xpdf Name: xpdf-chinese-simplified Version: 1.0 -Release: 5 +Release: 6 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 7a92500278d4aa8089024d5d7266f4ac +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: 6c3b04008000948e62530b8582e7f37c URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 09:45:57 qboosh +- updated to 2004-jul-27, release 6 + Revision 1.12 2004/08/25 09:49:22 qboosh - typo, release 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-simplified.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: xpdf-chinese-traditional-2004-jul-27.tar.gz Message-ID: <5469.1125222382@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz b7fa7f1850f7cfa28498701507079abb xpdf-chinese-traditional-2004-jul-27.tar.gz Size: 794604 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: xpdf-japanese-2004-jul-27.tar.gz Message-ID: <5706.1125222392@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz a11ee6476d0f381983664fc614f7a95e xpdf-japanese-2004-jul-27.tar.gz Size: 494803 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: DISTFILES: xpdf-korean-2005-jul-07.tar.gz Message-ID: <13228.1125222718@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz 3c1e00f3b9d5fa713df8a3d763d12f3a xpdf-korean-2005-jul-07.tar.gz Size: 470455 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xpdf-korean.spec - updated to 2005-jul-07, release 5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:51:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-jul-07, release 5 ---- Files affected: SPECS: xpdf-korean.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-korean.spec diff -u SPECS/xpdf-korean.spec:1.11 SPECS/xpdf-korean.spec:1.12 --- SPECS/xpdf-korean.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-korean.spec Sun Aug 28 11:51:48 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-KR (KSX1001) dla xpdf Name: xpdf-korean Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 01c1b151119ba96da6bc021ea2916256 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2005-jul-07.tar.gz +# Source0-md5: 3c1e00f3b9d5fa713df8a3d763d12f3a URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:51:48 qboosh +- updated to 2005-jul-07, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-korean.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:18:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SOURCES: kexec-tools-opt.patch - updated for 1.101 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:18:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.101 ---- Files affected: SOURCES: kexec-tools-opt.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/kexec-tools-opt.patch diff -u SOURCES/kexec-tools-opt.patch:1.2 SOURCES/kexec-tools-opt.patch:1.3 --- SOURCES/kexec-tools-opt.patch:1.2 Tue Dec 14 23:28:16 2004 +++ SOURCES/kexec-tools-opt.patch Sun Aug 28 12:17:56 2005 @@ -1,11 +1,13 @@ ---- kexec-tools-1.98/Makefile.main.orig 2004-09-15 09:49:17.000000000 +0000 -+++ kexec-tools-1.98/Makefile.main 2004-12-14 22:25:32.325270400 +0000 -@@ -2,7 +2,7 @@ - VERSION="1.98" - DATE="15 September 2004" - CPPFLAGS:= -I./util_lib/include -DVERSION='$(VERSION)' -DRELEASE_DATE='$(DATE)' $(EXTRA_FLAGS) --CFLAGS:=-Wall -g -O2 -fno-strict-aliasing $(CPPFLAGS) -+CFLAGS:=-Wall -fno-strict-aliasing $(CPPFLAGS) $(OPTFLAGS) +--- kexec-tools-1.101/configure.ac.orig 2005-01-09 02:36:57.000000000 +0100 ++++ kexec-tools-1.101/configure.ac 2005-08-28 12:12:20.729530896 +0200 +@@ -93,8 +93,8 @@ - PREFIX:=$(OBJDIR)/build - SBINDIR=$(PREFIX)/sbin + dnl ---Hard codes + +-CFLAGS='-Wall -g -fno-strict-aliasing $(CPPFLAGS)' +-BUILD_CFLAGS='-O2 -Wall $(CPPFLAGS)' ++CFLAGS="$CFLAGS -Wall -fno-strict-aliasing \$(CPPFLAGS)" ++BUILD_CFLAGS="$CFLAGS -Wall \$(CPPFLAGS)" + + dnl ---Sanity checks + if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kexec-tools-opt.patch?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sun Aug 28 12:21:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: proxytunnel.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:21:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: proxytunnel.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u SPECS/proxytunnel.spec:1.1 SPECS/proxytunnel.spec:1.2 --- SPECS/proxytunnel.spec:1.1 Sun Aug 28 10:18:20 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 12:21:53 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Proxy Tunnel ssh-over-https hack +Summary(pl): Tunel proxy ssh-po-https Name: proxytunnel Version: 1.5.0 Release: 0.1 @@ -15,7 +16,7 @@ somewhere on the network, through a standard HTTPS proxy. We mostly use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to do many things that wouldn't be possible without ProxyTunnel. -Proxytunnel can currently do the following: +ProxyTunnel can currently do the following: - Create tunnels using HTTP and HTTPS proxies (That understand the HTTP CONNECT command). - Work as a back-end driver for an OpenSSH client, and create SSH @@ -24,11 +25,23 @@ connections, and then tunneling these connections to a specified destination. +%description -l pl +ProxyTunnel to program ??cz?cy stdin i stdout do serwera gdzie? w +sieci poprzez standardowe proxy HTTPS. Jest u?ywany g??wnie do +tunelowania sesji SSH poprzez proxy HTTP(S), co pozwala na robienie +wielu rzeczy, kt?re nie by?yby mo?liwe bez niego. ProxyTunnel +aktualnie potrafi: +- tworzy? tunele przy u?yciu proxy HTTP i HTTPS (rozumiej?cych + polecenie HTTP CONNECT), +- dzia?a? jako sterownik backendu dla klienta OpenSSH i tworzy? + po??czenia SSH poprzez proxy HTTP(S), +- dzia?a? jako samodzielna aplikacja, nas?uchuj?c na jakim? porcie na + po??czenia, a nast?pnie tuneluj?c te po??czenia na podany adres. + %prep %setup -q %build - %{__make} \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" \ @@ -55,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 10:21:53 qboosh +- pl + Revision 1.1 2005/08/28 08:18:20 areq - Init PLD spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/proxytunnel.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 12:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: kexec-tools.spec - readded opt patch - synced descs - tar h... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - readded opt patch - synced descs - tar hack to avoid messing outside build subdir ---- Files affected: SPECS: kexec-tools.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.11 SPECS/kexec-tools.spec:1.12 --- SPECS/kexec-tools.spec:1.11 Sun Aug 28 10:28:30 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 12:22:51 2005 @@ -11,9 +11,12 @@ Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 +Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ +BuildRequires: autoconf BuildRequires: glibc-devel BuildRequires: zlib-devel +ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -25,22 +28,21 @@ generic code should work on any architecture. %description -l pl -Narz?dzie to pozwala wykorzysta? zaimplementowany w j?drach 2.5/2.6 -system pozwalaj?cy za?adowa? nast?pne j?dro bez konieczno?ci restartu -maszyny. Od momentu wydania polecenia kexec do startu nowego j?dra -up?ywa czas poni?ej 0.5 sekundy! - -Aktualna implementacja by?a testowana tylko na x86, ale og?lny kod -powinien dzia?a? na ka?dej architekturze. +kexec to zestaw wywo?a? systemowych pozwalaj?cych za?adowa? nast?pne +j?dro z poziomu aktualnie dzia?aj?cego j?dra Linuksa. Aktualna +implementacja by?a testowana tylko na x86, ale og?lny kod powinien +dzia?a? na ka?dej architekturze. %prep -%setup -q +%setup -q -c -T +# workaround for kexec-tools-%{version}.spec outside main directory in tarball +tar xzf %{SOURCE0} --strip-components=1 +%patch0 -p1 %build +%{__autoconf} %configure -%{__make} \ - CC="%{__cc}" \ - OPTFLAGS="%{rpmcflags}" +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -56,7 +58,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS TODO News README +%doc AUTHORS News README TODO %attr(755,root,root) %{_sbindir}/* %attr(755,root,root) %{_libdir}/%{name} @@ -66,6 +68,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 10:22:51 qboosh +- readded opt patch +- synced descs +- tar hack to avoid messing outside build subdir + Revision 1.11 2005/08/28 08:28:30 arekm - update BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:41:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xorg-app-twm.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:41:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-twm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.5 SPECS/xorg-app-twm.spec:1.6 --- SPECS/xorg-app-twm.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:41:02 2005 @@ -1,11 +1,13 @@ # $Revision$, $Date$ -Summary: twm application -Summary(pl): Aplikacja twm +Summary: Tab Window Manager for the X Window System +Summary(pl): Twm - podstawowy zarz?dca okien dla X Window System +Summary(ru): ??????? ??????? ???????? +Summary(uk): ??????? ???????? ???????? Name: xorg-app-twm Version: 0.99.0 Release: 0.02 License: MIT -Group: X11/Applications +Group: X11/Window Managers Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/twm-%{version}.tar.bz2 # Source0-md5: 7441654fbffb6da17118948523401022 Patch0: twm-man.patch @@ -15,13 +17,28 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-twm +Obsoletes: XFree86-twm +Obsoletes: twm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -twm application. +Twm is a window manager for the X Window System. It provides +titlebars, shaped windows, several forms of icon management, +user-defined macro functions, click-to-type and pointerdriven keyboard +focus, and user-specified key and pointer button bindings. %description -l pl -Aplikacja twm. +Twm jest zarz?dc? okien dla X Window System. Daje belki tytu?owe, +ramki okien, par? form zarz?dzania ikonami, definiowalne makra, +ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, +definiowalne przypisania klawiszy i przycisk?w myszy. + +%description twm -l ru +??????? ?????????? ??????? ????????. + +%description twm -l uk +??????? ?????????? ???????? ????????. %prep %setup -q -n twm-%{version} @@ -56,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:41:02 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:47:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xorg-app-xauth.spec - merged descs from X11.spec, Obsoletes... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xauth.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xauth.spec diff -u SPECS/xorg-app-xauth.spec:1.5 SPECS/xorg-app-xauth.spec:1.6 --- SPECS/xorg-app-xauth.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xauth.spec Sun Aug 28 12:47:32 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -Summary: xauth application -Summary(pl): Aplikacja xauth +Summary: xauth - X authority file utility +Summary(pl): xauth - narz?dzie do plik?w X authority Name: xorg-app-xauth Version: 0.99.0 Release: 0.02 @@ -14,13 +14,24 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xauth +Obsoletes: XFree86-xauth +Obsoletes: xauth BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xauth application. +The xauth program is used to edit and display the authorization +information used in connecting to the X server. This program is +usually used to extract authorization records from one machine and +merge them in on another (as is the case when using remote logins or +granting access to other users). %description -l pl -Aplikacja xauth. +Program xauth s?u?y do edycji i wy?wietlania informacji +autoryzacyjnych u?ywanych przy ??czeniu z X serwerem. Ten program +przewa?nie jest u?ywany do wyci?gania rekord?w autoryzacji z jednej +maszyny i do??czania ich na innej (w celu umo?liwienia zdalnego +logowania lub udost?pnienia innym u?ytkownikom). %prep %setup -q -n xauth-%{version} @@ -54,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:47:32 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xorg-app-xfs.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xfs.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xfs.spec diff -u SPECS/xorg-app-xfs.spec:1.5 SPECS/xorg-app-xfs.spec:1.6 --- SPECS/xorg-app-xfs.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xfs.spec Sun Aug 28 12:51:16 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ -Summary: xfs application -Summary(pl): Aplikacja xfs +Summary: Font server for X Window System +Summary(pl): Serwer font?w dla X Window System +Summary(ru): ?????????? ??? X Window System +Summary(uk): ?????????? ??? X Window System Name: xorg-app-xfs Version: 0.99.0 Release: 0.02 @@ -17,13 +19,33 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xfs +Obsoletes: XFree86-xfs +Obsoletes: xfs +Obsoletes: xfsft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xfs application. +This is a font server for X Window System. You can serve fonts to +other X servers remotely with this package, and the remote system will +be able to use all fonts installed on the font server, even if they +are not installed on the remote computer. %description -l pl -Aplikacja xfs. +Pakiet zawiera serwer font?w dla X Window System. Mo?e udost?pnia? +fonty dla X serwer?w lokalnych lub zdalnych. + +%description -l ru +xfs ???????? ?????? ??????? ??? X Window System. Xfs ????? ????? +????????????? ?????? ????????? X-????????. ????????? ??????? ????? +???????? ???????????? ??? ??????, ????????????? ?? ??????? ???????, +???? ???? ??? ?? ??????????? ?? ????????? ??????????. + +%description -l uk +xfs ??????? ?????? ??????? ??? X Window System. Xfs ????? ???? +???????? ?????? ?????????? X-????????. ????????? ??????? ????? +??????????????? ??? ??????, ??? ??????????? ?? ??????? ???????, ?????? +???? ???? ?? ??????????? ?? ??????????? ????'?????. %prep %setup -q -n xfs-%{version} @@ -60,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:51:16 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:15 2005 Subject: SPECS: xorg-app-twm.spec - copy-pastos In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy-pastos ---- Files affected: SPECS: xorg-app-twm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.6 SPECS/xorg-app-twm.spec:1.7 --- SPECS/xorg-app-twm.spec:1.6 Sun Aug 28 12:41:02 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:51:42 2005 @@ -34,10 +34,10 @@ ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, definiowalne przypisania klawiszy i przycisk?w myszy. -%description twm -l ru +%description -l ru ??????? ?????????? ??????? ????????. -%description twm -l uk +%description -l uk ??????? ?????????? ???????? ????????. %prep @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:51:42 qboosh +- copy-pastos + Revision 1.6 2005/08/28 10:41:02 qboosh - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: vigra.spec - updated to 1.3.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:55:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.3 ---- Files affected: SPECS: vigra.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/vigra.spec diff -u SPECS/vigra.spec:1.6 SPECS/vigra.spec:1.7 --- SPECS/vigra.spec:1.6 Sun Apr 3 00:30:48 2005 +++ SPECS/vigra.spec Sun Aug 28 12:54:58 2005 @@ -2,12 +2,12 @@ Summary: Generic Programming for Computer Vision Summary(pl): Og?lne programowanie obrazu komputerowego Name: vigra -Version: 1.3.2 +Version: 1.3.3 Release: 1 License: The VIGRA Artistic License Group: Libraries Source0: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz -# Source0-md5: 6a787f86df5e45be809ac97c86acddae +# Source0-md5: 518d546d5ebd9388fb0dc968c1e91280 Patch0: %{name}-ac.patch URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/ BuildRequires: autoconf @@ -17,7 +17,9 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libtiff-devel -BuildRequires: libtool >= 2:1.4d +BuildRequires: libtool >= 2:1.5 +#BuildRequires: python +#BuildRequires: python-devel BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -97,6 +99,8 @@ --with-tiff \ --with-zlib +# --with-python requires src/pythonbindings (missing in sources) + %{__make} %install @@ -141,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:54:58 qboosh +- updated to 1.3.3 + Revision 1.6 2005/04/02 22:30:48 qboosh - updated to 1.3.2, updated ac patch - BR: fftw3-devel instead of fftw-devel (fftw3 is preferred in configure) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vigra.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: vigra1.3.3.tar.gz Message-ID: <3016.1125226527@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/vigra1.3.3.tar.gz 518d546d5ebd9388fb0dc968c1e91280 vigra1.3.3.tar.gz Size: 12233525 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: sredird-2.2.2.tar.gz Message-ID: <10403.1125226831@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://metalab.unc.edu/pub/Linux/system/serial/sredird-2.2.2.tar.gz e541e4b1cb9fa8fc8ff0e76bb1127cda sredird-2.2.2.tar.gz Size: 25495 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: sredird.spec - updated to 2.2.2 (security fixes: remotely e... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) ---- Files affected: SPECS: sredird.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/sredird.spec diff -u SPECS/sredird.spec:1.11 SPECS/sredird.spec:1.12 --- SPECS/sredird.spec:1.11 Wed Sep 15 22:36:19 2004 +++ SPECS/sredird.spec Sun Aug 28 13:00:23 2005 @@ -1,15 +1,13 @@ # $Revision$, $Date$ -# TODO: -# - SECURITY: http://securitytracker.com/alerts/2004/Aug/1011038.html Summary: RFC 2217-compliant serial port redirector Summary(pl): Program przekierowuj?cy port szeregowy zgodny z RFC 2217 Name: sredird -Version: 2.2.1 +Version: 2.2.2 Release: 1 License: GPL Group: Networking Source0: ftp://metalab.unc.edu/pub/Linux/system/serial/%{name}-%{version}.tar.gz -# Source0-md5: a6b8f03ddb9657f533bd218110c3e635 +# Source0-md5: e541e4b1cb9fa8fc8ff0e76bb1127cda URL: http://www.ibiblio.org/pub/Linux/system/serial/!INDEX.html BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 11:00:23 qboosh +- updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) + Revision 1.11 2004/09/15 20:36:19 blues - URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sredird.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 13:05:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: sox-12.17.8.tar.gz Message-ID: <18826.1125227155@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/sox/sox-12.17.8.tar.gz 735e9add6979bd6308f213abefe389e8 sox-12.17.8.tar.gz Size: 462079 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:05:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: sox.spec - updated to 12.17.8 (bugfixes, incl. SMP buffer o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:05:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) ---- Files affected: SPECS: sox.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/sox.spec diff -u SPECS/sox.spec:1.43 SPECS/sox.spec:1.44 --- SPECS/sox.spec:1.43 Sat Dec 25 22:51:41 2004 +++ SPECS/sox.spec Sun Aug 28 13:05:51 2005 @@ -13,12 +13,12 @@ Summary(tr): Genel ama?l? ses dosyas? ?evirme arac? Summary(uk): ??????? ?????????? ??????????? ??? ?????? ?? ????????? ??????? Name: sox -Version: 12.17.7 +Version: 12.17.8 Release: 1 License: distributable Group: Applications/Sound Source0: http://dl.sourceforge.net/sox/%{name}-%{version}.tar.gz -# Source0-md5: a6876289602c1f2896b39e6a88e2a574 +# Source0-md5: 735e9add6979bd6308f213abefe389e8 Patch0: %{name}-play.patch Patch1: %{name}-install.patch URL: http://sox.sourceforge.net/ @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 11:05:51 qboosh +- updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) + Revision 1.43 2004/12/25 21:51:41 qboosh - updated to 12.17.7, updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sox.spec?r1=1.43&r2=1.44&f=u From wiget at pld-linux.org Sun Aug 28 13:27:37 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: asa-0.1.7.tar.gz Message-ID: <19159.1125228457@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apatsch.wroc.biz/asa/asa-0.1.7.tar.gz 2a754e9ab1220f79060a68a46a76cc6c asa-0.1.7.tar.gz Size: 24797 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:27:36 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: asa.spec - 0.1.7 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:27:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.1.7 ---- Files affected: SPECS: asa.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/asa.spec diff -u SPECS/asa.spec:1.17 SPECS/asa.spec:1.18 --- SPECS/asa.spec:1.17 Sat Jun 4 10:24:19 2005 +++ SPECS/asa.spec Sun Aug 28 13:27:30 2005 @@ -7,12 +7,12 @@ Summary: Jabber server component agent for sending SMS messages Summary(pl): Komponent serwera Jabbera do wysy?ania wiadomo?ci SMS Name: asa -Version: 0.1.6 -Release: 1.2 +Version: 0.1.7 +Release: 1 License: GPL Group: Applications/Communications Source0: http://www.apatsch.wroc.biz/asa/%{name}-%{version}.tar.gz -# Source0-md5: 1f758fe0f38e3dcd6863fbe93f7e814d +# Source0-md5: 2a754e9ab1220f79060a68a46a76cc6c Source1: jabber-asa-transport.init Source2: %{name}.sh Patch0: %{name}-PLD.patch @@ -105,6 +105,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 11:27:30 wiget +- 0.1.7 + Revision 1.17 2005/06/04 08:24:19 dzeus - added userrun.patch (runs as jabber user without su) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asa.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sun Aug 28 13:34:28 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: gnome-btdownload-0.0.22.tar.gz Message-ID: <28679.1125228868@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnome-bt/gnome-btdownload-0.0.22.tar.gz b52df0c8b0c28aa0cc8814ff4754cef9 gnome-btdownload-0.0.22.tar.gz Size: 154900 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:34:27 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: gnome-btdownload.spec - updated to 0.0.22 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:34:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.22 ---- Files affected: SPECS: gnome-btdownload.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/gnome-btdownload.spec diff -u SPECS/gnome-btdownload.spec:1.5 SPECS/gnome-btdownload.spec:1.6 --- SPECS/gnome-btdownload.spec:1.5 Sun May 1 08:38:59 2005 +++ SPECS/gnome-btdownload.spec Sun Aug 28 13:34:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME BitTorrent downloader Summary(pl): Narz?dzie do ?ci?gania protoko?em BitTorrent dla GNOME Name: gnome-btdownload -Version: 0.0.20 -Release: 2 +Version: 0.0.22 +Release: 1 License: BSD Group: X11/Applications Source0: http://dl.sourceforge.net/gnome-bt/%{name}-%{version}.tar.gz -# Source0-md5: dd7ad29c9c5689dc73a736d44dde2bef +# Source0-md5: b52df0c8b0c28aa0cc8814ff4754cef9 Patch0: %{name}-desktop.patch URL: http://gnome-bt.sourceforge.net/ BuildRequires: python-gnome-devel >= 2.10.0 @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 11:34:21 wiget +- updated to 0.0.22 + Revision 1.5 2005/05/01 06:38:59 ankry - unified caps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-btdownload.spec?r1=1.5&r2=1.6&f=u From areq at pld-linux.org Sun Aug 28 13:49:41 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: mISDN.spec (NEW) - new ISDN stack of the linux kernel versi... In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 11:49:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY ---- Files affected: SPECS: mISDN.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u /dev/null SPECS/mISDN.spec:1.1 --- /dev/null Sun Aug 28 13:49:41 2005 +++ SPECS/mISDN.spec Sun Aug 28 13:49:36 2005 @@ -0,0 +1,141 @@ +%bcond_without dist_kernel # allow non-distribution kernel +%bcond_without smp # don't build SMP module +%bcond_with verbose # verbose build (V=1) + +%define mISDN_version CVS-2005-07-06 + +Summary: mISDN - modular ISDN +Name: mISDN +Version: 2005.07.06 +%define _rel 0.1 +Release: %{_rel} +License: GPL +Group: Base/Kernel +Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/%{name}-%{mISDN_version}.tar.bz2 +# Source0-md5: f8892d49e00e3fa26e65e22084edd472 +URL: http://www.isdn4linux.de/mISDN/ +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} +BuildRequires: rpmbuild(macros) >= 1.217 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. + +%package -n kernel-isdn-mISDN +Summary: Linux driver for mISDN +Summary(pl): Sterownik dla Linuksa do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif + +%description -n kernel-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux module. + +%description -n kernel-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa. + +%package -n kernel-smp-isdn-mISDN +Summary: Linux SMP driver for mISDN +Summary(pl): Sterownik dla Linuksa SMP do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif + +%description -n kernel-smp-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux SMP module. + +%description -n kernel-smp-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa SMP. + +%prep +%setup -q -n %{name}-%{mISDN_version} + +mv Makefile.module Makefile + +%build + +for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then + exit 1 + fi + rm -rf include + install -d include/{linux,config} + ln -sf %{_kernelsrcdir}/config-$cfg .config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + touch include/config/MARKER + + %{__make} -C %{_kernelsrcdir} clean \ + RCS_FIND_IGNORE="-name '*.ko' -o" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + %{__make} -C %{_kernelsrcdir} modules \ + CC="%{__cc}" CPP="%{__cpp}" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + +# mv mISDN{,-$cfg}.ko +done + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/drivers/isdn/hardware/mISDN +install mISDN-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/ +%if %{with smp} && %{with dist_kernel} +install mISDN-smp.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/ +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%postun -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%post -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%postun -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%files -n kernel-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/*.ko* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel-smp-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/*.ko* +%endif + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 11:49:36 areq +- new ISDN stack of the linux kernel version 2.6 +- raw PLD spec, NFY + ================================================================ From glen at pld-linux.org Sun Aug 28 13:55:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: kexec-tools.spec - BR for tar --strip-components=1 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 11:55:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR for tar --strip-components=1 ---- Files affected: SPECS: kexec-tools.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.12 SPECS/kexec-tools.spec:1.13 --- SPECS/kexec-tools.spec:1.12 Sun Aug 28 12:22:51 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 13:55:43 2005 @@ -15,6 +15,7 @@ URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: autoconf BuildRequires: glibc-devel +BuildRequires: tar >= 1:1.15.1 BuildRequires: zlib-devel ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -68,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 11:55:43 glen +- BR for tar --strip-components=1 + Revision 1.12 2005/08/28 10:22:51 qboosh - readded opt patch - synced descs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sun Aug 28 14:03:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS (LINUX_2_6): kernel.spec - move mISDN to mISDN.spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 12:03:45 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - move mISDN to mISDN.spec ---- Files affected: SPECS: kernel.spec (1.441.2.1169 -> 1.441.2.1170) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1169 SPECS/kernel.spec:1.441.2.1170 --- SPECS/kernel.spec:1.441.2.1169 Sat Aug 27 22:00:19 2005 +++ SPECS/kernel.spec Sun Aug 28 14:03:39 2005 @@ -115,7 +115,6 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 -%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -169,10 +168,6 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config -Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 -# Source100-md5: f8892d49e00e3fa26e65e22084edd472 - - Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -626,7 +621,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} -a 100 +%setup -q -n linux-%{version}%{_rc} %patch0 -p1 %patch1 -p0 @@ -748,12 +743,6 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig -# mISDN -%ifarch %{ix86} -cd mISDN-%{mISDN_version} -./std2kern -k ../ -%endif - %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1501,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1170 2005/08/28 12:03:39 areq +- move mISDN to mISDN.spec + Revision 1.441.2.1169 2005/08/27 20:00:19 areq - add mISDN (ix86 only) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1169&r2=1.441.2.1170&f=u From wiget at pld-linux.org Sun Aug 28 15:08:44 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: openldap.spec - updated to 2.3.6 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 13:08:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.6 ---- Files affected: SPECS: openldap.spec (1.207 -> 1.208) ---- Diffs: ================================================================ Index: SPECS/openldap.spec diff -u SPECS/openldap.spec:1.207 SPECS/openldap.spec:1.208 --- SPECS/openldap.spec:1.207 Mon Aug 15 17:19:20 2005 +++ SPECS/openldap.spec Sun Aug 28 15:08:38 2005 @@ -19,12 +19,12 @@ Summary(ru): ??????? ???????? LDAP Summary(uk): ?????? ???????? LDAP Name: openldap -Version: 2.3.5 +Version: 2.3.6 Release: 1 License: OpenLDAP Public License Group: Networking/Daemons Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz -# Source0-md5: 732b5ac8c638155f1f27196ac9e0b9e2 +# Source0-md5: 672ec287ce61a7dba56762e95252fd28 Source1: ldap.init Source2: %{name}.sysconfig Source3: ldap.conf @@ -1257,6 +1257,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.208 2005/08/28 13:08:38 wiget +- updated to 2.3.6 + Revision 1.207 2005/08/15 15:19:20 qboosh - updated to 2.3.5, updated make_man_link patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap.spec?r1=1.207&r2=1.208&f=u From wiget at pld-linux.org Sun Aug 28 15:09:11 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: openldap-2.3.6.tgz Message-ID: <28875.1125234551@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.3.6.tgz 672ec287ce61a7dba56762e95252fd28 openldap-2.3.6.tgz Size: 3538388 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:11:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: wget-strptime.patch (REMOVED), wget-segv.patch (REMOVED) ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: wget-strptime.patch (1.1 -> NONE) (REMOVED), wget-segv.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 15:11:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: wget-ac.patch - more gettext and automake issues In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - more gettext and automake issues ---- Files affected: SOURCES: wget-ac.patch (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SOURCES/wget-ac.patch diff -u SOURCES/wget-ac.patch:1.12 SOURCES/wget-ac.patch:1.13 --- SOURCES/wget-ac.patch:1.12 Wed Jun 22 14:34:59 2005 +++ SOURCES/wget-ac.patch Sun Aug 28 15:11:47 2005 @@ -1,15 +1,19 @@ ---- wget-1.9.1/configure.in.orig 2003-11-08 20:15:35.000000000 +0100 -+++ wget-1.9.1/configure.in 2003-11-16 11:46:45.947950144 +0100 -@@ -541,7 +541,8 @@ - dnl new language was added. +--- wget-1.10.1/configure.in.orig 2005-08-11 23:35:27.000000000 +0200 ++++ wget-1.10.1/configure.in 2005-08-28 13:42:34.625493608 +0200 +@@ -437,6 +437,7 @@ + ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')` dnl internationalization macros --WGET_WITH_NLS +AM_GNU_GETTEXT -+WGET_WITH_NLS + WGET_WITH_NLS dnl - dnl Find makeinfo. We used to provide support for Emacs processing +@@ -473,5 +474,4 @@ + #include "config-post.h" + ]) + AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) +-AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO]) + AC_OUTPUT diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200 +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200 @@ -89,3 +93,32 @@ /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time +--- wget-1.10.1/m4/wget.m4.orig 2005-06-27 00:06:49.000000000 +0200 ++++ wget-1.10.1/m4/wget.m4 2005-08-28 13:31:58.190246472 +0200 +@@ -156,7 +156,7 @@ + # program @code{ansi2knr}, which comes with Ghostscript. + # @end defmac + +-AC_DEFUN(AM_PROG_CC_STDC, ++AC_DEFUN([AM_PROG_CC_STDC], + [AC_REQUIRE([AC_PROG_CC]) + AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) + AC_CACHE_VAL(am_cv_prog_cc_stdc, +@@ -390,7 +390,7 @@ + dnl This is not strictly an Autoconf macro, because it is run from + dnl within `config.status' rather than from within configure. This + dnl is why special rules must be applied for it. +-AC_DEFUN(WGET_PROCESS_PO, ++AC_DEFUN([WGET_PROCESS_PO], + [ + dnl I wonder what the following several lines do... + if test "x$srcdir" != "x."; then +@@ -426,7 +426,7 @@ + + dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, + dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN(AM_PATH_PROG_WITH_TEST, ++AC_DEFUN([AM_PATH_PROG_WITH_TEST], + [# Extract the first word of "$2", so it can be a program name with args. + set dummy $2; ac_word=[$]2 + AC_MSG_CHECKING([for $ac_word]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-ac.patch?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 15:12:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: wget-pl.patch - real update for 1.10.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:12:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - real update for 1.10.1 ---- Files affected: SOURCES: wget-pl.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/wget-pl.patch diff -u SOURCES/wget-pl.patch:1.7 SOURCES/wget-pl.patch:1.8 --- SOURCES/wget-pl.patch:1.7 Wed Jun 22 11:47:15 2005 +++ SOURCES/wget-pl.patch Sun Aug 28 15:12:43 2005 @@ -1,71 +1,2323 @@ ---- wget-1.9/po/pl.po.orig 2003-10-20 16:57:45.000000000 +0200 -+++ wget-1.9/po/pl.po 2003-10-26 01:45:36.000000000 +0200 -@@ -8,10 +8,10 @@ +--- wget-1.10.1/po/pl.po.orig 2005-08-16 23:59:28.000000000 +0200 ++++ wget-1.10.1/po/pl.po 2005-08-28 15:02:42.270620456 +0200 +@@ -5,184 +5,220 @@ + # Arkadiusz Mi?kiewicz , 1998-2000. + # Wojciech Kotwica 2002-03-20 11:12+01:00 + # v. 1.9-b5 by Emil Nowak 2003-10-15 00:28+02:00 ++# Jakub Bogusz , 2005 # msgid "" msgstr "" -"Project-Id-Version: wget 1.9-b5\n" -+"Project-Id-Version: wget 1.10\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-06 09:11-0400\n" +-"POT-Creation-Date: 2003-10-11 16:21+0200\n" -"PO-Revision-Date: 2003-10-15 00:28+02:00\n" -+"PO-Revision-Date: 2003-10-26 01:20+0200\n" - "Last-Translator: Wojciech Kotwica \n" +-"Last-Translator: Wojciech Kotwica \n" ++"Project-Id-Version: wget 1.10.1\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2005-08-28 13:44+0200\n" ++"PO-Revision-Date: 2005-08-28 13:10+0200\n" ++"Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" -@@ -71,9 +71,9 @@ + "Content-Type: text/plain; charset=iso-8859-2\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: src/connect.c:88 ++#: src/connect.c:199 + #, c-format +-msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" +-msgstr "Nieudana konwersja `%s' na powi?zany adres. Powr?t do ANY.\n" ++msgid "%s: unable to resolve bind address `%s'; disabling bind.\n" ++msgstr "%s: nie mo?na rozwi?za? adresu bind `%s'; wy??czanie bind.\n" + +-#: src/connect.c:165 ++#: src/connect.c:271 + #, c-format +-msgid "Connecting to %s[%s]:%hu... " +-msgstr "??czenie si? z %s[%s]:%hu... " ++msgid "Connecting to %s|%s|:%d... " ++msgstr "??czenie si? z %s|%s|:%d... " + +-#: src/connect.c:168 ++#: src/connect.c:274 + #, c-format +-msgid "Connecting to %s:%hu... " +-msgstr "??czenie si? z %s:%hu... " ++msgid "Connecting to %s:%d... " ++msgstr "??czenie si? z %s:%d... " + +-#: src/connect.c:222 ++#: src/connect.c:335 + msgid "connected.\n" + msgstr "po??czono.\n" + +-#: src/convert.c:171 ++#: src/connect.c:347 src/host.c:789 src/host.c:818 + #, c-format +-msgid "Converted %d files in %.2f seconds.\n" +-msgstr "Przekonwertowano %d plik?w w %.2f sekund.\n" ++msgid "failed: %s.\n" ++msgstr "nieudane: %s.\n" ++ ++#: src/convert.c:176 ++#, c-format ++msgid "Converted %d files in %.*f seconds.\n" ++msgstr "Przekonwertowano %d plik?w w %.*f sekund.\n" + +-#: src/convert.c:197 ++#: src/convert.c:202 + #, c-format + msgid "Converting %s... " + msgstr "Konwertowanie %s... " + +-#: src/convert.c:210 ++#: src/convert.c:215 + msgid "nothing to do.\n" + msgstr "nic do roboty.\n" + +-#: src/convert.c:218 src/convert.c:242 ++#: src/convert.c:223 src/convert.c:247 + #, c-format + msgid "Cannot convert links in %s: %s\n" + msgstr "Nie mo?na przekonwertowa? odno?nik?w w %s: %s\n" + +-#: src/convert.c:233 ++#: src/convert.c:238 + #, c-format + msgid "Unable to delete `%s': %s\n" + msgstr "Nie uda?o si? usun?? `%s': %s\n" + +-#: src/convert.c:439 ++#: src/convert.c:447 + #, c-format + msgid "Cannot back up %s as %s: %s\n" + msgstr "Nie mo?na stworzy? kopii zapasowej %s jako %s: %s\n" + +-#: src/cookies.c:606 ++#: src/cookies.c:619 + #, c-format + msgid "Error in Set-Cookie, field `%s'" msgstr "B??d w Set-Cookie, w polu `%s'" - #: src/cookies.c:643 +-#: src/cookies.c:629 -#, fuzzy, c-format ++#: src/cookies.c:643 +#, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" -msgstr "B??d sk?adni w Set-Cookie: przedwczesny koniec ci?gu znak?w.\n" +msgstr "B??d sk?adni w Set-Cookie: %s na pozycji %d.\n" ++ ++#: src/cookies.c:881 ++#, c-format ++msgid "Cookie coming from %s attempted to set domain to %s\n" ++msgstr "Ciasteczko pochodz?ce z %s pr?bowa?o ustawi? domen? na %s\n" + +-#: src/cookies.c:1426 ++#: src/cookies.c:1328 src/cookies.c:1477 + #, c-format + msgid "Cannot open cookies file `%s': %s\n" + msgstr "Nie mo?na otworzy? pliku ciasteczek `%s': %s\n" + +-#: src/cookies.c:1438 ++#: src/cookies.c:1489 + #, c-format + msgid "Error writing to `%s': %s\n" + msgstr "B??d podczas zapisu do `%s': %s\n" + +-#: src/cookies.c:1442 ++#: src/cookies.c:1492 + #, c-format + msgid "Error closing `%s': %s\n" + msgstr "B??d podczas zamykania `%s': %s\n" + +-#: src/ftp-ls.c:812 ++#: src/ftp-ls.c:843 + msgid "Unsupported listing type, trying Unix listing parser.\n" +-msgstr "Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" ++msgstr "" ++"Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" + +-#: src/ftp-ls.c:857 src/ftp-ls.c:859 ++#: src/ftp-ls.c:889 src/ftp-ls.c:891 + #, c-format + msgid "Index of /%s on %s:%d" + msgstr "Indeks /%s na %s:%d" + +-#: src/ftp-ls.c:882 ++#: src/ftp-ls.c:914 ++#, c-format + msgid "time unknown " + msgstr "czas nieznany " + +-#: src/ftp-ls.c:886 ++#: src/ftp-ls.c:918 ++#, c-format + msgid "File " + msgstr "Plik " + +-#: src/ftp-ls.c:889 ++#: src/ftp-ls.c:921 ++#, c-format + msgid "Directory " + msgstr "Katalog " + +-#: src/ftp-ls.c:892 ++#: src/ftp-ls.c:924 ++#, c-format + msgid "Link " + msgstr "Odno?nik " + +-#: src/ftp-ls.c:895 ++#: src/ftp-ls.c:927 ++#, c-format + msgid "Not sure " + msgstr "Nie pewny " + +-#: src/ftp-ls.c:913 ++#: src/ftp-ls.c:945 + #, c-format + msgid " (%s bytes)" + msgstr " (%s bajt?w)" + +-#. Second: Login with proper USER/PASS sequence. +-#: src/ftp.c:202 ++#: src/ftp.c:226 ++#, c-format ++msgid "Length: %s" ++msgstr "D?ugo??: %s" ++ ++#: src/ftp.c:232 src/http.c:1862 ++#, c-format ++msgid ", %s (%s) remaining" ++msgstr ", pozosta?o %s (%s)" ++ ++#: src/ftp.c:236 src/http.c:1866 ++#, c-format ++msgid ", %s remaining" ++msgstr ", pozosta?o %s" ++ ++#: src/ftp.c:239 ++msgid " (unauthoritative)\n" ++msgstr " (nie autorytatywne)\n" ++ ++#: src/ftp.c:314 + #, c-format + msgid "Logging in as %s ... " + msgstr "Logowanie si? jako %s ... " + +-#: src/ftp.c:215 src/ftp.c:268 src/ftp.c:299 src/ftp.c:353 src/ftp.c:468 +-#: src/ftp.c:519 src/ftp.c:551 src/ftp.c:611 src/ftp.c:675 src/ftp.c:748 +-#: src/ftp.c:796 ++#: src/ftp.c:327 src/ftp.c:373 src/ftp.c:402 src/ftp.c:454 src/ftp.c:566 ++#: src/ftp.c:612 src/ftp.c:640 src/ftp.c:698 src/ftp.c:759 src/ftp.c:819 ++#: src/ftp.c:866 + msgid "Error in server response, closing control connection.\n" + msgstr "B??d w odpowiedzi serwera, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:223 ++#: src/ftp.c:334 + msgid "Error in server greeting.\n" + msgstr "B??d w powitaniu serwera.\n" + +-#: src/ftp.c:231 src/ftp.c:362 src/ftp.c:477 src/ftp.c:560 src/ftp.c:621 +-#: src/ftp.c:685 src/ftp.c:758 src/ftp.c:806 ++#: src/ftp.c:341 src/ftp.c:462 src/ftp.c:574 src/ftp.c:648 src/ftp.c:708 ++#: src/ftp.c:769 src/ftp.c:829 src/ftp.c:876 + msgid "Write failed, closing control connection.\n" + msgstr "Niepowodzenie podczas zapisu, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:238 ++#: src/ftp.c:347 + msgid "The server refuses login.\n" + msgstr "Serwer nie pozwala na zalogowanie si?.\n" + +-#: src/ftp.c:245 ++#: src/ftp.c:353 + msgid "Login incorrect.\n" + msgstr "Nieprawid?owy login lub has?o.\n" + +-#: src/ftp.c:252 ++#: src/ftp.c:359 + msgid "Logged in!\n" + msgstr "Zalogowano si?!\n" + +-#: src/ftp.c:277 ++#: src/ftp.c:381 + msgid "Server error, can't determine system type.\n" + msgstr "B??d serwera, nie mo?na ustali? typu systemu.\n" + +-#: src/ftp.c:287 src/ftp.c:596 src/ftp.c:659 src/ftp.c:716 ++#: src/ftp.c:390 src/ftp.c:685 src/ftp.c:742 src/ftp.c:785 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:341 src/ftp.c:498 src/ftp.c:533 src/ftp.c:779 src/ftp.c:827 ++#: src/ftp.c:442 src/ftp.c:591 src/ftp.c:624 src/ftp.c:849 src/ftp.c:895 + msgid "done.\n" + msgstr "zrobiono.\n" + +-#: src/ftp.c:370 ++#: src/ftp.c:469 + #, c-format + msgid "Unknown type `%c', closing control connection.\n" + msgstr "Nieznany typ `%c', zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:383 ++#: src/ftp.c:481 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:389 ++#: src/ftp.c:487 + msgid "==> CWD not needed.\n" + msgstr "==> CWD nie jest potrzebne.\n" + +-#: src/ftp.c:484 ++#: src/ftp.c:580 + #, c-format + msgid "" + "No such directory `%s'.\n" +@@ -191,43 +227,33 @@ + "Nie ma katalogu `%s'.\n" + "\n" + +-#. do not CWD +-#: src/ftp.c:502 ++#: src/ftp.c:595 + msgid "==> CWD not required.\n" + msgstr "==> CWD nie wymagane.\n" + +-#: src/ftp.c:567 ++#: src/ftp.c:654 + msgid "Cannot initiate PASV transfer.\n" + msgstr "Nie mo?na zainicjowa? przesy?ania typu PASV.\n" + +-#: src/ftp.c:571 ++#: src/ftp.c:658 + msgid "Cannot parse PASV response.\n" + msgstr "Nie mo?na przeanalizowa? sk?adni odpowiedzi PASV.\n" + +-#: src/ftp.c:588 ++#: src/ftp.c:676 + #, c-format +-msgid "couldn't connect to %s:%hu: %s\n" +-msgstr "nie uda?o si? po??czy? z %s:%hu: %s\n" ++msgid "couldn't connect to %s port %d: %s\n" ++msgstr "nie uda?o si? po??czy? z %s na port %d: %s\n" + +-#: src/ftp.c:638 ++#: src/ftp.c:724 + #, c-format + msgid "Bind error (%s).\n" + msgstr "B??d Bind (%s).\n" + +-#: src/ftp.c:645 ++#: src/ftp.c:730 + msgid "Invalid PORT.\n" + msgstr "Nieprawid?owe PORT.\n" + +-#: src/ftp.c:698 +-#, c-format +-msgid "" +-"\n" +-"REST failed; will not truncate `%s'.\n" +-msgstr "" +-"\n" +-"REST nieudane; zawarto?? `%s' nie zostanie obci?ta.\n" +- +-#: src/ftp.c:705 ++#: src/ftp.c:776 + msgid "" + "\n" + "REST failed, starting from scratch.\n" +@@ -235,7 +261,7 @@ + "\n" + "REST nieudane, rozpoczynanie od pocz?tku.\n" + +-#: src/ftp.c:766 ++#: src/ftp.c:837 + #, c-format + msgid "" + "No such file `%s'.\n" +@@ -244,7 +270,7 @@ + "Nie ma pliku `%s'.\n" + "\n" + +-#: src/ftp.c:814 ++#: src/ftp.c:884 + #, c-format + msgid "" + "No such file or directory `%s'.\n" +@@ -253,86 +279,75 @@ + "Nie ma pliku ani katalogu `%s'.\n" + "\n" + +-#: src/ftp.c:898 src/ftp.c:906 ++#: src/ftp.c:946 src/http.c:1923 + #, c-format +-msgid "Length: %s" +-msgstr "D?ugo??: %s" ++msgid "%s has sprung into existence.\n" ++msgstr "%s zacz?? istnie?.\n" + +-#: src/ftp.c:900 src/ftp.c:908 +-#, c-format +-msgid " [%s to go]" +-msgstr " [%s do ko?ca]" +- +-#: src/ftp.c:910 +-msgid " (unauthoritative)\n" +-msgstr " (nie autorytatywne)\n" +- +-#: src/ftp.c:936 ++#: src/ftp.c:1008 + #, c-format + msgid "%s: %s, closing control connection.\n" + msgstr "%s: %s, zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:944 ++#: src/ftp.c:1016 + #, c-format + msgid "%s (%s) - Data connection: %s; " + msgstr "%s (%s) - Po??czenie danych: %s; " + +-#: src/ftp.c:961 ++#: src/ftp.c:1030 + msgid "Control connection closed.\n" + msgstr "Zamkni?to po??czenie steruj?ce.\n" + +-#: src/ftp.c:979 ++#: src/ftp.c:1049 + msgid "Data transfer aborted.\n" + msgstr "Przerwano przesy?anie danych.\n" + +-#: src/ftp.c:1044 ++#: src/ftp.c:1117 + #, c-format +-msgid "File `%s' already there, not retrieving.\n" ++msgid "File `%s' already there; not retrieving.\n" + msgstr "Plik `%s' ju? istnieje, bez pobierania.\n" + +-#: src/ftp.c:1114 src/http.c:1716 ++#: src/ftp.c:1185 src/http.c:2146 + #, c-format + msgid "(try:%2d)" + msgstr "(pr?ba:%2d)" + +-#: src/ftp.c:1180 src/http.c:1975 ++#: src/ftp.c:1255 src/http.c:2423 + #, c-format + msgid "" +-"%s (%s) - `%s' saved [%ld]\n" ++"%s (%s) - `%s' saved [%s]\n" + "\n" + msgstr "" +-"%s (%s) - zapisano `%s' [%ld]\n" ++"%s (%s) - zapisano `%s' [%s]\n" + "\n" + +-#: src/ftp.c:1222 src/main.c:890 src/recur.c:377 src/retr.c:596 ++#: src/ftp.c:1297 src/main.c:948 src/recur.c:376 src/retr.c:844 + #, c-format + msgid "Removing %s.\n" + msgstr "Usuwanie %s.\n" + +-#: src/ftp.c:1264 ++#: src/ftp.c:1339 + #, c-format + msgid "Using `%s' as listing tmp file.\n" + msgstr "U?ycie `%s' jako tymczasowego pliku dla listy.\n" + +-#: src/ftp.c:1279 ++#: src/ftp.c:1354 + #, c-format + msgid "Removed `%s'.\n" + msgstr "Usuni?to `%s'.\n" + +-#: src/ftp.c:1314 ++#: src/ftp.c:1389 + #, c-format + msgid "Recursion depth %d exceeded max. depth %d.\n" + msgstr "G??boko?? rekurencji %d przekroczy?a maksymaln? g??boko?? %d.\n" + +-#. Remote file is older, file sizes can be compared and +-#. are both equal. +-#: src/ftp.c:1384 ++#: src/ftp.c:1459 + #, c-format + msgid "Remote file no newer than local file `%s' -- not retrieving.\n" +-msgstr "Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" ++msgstr "" ++"Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" + +-#. Remote file is newer or sizes cannot be matched +-#: src/ftp.c:1391 ++#: src/ftp.c:1466 + #, c-format + msgid "" + "Remote file is newer than local file `%s' -- retrieving.\n" +@@ -341,21 +356,20 @@ + "Plik po stronie serwera jest nowszy ni? lokalny `%s' -- pobieranie.\n" + "\n" + +-#. Sizes do not match +-#: src/ftp.c:1398 ++#: src/ftp.c:1473 + #, c-format + msgid "" +-"The sizes do not match (local %ld) -- retrieving.\n" ++"The sizes do not match (local %s) -- retrieving.\n" + "\n" + msgstr "" +-"Rozmiary si? r??ni? (lokalny %ld) -- pobieranie.\n" ++"Rozmiary si? r??ni? (lokalny %s) -- pobieranie.\n" + "\n" + +-#: src/ftp.c:1415 ++#: src/ftp.c:1491 + msgid "Invalid name of the symlink, skipping.\n" + msgstr "Nieprawid?owa nazwa dowi?zania symbolicznego, pomijanie.\n" + +-#: src/ftp.c:1432 ++#: src/ftp.c:1508 + #, c-format + msgid "" + "Already have correct symlink %s -> %s\n" +@@ -364,70 +378,62 @@ + "Ju? istnieje poprawne dowi?zanie symboliczne %s -> %s\n" + "\n" + +-#: src/ftp.c:1440 ++#: src/ftp.c:1516 + #, c-format + msgid "Creating symlink %s -> %s\n" + msgstr "Tworzenie dowi?zania symbolicznego %s -> %s\n" + +-#: src/ftp.c:1451 ++#: src/ftp.c:1526 + #, c-format + msgid "Symlinks not supported, skipping symlink `%s'.\n" +-msgstr "Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" ++msgstr "" ++"Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" + +-#: src/ftp.c:1463 ++#: src/ftp.c:1538 + #, c-format + msgid "Skipping directory `%s'.\n" + msgstr "Pomijanie katalogu `%s'.\n" + +-#: src/ftp.c:1472 ++#: src/ftp.c:1547 + #, c-format + msgid "%s: unknown/unsupported file type.\n" + msgstr "%s: nieznany/nieobs?ugiwany typ pliku.\n" + +-#: src/ftp.c:1499 ++#: src/ftp.c:1574 + #, c-format + msgid "%s: corrupt time-stamp.\n" + msgstr "%s: znacznik czasowy uszkodzony.\n" + +-#: src/ftp.c:1524 ++#: src/ftp.c:1602 + #, c-format + msgid "Will not retrieve dirs since depth is %d (max %d).\n" + msgstr "Nie b?d? pobierane katalogi, gdy? g??boko?? wynosi %d (maks. %d).\n" + +-#: src/ftp.c:1574 ++#: src/ftp.c:1652 + #, c-format + msgid "Not descending to `%s' as it is excluded/not-included.\n" + msgstr "Bez wchodzenia do `%s', poniewa? jest on wy??czony/nie-w??czony.\n" + +-#: src/ftp.c:1639 src/ftp.c:1652 ++#: src/ftp.c:1718 src/ftp.c:1732 + #, c-format + msgid "Rejecting `%s'.\n" + msgstr "Odrzucanie `%s'.\n" + +-#. No luck. +-#. #### This message SUCKS. We should see what was the +-#. reason that nothing was retrieved. +-#: src/ftp.c:1698 ++#: src/ftp.c:1778 + #, c-format + msgid "No matches on pattern `%s'.\n" + msgstr "Brak pasuj?cych do wzorca `%s'.\n" + +-#: src/ftp.c:1764 ++#: src/ftp.c:1844 + #, c-format +-msgid "Wrote HTML-ized index to `%s' [%ld].\n" +-msgstr "Zapisano indeks w postaci HTML-u w `%s' [%ld].\n" ++msgid "Wrote HTML-ized index to `%s' [%s].\n" ++msgstr "Zapisano indeks w postaci HTML-a w `%s' [%s].\n" + +-#: src/ftp.c:1769 ++#: src/ftp.c:1849 + #, c-format + msgid "Wrote HTML-ized index to `%s'.\n" + msgstr "Zapisano indeks w postaci HTML-u w `%s'.\n" + +-#: src/gen_sslfunc.c:117 +-msgid "Could not seed OpenSSL PRNG; disabling SSL.\n" +-msgstr "" +-"Nie da?o si? ustali? ziarna generatora liczb pseudolosowych dla OpenSSL;\n" +-"wy??czenie SSL.\n" +- + #: src/getopt.c:675 + #, c-format + msgid "%s: option `%s' is ambiguous\n" +@@ -448,19 +454,16 @@ + msgid "%s: option `%s' requires an argument\n" + msgstr "%s: opcja `%s' wymaga argumentu\n" + +-#. --option + #: src/getopt.c:752 + #, c-format + msgid "%s: unrecognized option `--%s'\n" + msgstr "%s: nierozpoznana opcja `--%s'\n" + <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-pl.patch?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: wget.spec - updated to 1.10.1, removed obsolete strptime, se... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches ---- Files affected: SPECS: wget.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/wget.spec diff -u SPECS/wget.spec:1.121 SPECS/wget.spec:1.122 --- SPECS/wget.spec:1.121 Wed Jul 13 21:04:02 2005 +++ SPECS/wget.spec Sun Aug 28 15:13:54 2005 @@ -8,12 +8,12 @@ Summary(uk): ??????? ??? ????????? ?????? ?? ?????????? HTTP ?? FTP Summary(zh_CN): [????]??????????????????,???????????? Name: wget -Version: 1.10 -Release: 2 +Version: 1.10.1 +Release: 1 License: GPL Group: Networking/Utilities Source0: ftp://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz -# Source0-md5: caddc199d2cb31969e32b19fd365b0c5 +# Source0-md5: 879a15cc9093796b8a5035ff0d0d25ad Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f Patch0: %{name}-info.patch @@ -21,13 +21,10 @@ Patch2: %{name}-pl.patch Patch3: %{name}-wgetrc_path.patch Patch4: %{name}-home_etc.patch -Patch5: %{name}-strptime.patch -Patch6: %{name}-segv.patch URL: http://sunsite.dk/wget/ -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: intltool BuildRequires: libtool BuildRequires: openssl-devel >= 0.9.7d BuildRequires: texinfo @@ -114,18 +111,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 rm -f doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion mv -f po/{no,nb}.po %build -mv ac{local,include}.m4 %{__libtoolize} %{__gettextize} -intltoolize --copy --force -%{__aclocal} +%{__aclocal} -I m4 %{__autoheader} %{__autoconf} %configure \ @@ -161,7 +154,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS TODO README MAILING-LIST rmold.README -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/%{name}rc +%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}rc %attr(755,root,root) %{_bindir}/* %{_mandir}/man1/* %lang(hu) %{_mandir}/hu/man1/* @@ -174,6 +167,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 13:13:54 qboosh +- updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches + Revision 1.121 2005/07/13 19:04:02 qboosh - added segv patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wget.spec?r1=1.121&r2=1.122&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: wget-1.10.1.tar.gz wget-non-english-man-pages.tar.bz2 Message-ID: <4092.1125234847@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnu.org/gnu/wget/wget-1.10.1.tar.gz 879a15cc9093796b8a5035ff0d0d25ad wget-1.10.1.tar.gz Size: 1212784 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/wget-non-english-man-pages.tar.bz2 d8b2b56ec7461606c22edbafaf8a418f wget-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:17:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: mISDN.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:17:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: mISDN.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u SPECS/mISDN.spec:1.1 SPECS/mISDN.spec:1.2 --- SPECS/mISDN.spec:1.1 Sun Aug 28 13:49:36 2005 +++ SPECS/mISDN.spec Sun Aug 28 15:17:36 2005 @@ -1,10 +1,14 @@ +# $Revision$, $Date$ +# +# Conditional build: %bcond_without dist_kernel # allow non-distribution kernel %bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) - +# %define mISDN_version CVS-2005-07-06 Summary: mISDN - modular ISDN +Summary(pl): mISDN - modularny ISDN Name: mISDN Version: 2005.07.06 %define _rel 0.1 @@ -19,7 +23,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. +mISDN (modular ISDN) is the new ISDN stack of the Linux kernel version +2.6. + +%description -l pl +mISDN (modularny ISDN) to nowy stos ISDN dla j?dra Linuksa w wersji +2.6. %package -n kernel-isdn-mISDN Summary: Linux driver for mISDN @@ -135,7 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 13:17:36 qboosh +- pl desc + Revision 1.1 2005/08/28 11:49:36 areq - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mISDN.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 15:26:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: audit-1.0.3.tar.gz Message-ID: <23401.1125235603@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.redhat.com/sgrubb/audit/audit-1.0.3.tar.gz 950daad97adfa3134289aa5b4e885f8f audit-1.0.3.tar.gz Size: 98835 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:26:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: audit.spec - updated to 1.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:26:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.3 ---- Files affected: SPECS: audit.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.4 SPECS/audit.spec:1.5 --- SPECS/audit.spec:1.4 Sat Jun 18 00:06:19 2005 +++ SPECS/audit.spec Sun Aug 28 15:26:36 2005 @@ -2,12 +2,12 @@ Summary: User space tools for 2.6 kernel auditing Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit -Version: 0.9.7 +Version: 1.0.3 Release: 0.1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz -# Source0-md5: 8548fbe16c3c44bdcc045fba0f35a070 +# Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h URL: http://people.redhat.com/sgrubb/audit/ @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 13:26:36 qboosh +- updated to 1.0.3 + Revision 1.4 2005/06/17 22:06:19 qboosh - added missing update info to last commit message ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: libassuan.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libassuan.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/libassuan.spec diff -u SPECS/libassuan.spec:1.19 SPECS/libassuan.spec:1.20 --- SPECS/libassuan.spec:1.19 Thu Jun 23 21:54:59 2005 +++ SPECS/libassuan.spec Sun Aug 28 15:58:03 2005 @@ -15,7 +15,7 @@ # Source0-md5: 4cde037c3fcb2f0eeb695b1db6e56bba Patch0: %{name}-shared.patch Patch1: %{name}-info.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libassuan/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9.3 BuildRequires: libtool @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/28 13:58:03 qboosh +- more specific URL + Revision 1.19 2005/06/23 19:54:59 qboosh - updated to 0.6.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libassuan.spec?r1=1.19&r2=1.20&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: libgpg-error.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libgpg-error.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/libgpg-error.spec diff -u SPECS/libgpg-error.spec:1.17 SPECS/libgpg-error.spec:1.18 --- SPECS/libgpg-error.spec:1.17 Thu Jun 23 22:01:41 2005 +++ SPECS/libgpg-error.spec Sun Aug 28 15:58:44 2005 @@ -9,7 +9,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz # Source0-md5: ee23cdd5fbbb1483676647a8e091ff8e Patch0: %{name}-pl.po-update.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libgpg-error/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.7.6 BuildRequires: gettext-devel >= 0.12.1 @@ -127,6 +127,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 13:58:44 qboosh +- more specific URL + Revision 1.17 2005/06/23 20:01:41 qboosh - updated to 1.1 (bugfixes) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgpg-error.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Sun Aug 28 15:59:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: libksba.spec - added URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:59:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added URL ---- Files affected: SPECS: libksba.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/libksba.spec diff -u SPECS/libksba.spec:1.26 SPECS/libksba.spec:1.27 --- SPECS/libksba.spec:1.26 Sat Aug 13 16:37:39 2005 +++ SPECS/libksba.spec Sun Aug 28 15:59:45 2005 @@ -12,6 +12,7 @@ # Source0-md5: 4d40a09134c5a0d2dcc6416f9abdcc98 Patch0: %{name}-info.patch Patch1: %{name}-link.patch +URL: http://www.gnupg.org/related_software/libksba/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.9.3 BuildRequires: libgpg-error-devel >= 0.7 @@ -124,6 +125,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 13:59:45 qboosh +- added URL + Revision 1.26 2005/08/13 14:37:39 qboosh - updated to 0.9.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libksba.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Sun Aug 28 16:23:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: gsti-link.patch (NEW) - linking fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:23:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - linking fix ---- Files affected: SOURCES: gsti-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gsti-link.patch diff -u /dev/null SOURCES/gsti-link.patch:1.1 --- /dev/null Sun Aug 28 16:23:54 2005 +++ SOURCES/gsti-link.patch Sun Aug 28 16:23:49 2005 @@ -0,0 +1,10 @@ +--- gsti-0.3.0/src/Makefile.am.orig 2005-07-13 11:00:45.000000000 +0200 ++++ gsti-0.3.0/src/Makefile.am 2005-08-28 16:13:05.131648000 +0200 +@@ -29,6 +29,7 @@ + + AM_CFLAGS = @GPG_ERROR_CFLAGS@ @LIBGCRYPT_CFLAGS@ + ++libgsti_la_LIBADD = $(LIBGCRYPT_LIBS) + libgsti_la_LDFLAGS = -version-info \ + @LIBGSTI_LT_CURRENT@:@LIBGSTI_LT_REVISION@:@LIBGSTI_LT_AGE@ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:24:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: gsti-0.3.0.tar.bz2 Message-ID: <7016.1125239088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/gsti-0.3.0.tar.bz2 e748f986f621b3d8d8579368ba7e4b1f gsti-0.3.0.tar.bz2 Size: 311569 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:24:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: gsti.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:24:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: gsti.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/gsti.spec diff -u /dev/null SPECS/gsti.spec:1.1 --- /dev/null Sun Aug 28 16:24:50 2005 +++ SPECS/gsti.spec Sun Aug 28 16:24:45 2005 @@ -0,0 +1,101 @@ +# $Revision$, $Date$ +Summary: GNU Secure Transport Initiative +Summary(pl): GNU Secure Transport Initiative - biblioteka bezpiecznego transportu +Name: gsti +Version: 0.3.0 +Release: 1 +License: GPL v2+ +Group: Libraries +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/%{name}-%{version}.tar.bz2 +# Source0-md5: e748f986f621b3d8d8579368ba7e4b1f +Patch0: %{name}-link.patch +URL: http://www.gnupg.org/ +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1.9.3 +BuildRequires: libgcrypt-devel >= 1.2.0 +BuildRequires: libgpg-error-devel >= 1.0 +BuildRequires: libtool +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This is a library which implements a basic part of the protocol used +by SSH to create a secure transport channel. + +%description -l pl +Ta biblioteka implementuje podstawow? cz??? protoko?u u?ywanego przez +SSH do stworzenia bezpiecznego kana?u transportowego. + +%package devel +Summary: Header files for GSTI library +Summary(pl): Pliki nag??wkowe biblioteki GSTI +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for GSTI library. + +%description devel -l pl +Pliki nag??wkowe biblioteki GSTI. + +%package static +Summary: Static GSTI library +Summary(pl): Statyczna biblioteka GSTI +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static GSTI library. + +%description static -l pl +Statyczna biblioteka GSTI. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure +%{__make} + +%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(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README* TODO doc/*.txt +%attr(755,root,root) %{_libdir}/libgsti.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gsti-config +%attr(755,root,root) %{_libdir}/libgsti.so +%{_libdir}/libgsti.la +%{_includedir}/gsti.h +%{_aclocaldir}/gsti.m4 + +%files static +%defattr(644,root,root,755) +%{_libdir}/libgsti.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 14:24:45 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:39:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: linux-libc-headers-audit.patch (NEW) - change References: Message-ID: Author: qboosh Date: Sun Aug 28 14:39:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change to userspace version + little update (from 2.6.13-something?) to get usable ---- Files affected: SOURCES: linux-libc-headers-audit.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-audit.patch diff -u /dev/null SOURCES/linux-libc-headers-audit.patch:1.1 --- /dev/null Sun Aug 28 16:39:32 2005 +++ SOURCES/linux-libc-headers-audit.patch Sun Aug 28 16:39:26 2005 @@ -0,0 +1,123 @@ +--- linux-libc-headers-2.6.12.0/include/linux/audit.h.orig 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/audit.h 2005-08-28 16:35:11.219052000 +0200 +@@ -24,21 +24,53 @@ + #ifndef _LINUX_AUDIT_H_ + #define _LINUX_AUDIT_H_ + +-#include +-#include ++#include + +-#include +-#include ++/* The netlink messages for the audit system is divided into blocks: ++ * 1000 - 1099 are for commanding the audit system ++ * 1100 - 1199 user space trusted application messages ++ * 1200 - 1299 messages internal to the audit daemon ++ * 1300 - 1399 audit event messages ++ * 1400 - 1499 SE Linux use ++ * 1500 - 1999 future use ++ * 2000 is for otherwise unclassified kernel audit messages ++ * ++ * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user ++ * space. Anything over that is kernel --> user space communication. ++ */ ++#define AUDIT_GET 1000 /* Get status */ ++#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ ++#define AUDIT_LIST 1002 /* List syscall filtering rules */ ++#define AUDIT_ADD 1003 /* Add syscall filtering rule */ ++#define AUDIT_DEL 1004 /* Delete syscall filtering rule */ ++#define AUDIT_USER 1005 /* Message from userspace -- deprecated */ ++#define AUDIT_LOGIN 1006 /* Define the login id and information */ ++#define AUDIT_WATCH_INS 1007 /* Insert file/dir watch entry */ ++#define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ ++#define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ ++#define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ ++ ++#define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages uninteresting to kernel */ ++#define AUDIT_LAST_USER_MSG 1199 ++ ++#define AUDIT_DAEMON_START 1200 /* Daemon startup record */ ++#define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ ++#define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */ ++#define AUDIT_DAEMON_CONFIG 1203 /* Daemon config change */ ++ ++#define AUDIT_SYSCALL 1300 /* Syscall event */ ++#define AUDIT_FS_WATCH 1301 /* Filesystem watch event */ ++#define AUDIT_PATH 1302 /* Filname path information */ ++#define AUDIT_IPC 1303 /* IPC record */ ++#define AUDIT_SOCKETCALL 1304 /* sys_socketcall arguments */ ++#define AUDIT_CONFIG_CHANGE 1305 /* Audit system configuration change */ ++#define AUDIT_SOCKADDR 1306 /* sockaddr copied as syscall arg */ ++ ++#define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ ++#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ ++#define AUDIT_AVC_PATH 1402 /* dentry, vfsmount pair from avc */ + +-/* Request and reply types */ +-#define AUDIT_GET 1000 /* Get status */ +-#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ +-#define AUDIT_LIST 1002 /* List filtering rules */ +-#define AUDIT_ADD 1003 /* Add filtering rule */ +-#define AUDIT_DEL 1004 /* Delete filtering rule */ +-#define AUDIT_USER 1005 /* Send a message from user-space */ +-#define AUDIT_LOGIN 1006 /* Define the login id and informaiton */ +-#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ ++#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ + + /* Rule flags */ + #define AUDIT_PER_TASK 0x01 /* Apply rule at task creation (not syscall) */ +@@ -55,7 +87,7 @@ + * AUDIT_LIST commands must be implemented. */ + #define AUDIT_MAX_FIELDS 64 + #define AUDIT_BITMASK_SIZE 64 +-#define AUDIT_WORD(nr) ((__u32)((nr)/32)) ++#define AUDIT_WORD(nr) ((uint32_t)((nr)/32)) + #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) + + /* Rule fields */ +@@ -135,29 +167,24 @@ + #define AUDIT_ARCH_V850 (EM_V850|__AUDIT_ARCH_LE) + #define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + +-struct audit_message { +- struct nlmsghdr nlh; +- char data[1200]; +-}; +- + struct audit_status { +- __u32 mask; /* Bit mask for valid entries */ +- __u32 enabled; /* 1 = enabled, 0 = disbaled */ +- __u32 failure; /* Failure-to-log action */ +- __u32 pid; /* pid of auditd process */ +- __u32 rate_limit; /* messages rate limit (per second) */ +- __u32 backlog_limit; /* waiting messages limit */ +- __u32 lost; /* messages lost */ +- __u32 backlog; /* messages waiting in queue */ ++ uint32_t mask; /* Bit mask for valid entries */ ++ uint32_t enabled; /* 1 = enabled, 0 = disabled */ ++ uint32_t failure; /* Failure-to-log action */ ++ uint32_t pid; /* pid of auditd process */ ++ uint32_t rate_limit; /* messages rate limit (per second) */ ++ uint32_t backlog_limit; /* waiting messages limit */ ++ uint32_t lost; /* messages lost */ ++ uint32_t backlog; /* messages waiting in queue */ + }; + + struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ +- __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ +- __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ +- __u32 field_count; +- __u32 mask[AUDIT_BITMASK_SIZE]; +- __u32 fields[AUDIT_MAX_FIELDS]; +- __u32 values[AUDIT_MAX_FIELDS]; ++ uint32_t flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ ++ uint32_t action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ ++ uint32_t field_count; ++ uint32_t mask[AUDIT_BITMASK_SIZE]; ++ uint32_t fields[AUDIT_MAX_FIELDS]; ++ uint32_t values[AUDIT_MAX_FIELDS]; + }; + +-#endif ++#endif /* _LINUX_AUDIT_H_ */ ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:40:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: linux-libc-headers.spec - added audit patch, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:40:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added audit patch, release 4 ---- Files affected: SPECS: linux-libc-headers.spec (1.100 -> 1.101) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.100 SPECS/linux-libc-headers.spec:1.101 --- SPECS/linux-libc-headers.spec:1.100 Tue Aug 23 19:48:17 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 16:39:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 3 +Release: 4 Epoch: 7 License: GPL Group: Development @@ -16,6 +16,8 @@ Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch Patch6: %{name}-endian.patch +# based on http://people.redhat.com/sgrubb/audit/audit.h +Patch7: %{name}-audit.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -60,6 +62,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %ifarch %{x8664} @@ -174,6 +177,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.101 2005/08/28 14:39:56 qboosh +- added audit patch, release 4 + Revision 1.100 2005/08/23 17:48:17 qboosh - bugfix in endian patch, release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.100&r2=1.101&f=u From qboosh at pld-linux.org Sun Aug 28 16:48:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: gplflash2-link.patch - updated for 20050828 snap In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:48:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 20050828 snap ---- Files affected: SOURCES: gplflash2-link.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gplflash2-link.patch diff -u SOURCES/gplflash2-link.patch:1.1 SOURCES/gplflash2-link.patch:1.2 --- SOURCES/gplflash2-link.patch:1.1 Sat Jun 11 20:27:27 2005 +++ SOURCES/gplflash2-link.patch Sun Aug 28 16:48:28 2005 @@ -1,16 +1,16 @@ ---- gplflash2/plugins/mozilla/Makefile.am.orig 2005-04-24 22:51:39.000000000 +0200 -+++ gplflash2/plugins/mozilla/Makefile.am 2005-06-11 18:30:08.627104256 +0200 +--- gplflash2/plugins/mozilla/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/plugins/mozilla/Makefile.am 2005-08-28 15:36:07.130835376 +0200 @@ -13,15 +13,8 @@ OPTIMIZER=$(OPTFLAGS) SHARED=-shared -libnpflash_la_LIBADD = ../../lib/libflash2.la -+libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) -lXt ++libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) -lXt libnpflash_la_SOURCES = flash_interface.cc plugin.c npunix.c -libnpflash_la_CFLAGS = -fpic -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) +libnpflash_la_CFLAGS = -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) - libnpflash_la_CXXFLAGS = $(FREETYPE_CFLAGS) --libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) + libnpflash_la_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) +-libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) - -install-pluginLTLIBRARIES: $(plugin_LIBRARIES) - mkdir -p $(PLUGIN_DIR) @@ -19,8 +19,8 @@ -uninstall-pluginLTLIBRARIES: $(plugin_LIBRARIES) - rm -f $(PLUGIN_DIR)/libnpflash.so +libnpflash_la_LDFLAGS = -avoid-version ---- gplflash2/player/Makefile.am.orig 2005-04-24 22:51:38.000000000 +0200 -+++ gplflash2/player/Makefile.am 2005-06-11 19:08:01.235615248 +0200 +--- gplflash2/player/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/player/Makefile.am 2005-08-28 15:36:58.912963296 +0200 @@ -1,13 +1,12 @@ bin_PROGRAMS = flashplayer @@ -32,8 +32,8 @@ flashplayer.cc - flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBSDL) $(LIBXML2) + flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(SDL_LIBS) $(XML_LIBS) -flashplayer_includedir = $(includedir) +flashplayer_includedir = $(includedir) - flashplayer_CXXFLAGS = $(FREETYPE_CFLAGS) + flashplayer_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) flashplayer_LDADD = ../lib/libflash2.la $(LIBFFMPEG) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gplflash2-link.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 16:50:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: gplflash2-20050828.tar.bz2 Message-ID: <11469.1125240605@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gplflash2-20050828.tar.bz2 865d6ae3795523343b9d51ee23772613 gplflash2-20050828.tar.bz2 Size: 332038 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:50:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: gplflash2.spec - updated to todays snap (20050828), updated... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:50:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to todays snap (20050828), updated link patch ---- Files affected: SPECS: gplflash2.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/gplflash2.spec diff -u SPECS/gplflash2.spec:1.3 SPECS/gplflash2.spec:1.4 --- SPECS/gplflash2.spec:1.3 Sat Jun 11 20:28:27 2005 +++ SPECS/gplflash2.spec Sun Aug 28 16:50:01 2005 @@ -1,27 +1,27 @@ # $Revision$, $Date$ -%define _snap 20050605 +%define _snap 20050828 Summary: Flash animations redering library Summary(pl): Biblioteka renderuj?ca animacje Flash Name: gplflash2 Version: 0.1.0 -Release: 1 +Release: 0.%{_snap}.1 License: GPL Group: Libraries -Source0: %{name}-%{_snap}.tar.gz -# Source0-md5: 2f307955c081689c294f664ff90313ee +Source0: %{name}-%{_snap}.tar.bz2 +# Source0-md5: 865d6ae3795523343b9d51ee23772613 Patch0: %{name}-link.patch URL: http://gplflash.sourceforge.net/ BuildRequires: OpenGL-devel BuildRequires: SDL-devel >= 1.2.8 BuildRequires: XFree86-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: ffmpeg-devel -BuildRequires: freetype-devel >= 2.0 +BuildRequires: freetype-devel >= 2.1.7 BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel >= 1.1.4 Obsoletes: flash @@ -47,9 +47,9 @@ Summary(pl): Pliki nag??wkowe wymagane przez programy u?ywaj?ce gplflash2 Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: freetype-devel >= 2.0 +Requires: freetype-devel >= 2.1.7 Requires: libstdc++-devel -Requires: libxml2-devel +Requires: libxml2-devel >= 2.6.0 Requires: zlib-devel >= 1.1.4 Obsoletes: flash-devel @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 14:50:01 qboosh +- updated to todays snap (20050828), updated link patch + Revision 1.3 2005/06/11 18:28:27 qboosh - added link patch, some install hacks not needed now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash2.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 16:53:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 14:53:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.23 SPECS/fonts-TTF-microsoft.spec:1.24 --- SPECS/fonts-TTF-microsoft.spec:1.23 Fri Jul 22 11:18:37 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 16:53:01 2005 @@ -59,7 +59,7 @@ %description Microsoft free True Type fonts collection. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: @@ -70,7 +70,7 @@ %description -l pl Kolekcja darmowych font?w True Type firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -90,7 +90,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -192,6 +192,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 14:53:01 glen +- use without macro + Revision 1.23 2005/07/22 09:18:37 deejay1 - rel up to 5 @@ -252,7 +255,7 @@ - make spec non-interactive; release 3 Revision 1.5 2002/11/27 19:36:46 juandon -- new %%doc +- new %doc Revision 1.4 2002/09/11 16:19:30 adgor - Updated source URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Sun Aug 28 17:08:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-microsoft.spec - removed ftp url, which is 1) poi... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:08:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.24 SPECS/fonts-TTF-microsoft.spec:1.25 --- SPECS/fonts-TTF-microsoft.spec:1.24 Sun Aug 28 16:53:01 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:08:05 2005 @@ -65,7 +65,6 @@ with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl @@ -76,7 +75,6 @@ pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -192,6 +190,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 15:08:05 glen +- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) + Revision 1.24 2005/08/28 14:53:01 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 17:20:03 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: auditd.init (NEW), auditd.sysconfig (NEW) - PLDified from... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:20:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - PLDified from files included in package ---- Files affected: SOURCES: auditd.init (NONE -> 1.1) (NEW), auditd.sysconfig (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/auditd.init diff -u /dev/null SOURCES/auditd.init:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.init Sun Aug 28 17:19:57 2005 @@ -0,0 +1,86 @@ +#!/bin/sh +# +# auditd This starts and stops auditd +# +# chkconfig: 2345 18 87 +# description: This starts the Linux Auditing System Daemon +# +# processname: /sbin/auditd +# config: /etc/sysconfig/auditd +# config: /etc/auditd.conf +# pidfile: /var/run/auditd.pid + +PATH=/sbin:/bin:/usr/bin:/usr/sbin + +# Source function library +. /etc/rc.d/init.d/functions + +AUDITD_CLEAN_STOP=yes +EXTRAOPTIONS= + +# Get service config - may override defaults +[ -f /etc/sysconfig/auditd ] && . /etc/sysconfig/auditd + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + if [ ! -f /var/lock/subsys/auditd ]; then + # show "Starting %s service" auditd + msg_starting auditd + unset HOME MAIL USER USERNAME + daemon auditd "$EXTRAOPTIONS" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd + # Load the default rules + [ -f /etc/audit.rules ] && /sbin/auditctl -R /etc/audit.rules >/dev/null + else + # show "%s service is already running." auditd + msg_already_running auditd + fi + ;; + stop) + if [ -f /var/lock/subsys/auditd ]; then + # Stop daemons. + # show "Stopping %s service" auditd + msg_stopping auditd + killproc auditd + rm -f /var/lock/subsys/auditd + # Remove watches so shutdown works cleanly + if ! is_no "$AUDITD_CLEAN_STOP"; then + /sbin/auditctl -D >/dev/null + fi + else + # show "%s service is not running." auditd + msg_not_running auditd + fi + ;; + restart) + $0 stop + $0 start + exit $? + ;; + reload|force-reload) + if [ -f /var/lock/subsys/auditd ]; then + # show "Reload %s service" auditd + msg_reloading auditd + killproc auditd -HUP + RETVAL=$? + else + # show "%s service is not running." auditd + msg_not_running auditd >&2 + RETVAL=7 + fi + ;; + status) + status auditd + RETVAL=$? + ;; + *) + # show "Usage: %s {start|stop|restart|reload|force-reload|status}" + msg_usage "$0 {start|stop|restart|reload|force-reload|status}" + RETVAL=3 +esac + +exit $RETVAL ================================================================ Index: SOURCES/auditd.sysconfig diff -u /dev/null SOURCES/auditd.sysconfig:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.sysconfig Sun Aug 28 17:19:57 2005 @@ -0,0 +1,15 @@ +# Customized settings for auditd + +# Nice level for auditd +# SERVICE_RUN_NICE_LEVEL=0 + +# Extra options for auditd +# EXTRAOPTIONS= + +# You can set audit locale here +# LC_ALL=C + +# This option is used to determine if rules & watches should be deleted on +# shutdown. This is beneficial in most cases so that a watch doesn't linger +# on a drive that is being unmounted. If set to no, it will NOT be cleaned up. +AUDITD_CLEAN_STOP=yes ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:21:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: audit.spec - fixed libaudit.so symlink - replace init/sysco... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:21:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed libaudit.so symlink - replace init/sysconfig with our versions - -devel R: llh with audit update - release 1 ---- Files affected: SPECS: audit.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.5 SPECS/audit.spec:1.6 --- SPECS/audit.spec:1.5 Sun Aug 28 15:26:36 2005 +++ SPECS/audit.spec Sun Aug 28 17:21:17 2005 @@ -3,13 +3,15 @@ Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit Version: 1.0.3 -Release: 0.1 +Release: 1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz # Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h +Source2: %{name}d.init +Source3: %{name}d.sysconfig URL: http://people.redhat.com/sgrubb/audit/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -52,6 +54,7 @@ License: LGPL Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +Requires: linux-libc-headers >= 7:2.6.12.0-4 %description libs-devel The audit-libs-devel package contains the header files needed for @@ -102,13 +105,16 @@ install -d $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib} -ln -sf $(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ +ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libaudit.so # We manually install this since Makefile doesn't install -d $RPM_BUILD_ROOT%{_includedir} install lib/libaudit.h $RPM_BUILD_ROOT%{_includedir} +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd +install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd + %clean rm -rf $RPM_BUILD_ROOT @@ -166,6 +172,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:21:17 qboosh +- fixed libaudit.so symlink +- replace init/sysconfig with our versions +- -devel R: llh with audit update +- release 1 + Revision 1.5 2005/08/28 13:26:36 qboosh - updated to 1.0.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sun Aug 28 17:28:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: license-installer.sh - @LICENSE@ expansions for fonts-mic... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:28:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - @LICENSE@ expansions for fonts-microsoft packages ---- Files affected: SOURCES: license-installer.sh (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.3 SOURCES/license-installer.sh:1.4 --- SOURCES/license-installer.sh:1.3 Tue Aug 23 21:20:31 2005 +++ SOURCES/license-installer.sh Sun Aug 28 17:28:44 2005 @@ -38,11 +38,17 @@ fi fi else - echo " + if [ "@LICENSE@" != '@'LICENSE'@' ]; then + cat @LICENSE@ + echo " +If you accept the above license rebuild the package using: +" + else + echo " License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: - -$0 --with license_agreement @SPECFILE@ " + fi + echo "$0 --with license_agreement @SPECFILE@" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 17:30:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use shared license-installer.sh ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.25 SPECS/fonts-TTF-microsoft.spec:1.26 --- SPECS/fonts-TTF-microsoft.spec:1.25 Sun Aug 28 17:08:05 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:21 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 5%{?with_license_agreement:wla} +Release: 6%{?with_license_agreement:wla} License: Microsoft EULA (for non-commercial use) Group: Fonts %if %{with license_agreement} @@ -39,6 +39,7 @@ Source10: http://dl.sourceforge.net/corefonts/webdin32.exe # NoSource10-md5: 230a1d13a365b22815f502eb24d9149b %else +Source0: license-installer.sh # extracted from one of the above Source20: Microsoft-EULA.txt %endif @@ -91,58 +92,14 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -If you accept the above license rebuild the package using: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Microsoft-EULA.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -190,8 +147,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 15:30:21 glen +- use shared license-installer.sh script from SOURCES + Revision 1.25 2005/08/28 15:08:05 glen -- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) +- removed ftp url from %description, because + 1) it's pointing to inexistent src.rpm in RPMS dir, + 2) the -installer .src.rpm doesn't contain sourceX-s inside anyway Revision 1.24 2005/08/28 14:53:01 glen - use without macro @@ -200,7 +162,9 @@ - rel up to 5 Revision 1.22 2004/12/08 05:47:33 roman -- added R: cabextract to the case of building without license agreement (rationale: cabextract will be needed to get the fonts anyway, which is the only possible use of the package) +- added R: cabextract to the case of building without license + agreement (rationale: cabextract will be needed to get the fonts + anyway, which is the only possible use of the package) Revision 1.21 2004/11/17 06:14:48 ankry - message fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.25&r2=1.26&f=u From glen at pld-linux.org Sun Aug 28 17:30:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-microsoft.spec - rel 6 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 6 ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.26 SPECS/fonts-TTF-microsoft.spec:1.27 --- SPECS/fonts-TTF-microsoft.spec:1.26 Sun Aug 28 17:30:21 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:39 2005 @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 15:30:39 glen +- rel 6 + Revision 1.26 2005/08/28 15:30:21 glen - use shared license-installer.sh script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.26&r2=1.27&f=u From glen at pld-linux.org Sun Aug 28 17:36:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-microsoft-tahoma.spec - use shared license-instal... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:36:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-microsoft-tahoma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft-tahoma.spec diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 SPECS/fonts-TTF-microsoft-tahoma.spec:1.7 --- SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 Sun Jun 5 23:19:02 2005 +++ SPECS/fonts-TTF-microsoft-tahoma.spec Sun Aug 28 17:36:42 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of IE update - may require Windows license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Tahoma True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires Windows license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Tahoma firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na Windows). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 15:36:42 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.6 2005/06/05 21:19:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft-tahoma.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sun Aug 28 17:40:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec - use shared license-... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Microsoft-ArialUnicode.spec diff -u SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.6 --- SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 Mon Jun 6 10:18:56 2005 +++ SPECS/fonts-TTF-Microsoft-ArialUnicode.spec Sun Aug 28 17:39:57 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of MS Office - may require Office license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Arial Unicode True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires MS Office license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Arial Unicode firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na MS Office). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ] -then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "$3" $SPECDIR; then - exit 1 - fi - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U $RPMDIR/$RPMNAME || \ - echo -e "Install manually the file:\n $RPMDIR/$RPMNAME" ) - if [ "$BACKUP_SPEC" -eq 1 ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:39:57 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.5 2005/06/06 08:18:56 glen - simplification fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Microsoft-ArialUnicode.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 17:41:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: jakarta-regexp-build.patch - updated for 1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:41:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.4 ---- Files affected: SOURCES: jakarta-regexp-build.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/jakarta-regexp-build.patch diff -u SOURCES/jakarta-regexp-build.patch:1.1 SOURCES/jakarta-regexp-build.patch:1.2 --- SOURCES/jakarta-regexp-build.patch:1.1 Tue Dec 14 15:07:57 2004 +++ SOURCES/jakarta-regexp-build.patch Sun Aug 28 17:41:14 2005 @@ -1,11 +1,11 @@ ---- jakarta-regexp-1.3/build.xml~ 2003-09-02 20:56:46.000000000 +0200 -+++ jakarta-regexp-1.3/build.xml 2004-12-14 15:04:17.955572757 +0100 -@@ -36,7 +36,7 @@ +--- jakarta-regexp-1.4/build.xml.orig 2005-08-17 03:19:03.000000000 +0200 ++++ jakarta-regexp-1.4/build.xml 2005-08-28 17:12:43.723619328 +0200 +@@ -54,7 +54,7 @@ -- -+ +- ++ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jakarta-regexp-build.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sun Aug 28 17:42:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - removed superfluous O... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:42:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed superfluous Obsoletes itself ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 Sun Jun 5 23:17:02 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 17:42:32 2005 @@ -32,7 +32,6 @@ Requires: rpm-build-tools Requires: wget %endif -Obsoletes: fonts-TTF-Bitstream-Cyberfonts BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -175,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 15:42:32 glen +- removed superfluous Obsoletes itself + Revision 1.3 2005/06/05 21:17:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: jakarta-regexp.spec - updated to 1.4, updated build patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:43:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4, updated build patch ---- Files affected: SPECS: jakarta-regexp.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/jakarta-regexp.spec diff -u SPECS/jakarta-regexp.spec:1.22 SPECS/jakarta-regexp.spec:1.23 --- SPECS/jakarta-regexp.spec:1.22 Tue Dec 14 15:21:24 2004 +++ SPECS/jakarta-regexp.spec Sun Aug 28 17:43:15 2005 @@ -2,12 +2,12 @@ Summary: Java Regular Expression Summary(pl): Wyra?enia regularne do Javy Name: jakarta-regexp -Version: 1.3 +Version: 1.4 Release: 1 -License: Apache +License: Apache v2.0 Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/regexp/source/%{name}-%{version}.tar.gz -# Source0-md5: 4322f82bea908ca4a7db270f7fa4850d +# Source0-md5: d903d84c949df848009f3bf205b32c97 Patch0: %{name}-build.patch URL: http://jakarta.apache.org/regexp/index.html BuildRequires: jakarta-ant @@ -46,7 +46,6 @@ %setup -q %patch0 -p1 find . -name "*.jar" -exec rm -f {} \; -mkdir -p jakarta-site2/lib %build ant jar javadocs @@ -63,7 +62,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt +%doc LICENSE %{_javadir}/*.jar %files doc @@ -76,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 15:43:15 qboosh +- updated to 1.4, updated build patch + Revision 1.22 2004/12/14 14:21:24 baggins - fixed files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-regexp.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: jakarta-regexp-1.4.tar.gz Message-ID: <19951.1125243801@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz Size: 137768 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 17:45:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: pwdutils-pl.po-update.patch (REMOVED), pwdutils-slp.patch... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:45:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pwdutils-pl.po-update.patch (1.5 -> NONE) (REMOVED), pwdutils-slp.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:48:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: pwdutils.spec - updated to 3.0.4, removed obsolete pl.po-up... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.4, removed obsolete pl.po-update,slp patches - build audit log plugin ---- Files affected: SPECS: pwdutils.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/pwdutils.spec diff -u SPECS/pwdutils.spec:1.61 SPECS/pwdutils.spec:1.62 --- SPECS/pwdutils.spec:1.61 Thu Jul 28 11:00:49 2005 +++ SPECS/pwdutils.spec Sun Aug 28 17:47:56 2005 @@ -2,6 +2,7 @@ # TODO: review default login.defs # # Conditional build: +%bcond_without audit # don't build audit log plugin %bcond_without ldap # build without LDAP support %bcond_without selinux # build without SELinux support %bcond_with openssl # use OpenSSL instead of GnuTLS @@ -9,12 +10,12 @@ Summary: Utilities to manage the passwd and shadow user information Summary(pl): Narz?dzia do zarz?dzania informacjami o u?ytkownikach z passwd i shadow Name: pwdutils -Version: 3.0.2 +Version: 3.0.4 Release: 1 License: GPL v2 Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2 -# Source0-md5: f56fd7d1b6ae64ea7e70734bc20c2718 +# Source0-md5: 10603d67f4959772544a76691310dfc8 Source1: %{name}.useradd Source2: %{name}.rpasswdd.init Source3: %{name}.login.defs @@ -25,11 +26,10 @@ Source8: useradd.pamd Source9: userdb.pamd Patch0: %{name}-f-option.patch -Patch1: %{name}-pl.po-update.patch -Patch2: %{name}-no_bash.patch -Patch3: %{name}-silent_crontab.patch -Patch4: %{name}-slp.patch +Patch1: %{name}-no_bash.patch +Patch2: %{name}-silent_crontab.patch URL: http://www.thkukuk.de/pam/pwdutils/ +%{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: gcc >= 5:3.2 @@ -74,6 +74,18 @@ bezpiecznym po??czeniu SSL. Demon tak?e u?ywa PAM, wi?c mo?na zmienia? has?a niezale?nie od tego, gdzie s? przechowywane. +%package log-audit +Summary: audit log plugin for pwdutils +Summary(pl): Wtyczka loguj?ca audit dla pwdutils +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description log-audit +audit log plugin for pwdutils. + +%description log-audit -l pl +Wtyczka loguj?ca audit dla pwdutils. + %package -n rpasswdd Summary: Remote password update daemon Summary(pl): Demon do zdalnego uaktualniania hase? @@ -118,10 +130,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 - -rm -f po/stamp-po sed -i -e 's/-Werror //' configure.in @@ -132,12 +140,13 @@ %{__autoheader} %{__automake} %configure \ + %{?with_audit:--enable-audit-plugin} \ %{?with_openssl:--disable-gnutls} \ + --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ + --enable-nls \ --enable-pam_rpasswd \ --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \ --enable-slp \ - --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ - --enable-nls \ --disable-rpath %{__make} @@ -243,6 +252,12 @@ %exclude %{_mandir}/man8/rpasswdd.8* %exclude %{_mandir}/man8/pam_rpasswd.8* +%if %{with audit} +%files log-audit +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/pwdutils/liblog_audit.so* +%endif + %files -n rpasswdd %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/rpasswdd @@ -261,6 +276,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/28 15:47:56 qboosh +- updated to 3.0.4, removed obsolete pl.po-update,slp patches +- build audit log plugin + Revision 1.61 2005/07/28 09:00:49 qboosh - pwdutils 3.0.x prefers gnutls over openssl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pwdutils.spec?r1=1.61&r2=1.62&f=u From qboosh at pld-linux.org Sun Aug 28 17:48:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: pwdutils-3.0.4.tar.bz2 Message-ID: <26383.1125244088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/pwdutils-3.0.4.tar.bz2 10603d67f4959772544a76691310dfc8 pwdutils-3.0.4.tar.bz2 Size: 458961 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sun Aug 28 18:02:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - use shared license-in... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:02:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script - make package build work on end-user - rel 2 ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.5 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 Sun Aug 28 17:42:32 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 18:02:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} License: Nondistributable but free (See Bitstream-Cyberfonts-licence.txt) Group: Fonts %if %{with license_agreement} @@ -23,11 +23,15 @@ # NoSource1-md5: 63a6f607ac5a78d34b67247b893faf5b Source2: ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/CyberCJK.ZIP # NoSource2-md5: 63a6f607ac5a78d34b67247b893faf5b -Source3: %{base_name}-licence.txt BuildRequires: unzip +# we need the -installer package as otherwise can't make end-user +# package to work. see also comments in %%prep section. +BuildRequires: %{base_name}-installer Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh +Source1: %{base_name}-licence.txt Requires: unzip Requires: rpm-build-tools Requires: wget @@ -39,25 +43,23 @@ %description Bitstream Cyberfonts True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Cyberfonts firmy Bitstream. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -66,76 +68,31 @@ /usr/bin/unzip -L %{SOURCE0} /usr/bin/unzip -L %{SOURCE1} /usr/bin/unzip -L %{SOURCE2} -install %{SOURCE3} ./ +# ugly hack, to work with -installer package, when it may not fetch this file +# from CVS with builder (-nc, -ncs) +install %{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt . %endif %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default. If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %else install -d $RPM_BUILD_ROOT%{ttffontsdir} install *.ttf $RPM_BUILD_ROOT%{ttffontsdir} %endif -install -d $RPM_BUILD_ROOT%{_datadir}/%{base_name} -install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %clean rm -rf $RPM_BUILD_ROOT @@ -162,11 +119,12 @@ %files %defattr(644,root,root,755) %if %{with license_agreement} +%doc Bitstream-Cyberfonts-licence.txt %{ttffontsdir}/* %else %attr(755,root,root) %{_bindir}/%{base_name}.install -%endif %{_datadir}/%{base_name} +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -174,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 16:02:51 glen +- use shared license-installer.sh script +- make package build work on end-user +- rel 2 + Revision 1.4 2005/08/28 15:42:32 glen - removed superfluous Obsoletes itself ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 18:03:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SOURCES: gsasl-pl.po-update.patch - updated for 0.2.7 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:03:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.2.7 ---- Files affected: SOURCES: gsasl-pl.po-update.patch (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SOURCES/gsasl-pl.po-update.patch diff -u SOURCES/gsasl-pl.po-update.patch:1.6 SOURCES/gsasl-pl.po-update.patch:1.7 --- SOURCES/gsasl-pl.po-update.patch:1.6 Sat Aug 13 19:36:46 2005 +++ SOURCES/gsasl-pl.po-update.patch Sun Aug 28 18:03:35 2005 @@ -1,5 +1,5 @@ ---- gsasl-0.2.6/po/pl.po.orig 2005-08-10 13:04:43.000000000 +0200 -+++ gsasl-0.2.6/po/pl.po 2005-08-13 19:27:33.476737256 +0200 +--- gsasl-0.2.7/po/pl.po.orig 2005-08-25 14:54:55.000000000 +0200 ++++ gsasl-0.2.7/po/pl.po 2005-08-28 17:56:55.773446472 +0200 @@ -1,21 +1,21 @@ # Polish translation for gsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -11,11 +11,11 @@ msgid "" msgstr "" -"Project-Id-Version: gsasl 0.1.4\n" -+"Project-Id-Version: gsasl 0.2.5\n" ++"Project-Id-Version: gsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:49+0200\n" -"PO-Revision-Date: 2004-08-25 22:41+0200\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgid "Choose SASL mechanism:\n" msgstr "Wyb?r mechanizm?w SASL:\n" ---- gsasl-0.2.6/lib/po/pl.po.orig 2005-08-10 13:04:50.000000000 +0200 -+++ gsasl-0.2.6/lib/po/pl.po 2005-08-13 19:28:08.191459816 +0200 +--- gsasl-0.2.7/lib/po/pl.po.orig 2005-08-25 14:55:02.000000000 +0200 ++++ gsasl-0.2.7/lib/po/pl.po 2005-08-28 17:57:31.753976600 +0200 @@ -1,14 +1,14 @@ # Polish translation for libgsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -40,11 +40,11 @@ msgid "" msgstr "" -"Project-Id-Version: libgsasl 0.2.1\n" -+"Project-Id-Version: libgsasl 0.2.3\n" ++"Project-Id-Version: libgsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:50+0200\n" -"PO-Revision-Date: 2004-11-21 23:31+0100\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gsasl-pl.po-update.patch?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: gsasl.spec - updated to 0.2.7, updated pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:04:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.2.7, updated pl.po-update patch ---- Files affected: SPECS: gsasl.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/gsasl.spec diff -u SPECS/gsasl.spec:1.22 SPECS/gsasl.spec:1.23 --- SPECS/gsasl.spec:1.22 Sat Aug 13 19:37:25 2005 +++ SPECS/gsasl.spec Sun Aug 28 18:04:08 2005 @@ -8,12 +8,12 @@ Summary: GNU SASL - implementation of the Simple Authentication and Security Layer Summary(pl): GNU SASL - implementacja Simple Authentication and Security Layer Name: gsasl -Version: 0.2.6 +Version: 0.2.7 Release: 1 License: GPL Group: Libraries Source0: http://josefsson.org/gsasl/releases/%{name}-%{version}.tar.gz -# Source0-md5: 5e527147cea5cc776240f6d7a6820955 +# Source0-md5: ed52f2e5ac997503d0953be978e7a2f1 Patch0: %{name}-info.patch Patch1: %{name}-pl.po-update.patch URL: http://www.gnu.org/software/gsasl/ @@ -176,6 +176,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 16:04:08 qboosh +- updated to 0.2.7, updated pl.po-update patch + Revision 1.22 2005/08/13 17:37:25 qboosh - updated to 0.2.6, updated pl.po-update patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsasl.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: gsasl-0.2.7.tar.gz Message-ID: <19453.1125245087@distfiles.pld-linux.org> Files fetched: 1 STORED: http://josefsson.org/gsasl/releases/gsasl-0.2.7.tar.gz ed52f2e5ac997503d0953be978e7a2f1 gsasl-0.2.7.tar.gz Size: 2643936 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: daemon-1.0.1.tar.gz Message-ID: <21194.1125245131@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz Size: 301023 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: jakarta-commons-daemon.spec - updated to 1.0.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:05:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.1 ---- Files affected: SPECS: jakarta-commons-daemon.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-daemon.spec diff -u SPECS/jakarta-commons-daemon.spec:1.7 SPECS/jakarta-commons-daemon.spec:1.8 --- SPECS/jakarta-commons-daemon.spec:1.7 Sun May 8 19:10:19 2005 +++ SPECS/jakarta-commons-daemon.spec Sun Aug 28 18:05:27 2005 @@ -2,12 +2,12 @@ Summary: Jakarta Commons Daemon - controlling of Java daemons Summary(pl): Jakarta Commons Daemon - kontrolowanie demon?w w Javie Name: jakarta-commons-daemon -Version: 1.0 +Version: 1.0.1 Release: 1 License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz -# Source0-md5: 3054786aaba9631ec04fef0862023bc8 +# Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0 URL: http://jakarta.apache.org/commons/daemon/ BuildRequires: automake BuildRequires: jakarta-ant >= 1.4.1 @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 16:05:27 qboosh +- updated to 1.0.1 + Revision 1.7 2005/05/08 17:10:19 qboosh - updated to 1.0, removed obsolete nobat patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-commons-daemon.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 18:15:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: linux-libc-headers.spec - my build system doesn't generate ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:15:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, in other words, add -r option to xargs ---- Files affected: SPECS: linux-libc-headers.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.101 SPECS/linux-libc-headers.spec:1.102 --- SPECS/linux-libc-headers.spec:1.101 Sun Aug 28 16:39:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:14:56 2005 @@ -151,7 +151,8 @@ cp -a linux $RPM_BUILD_ROOT%{_includedir} cp -a sound $RPM_BUILD_ROOT%{_includedir} -find $RPM_BUILD_ROOT%{_includedir} -type f -name '*.orig' | xargs rm +find $RPM_BUILD_ROOT%{_includedir} -type f \ + '(' -name '*.orig' -o -name '*~' ')' | xargs -r rm %clean rm -rf $RPM_BUILD_ROOT @@ -177,6 +178,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/28 16:14:56 glen +- my build system doesn't generate .orig files on patching (but ~ instead) + and others could be off completely due $VERSION_CONTROL variable, + in other words, add -r option to xargs + Revision 1.101 2005/08/28 14:39:56 qboosh - added audit patch, release 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.101&r2=1.102&f=u From glen at pld-linux.org Sun Aug 28 18:21:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: linux-libc-headers.spec - there's no such tool to regenerat... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:21:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - there's no such tool to regenerate asm stub headers ---- Files affected: SPECS: linux-libc-headers.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.102 SPECS/linux-libc-headers.spec:1.103 --- SPECS/linux-libc-headers.spec:1.102 Sun Aug 28 18:14:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:21:31 2005 @@ -101,7 +101,7 @@ # common header cat > asm/$h << EOF /* All asm/ files are generated and point to the corresponding - * file in asm-${a1} or asm-${a2}. To regenerate, run "generate-asm" + * file in asm-${a1} or asm-${a2}. */ #ifndef __ASM_STUB_${name}__ @@ -178,6 +178,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/28 16:21:31 glen +- there's no such tool to regenerate asm stub headers + Revision 1.102 2005/08/28 16:14:56 glen - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.102&r2=1.103&f=u From qboosh at pld-linux.org Sun Aug 28 19:17:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: libdrm.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 17:17:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: libdrm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/libdrm.spec diff -u /dev/null SPECS/libdrm.spec:1.1 --- /dev/null Sun Aug 28 19:17:22 2005 +++ SPECS/libdrm.spec Sun Aug 28 19:17:14 2005 @@ -0,0 +1,89 @@ +# $Revision$, $Date$ +Summary: Userspace interface to kernel DRM services +Summary(pl): Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra +Name: libdrm +Version: 1.0.3 +Release: 1 +License: MIT +Group: Libraries +Source0: http://people.freedesktop.org/~ajax/libdrm/%{name}-%{version}.tar.gz +# Source0-md5: 2fd32375b17fa80e3a962276f98d6440 +URL: http://dri.freedesktop.org/ +# currently uses +BuildRequires: XFree86-devel +#BuildRequires: xorg-lib-libX11-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Userspace interface to kernel DRM services. + +%description -l pl +Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra. + +%package devel +Summary: Header files for libdrm library +Summary(pl): Pliki nag??wkowe biblioteki libdrm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for libdrm library. + +%description devel -l pl +Pliki nag??wkowe biblioteki libdrm. + +%package static +Summary: Static libdrm library +Summary(pl): Statyczna biblioteka libdrm +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static libdrm library. + +%description static -l pl +Statyczna biblioteka libdrm. + +%prep +%setup -q + +%build +%configure +%{__make} + +%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(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so +%{_libdir}/libdrm.la +%{_includedir}/xf86drm.h +%{_includedir}/drm +%{_pkgconfigdir}/libdrm.pc + +%files static +%defattr(644,root,root,755) +%{_libdir}/libdrm.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 17:17:14 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 19:17:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:16 2005 Subject: DISTFILES: libdrm-1.0.3.tar.gz Message-ID: <25070.1125249452@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freedesktop.org/~ajax/libdrm/libdrm-1.0.3.tar.gz 2fd32375b17fa80e3a962276f98d6440 libdrm-1.0.3.tar.gz Size: 417307 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 19:18:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: cairo.spec - rel 2; BC libpixman-devel doesn't belong here. In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:18:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; BC libpixman-devel doesn't belong here. ---- Files affected: SPECS: cairo.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.35 SPECS/cairo.spec:1.36 --- SPECS/cairo.spec:1.35 Fri Aug 26 20:46:28 2005 +++ SPECS/cairo.spec Sun Aug 28 19:18:22 2005 @@ -7,13 +7,12 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 1.0.0 -Release: 1 +Release: 2 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ -BuildConflicts: libpixman-devel BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel @@ -155,6 +154,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 17:18:22 arekm +- rel 2; BC libpixman-devel doesn't belong here. + Revision 1.35 2005/08/26 18:46:28 qboosh - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.35&r2=1.36&f=u From arekm at pld-linux.org Sun Aug 28 19:29:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:16 2005 Subject: SPECS: libsvg-cairo.spec -req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:29:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: -req final cairo ---- Files affected: SPECS: libsvg-cairo.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/libsvg-cairo.spec diff -u SPECS/libsvg-cairo.spec:1.11 SPECS/libsvg-cairo.spec:1.12 --- SPECS/libsvg-cairo.spec:1.11 Sun Jun 19 11:00:49 2005 +++ SPECS/libsvg-cairo.spec Sun Aug 28 19:28:55 2005 @@ -11,7 +11,7 @@ URL: http://www.xsvg.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel >= 1.0.0 BuildRequires: libsvg-devel >= 0.1.2 BuildRequires: libtool BuildRequires: pkgconfig @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 17:28:55 arekm +-req final cairo + Revision 1.11 2005/06/19 09:00:49 qboosh - don't include COPYING with a copy of LGPL text in doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsvg-cairo.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 19:33:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: koffice.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: koffice.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/koffice.spec diff -u SPECS/koffice.spec:1.121 SPECS/koffice.spec:1.122 --- SPECS/koffice.spec:1.121 Mon Aug 8 12:42:57 2005 +++ SPECS/koffice.spec Sun Aug 28 19:33:20 2005 @@ -13,16 +13,13 @@ Summary(uk): ????? ??????? ??????? ??? KDE Summary(zh_CN): KDE ?????????????????? Name: koffice -# Version: %{_ver}.%{_snap} Version: %{_ver} -Release: 0.1 +Release: 1 Epoch: 5 License: GPL/LGPL Group: X11/Applications -# ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2.95/src Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2 # Source0-md5: 91a7b68757addc5934c5a8209a4926d5 -#Source0: http://ep09.pld-linux.org/~adgor/kde/%{name}-%{_snap}.tar.bz2 #Patch100: %{name}-branch.diff URL: http://www.koffice.org/ BuildRequires: ImageMagick-c++-devel @@ -835,6 +832,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 17:33:20 arekm +- rel 1 + Revision 1.121 2005/08/08 10:42:57 blekot - more %%files (needs checkout) - log shorten ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.121&r2=1.122&f=u From arekm at pld-linux.org Sun Aug 28 19:41:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: poppler.spec - req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:41:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - req final cairo ---- Files affected: SPECS: poppler.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.17 SPECS/poppler.spec:1.18 --- SPECS/poppler.spec:1.17 Sat Aug 27 00:52:39 2005 +++ SPECS/poppler.spec Sun Aug 28 19:41:06 2005 @@ -4,7 +4,7 @@ %bcond_without cairo # disable Cairo backend %bcond_without qt # disable qt wrapper # -%define cairo_ver 0.5.0 +%define cairo_ver 1.0.0 # Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 17:41:06 arekm +- req final cairo + Revision 1.17 2005/08/26 22:52:39 aflinta - 0.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.17&r2=1.18&f=u From arekm at pld-linux.org Sun Aug 28 20:01:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: gnustep-back.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 18:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: gnustep-back.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gnustep-back.spec diff -u SPECS/gnustep-back.spec:1.26 SPECS/gnustep-back.spec:1.27 --- SPECS/gnustep-back.spec:1.26 Thu Aug 11 11:46:18 2005 +++ SPECS/gnustep-back.spec Sun Aug 28 20:01:34 2005 @@ -1,15 +1,17 @@ # $Revision$, $Date$ -# TODO: symlink Helvetica from ghostscript-fonts-std? +# TODO: +# - symlink Helvetica from ghostscript-fonts-std? +# - reenable cairo as soon as versions >= 0.5 will be supported # # Conditional build: %bcond_without art # don't build art backend -%bcond_without cairo # don't build cairo backend +%bcond_with cairo # don't build cairo backend # Summary: The GNUstep backend bundle Summary(pl): Pakiet backendowy GNUstep Name: gnustep-back Version: 0.10.0 -Release: 1 +Release: 2 License: LGPL/GPL Vendor: The GNUstep Project Group: X11/Libraries @@ -216,6 +218,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 18:01:34 arekm +- disable cairo + Revision 1.26 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-back.spec?r1=1.26&r2=1.27&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:05 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: freenx.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: mmazur Date: Sun Aug 28 18:07:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: freenx.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/freenx.spec diff -u SPECS/freenx.spec:1.11 SPECS/freenx.spec:1.12 --- SPECS/freenx.spec:1.11 Fri Jun 17 13:55:20 2005 +++ SPECS/freenx.spec Sun Aug 28 20:07:00 2005 @@ -2,12 +2,12 @@ Summary: A free (GPL) implementation of the NX server Summary(pl): Darmowa (GPL) imlementacja serwera NX Name: freenx -Version: 0.4.0 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz -# Source0-md5: a57046e79fb980b4720ec6ae67ed1f19 +# Source0-md5: 4b74709736ab1784403a61ba06cbde50 URL: http://freenx.berlios.de/ BuildRequires: sed >= 4.0 Requires: expect @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:07:00 mmazur +- updated to 0.4.2 + Revision 1.11 2005/06/17 11:55:20 charles - and Source0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/freenx.spec?r1=1.11&r2=1.12&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:06 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: freenx-0.4.2.tar.gz Message-ID: <7674.1125252426@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/freenx/freenx-0.4.2.tar.gz 4b74709736ab1784403a61ba06cbde50 freenx-0.4.2.tar.gz Size: 44169 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sun Aug 28 20:33:36 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: ntfsprogs.spec - fix pl desc In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:33:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix pl desc ---- Files affected: SPECS: ntfsprogs.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.35 SPECS/ntfsprogs.spec:1.36 --- SPECS/ntfsprogs.spec:1.35 Tue Aug 9 13:15:56 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:33:28 2005 @@ -49,7 +49,7 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu pe?n? obs?ug? NTFS pod Linuksem. +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 18:33:28 darekr +- fix pl desc + Revision 1.35 2005/08/09 11:15:56 qboosh - more pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.35&r2=1.36&f=u From darekr at pld-linux.org Sun Aug 28 20:38:30 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: most.spec - BR: perl-base - noreplace for %config, added %v... In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:38:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: perl-base - noreplace for %config, added %verify() ---- Files affected: SPECS: most.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/most.spec diff -u SPECS/most.spec:1.36 SPECS/most.spec:1.37 --- SPECS/most.spec:1.36 Mon Aug 1 14:16:12 2005 +++ SPECS/most.spec Sun Aug 28 20:38:24 2005 @@ -4,13 +4,14 @@ Name: most Version: 4.10.2 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Text Source0: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 # Source0-md5: 99a24b6989ac81f436791b957b2e171a URL: http://www.jedsoft.org/most/ BuildRequires: autoconf >= 2.50 BuildRequires: automake +BuildRequires: perl-base BuildRequires: slang-devel >= 1.3.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,7 +58,7 @@ %files %defattr(644,root,root,755) %doc README *.rc *.txt -%config %{_sysconfdir}/most.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/most.conf %attr(755,root,root) %{_bindir}/most %{_mandir}/man1/*.1* @@ -67,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:38:24 darekr +- BR: perl-base +- noreplace for %config, added %verify() + Revision 1.36 2005/08/01 12:16:12 blekot - up to 4.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/most.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:40:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: ntfsprogs.spec - formatting In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:40:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - formatting ---- Files affected: SPECS: ntfsprogs.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.36 SPECS/ntfsprogs.spec:1.37 --- SPECS/ntfsprogs.spec:1.36 Sun Aug 28 20:33:28 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:40:52 2005 @@ -49,8 +49,8 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. -Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod +Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: - ntfsfix - pr?buje naprawia? partycj? NTFS uszkodzone przez linuksowy @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:40:52 qboosh +- formatting + Revision 1.36 2005/08/28 18:33:28 darekr - fix pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:54:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: dirac-0.5.3.tar.gz Message-ID: <18351.1125255279@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dirac/dirac-0.5.3.tar.gz 6882ac9fe9b39edc2a2e666d36d674c3 dirac-0.5.3.tar.gz Size: 703435 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 20:54:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: dirac.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:54:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: dirac.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/dirac.spec diff -u SPECS/dirac.spec:1.11 SPECS/dirac.spec:1.12 --- SPECS/dirac.spec:1.11 Sat Aug 13 20:04:34 2005 +++ SPECS/dirac.spec Sun Aug 28 20:54:28 2005 @@ -2,12 +2,12 @@ Summary: General purpose video codec Summary(pl): Kodek obrazu og?lnego przeznaczenia Name: dirac -Version: 0.5.2 -Release: 2 -License: MPL +Version: 0.5.3 +Release: 1 +License: MPL v1.1 or GPL v2 or LGPL v2.1 Group: Libraries Source0: http://dl.sourceforge.net/dirac/%{name}-%{version}.tar.gz -# Source0-md5: e83e3dc3025c04b3163fbcd1d5e6a328 +# Source0-md5: 6882ac9fe9b39edc2a2e666d36d674c3 Patch0: %{name}-am.patch URL: http://www.bbc.co.uk/rd/projects/dirac/ BuildRequires: autoconf >= 2.50 @@ -89,13 +89,13 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README TODO doc/faq.htm +%doc AUTHORS ChangeLog NEWS README TODO doc/faq.html %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* %files devel %defattr(644,root,root,755) -%doc doc/api/html doc/programmers/programmers_guide.pdf doc/dirac_doc_howto.txt +%doc doc/documentation/code/api/html doc/dirac_bitstream.txt %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_includedir}/%{name} @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:54:28 qboosh +- updated to 0.5.3 + Revision 1.11 2005/08/13 18:04:34 qboosh - don't install unit testsuite program (avoid cppunit dependency) - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dirac.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 21:22:14 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: gtk+2-bug312710.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:22:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: gtk+2-bug312710.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 21:23:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: gtk+2.spec - updated to 2.6.10 - removed obsolete bug312710... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:23:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.10 - removed obsolete bug312710 patch (alternative fix included) ---- Files affected: SPECS: gtk+2.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.181 SPECS/gtk+2.spec:1.182 --- SPECS/gtk+2.spec:1.181 Mon Aug 8 23:54:24 2005 +++ SPECS/gtk+2.spec Sun Aug 28 21:23:03 2005 @@ -15,17 +15,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.6.9 -Release: 2 +Version: 2.6.10 +Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-%{version}.tar.bz2 -# Source0-md5: 26c3a0bea55353eed63348fb7be4153a +# Source0-md5: 520090ef291e35ba93397060e20f5025 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-menushadow.patch Patch2: %{name}-xlibs.patch -Patch3: %{name}-bug312710.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -145,7 +144,6 @@ %patch0 -p1 %{?with_menushadow:%patch1 -p1} %{?with_xlibs:%patch2 -p1} -%patch3 -p1 %build %{__gtkdocize} @@ -274,6 +272,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/28 19:23:03 qboosh +- updated to 2.6.10 +- removed obsolete bug312710 patch (alternative fix included) + Revision 1.181 2005/08/08 21:54:24 freetz - http://bugzilla.gnome.org/show_bug.cgi?id=312710, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.181&r2=1.182&f=u From qboosh at pld-linux.org Sun Aug 28 21:23:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: gtk+-2.6.10.tar.bz2 Message-ID: <27413.1125257003@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.10.tar.bz2 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 Size: 11521380 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 21:25:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: gstreamer-plugins.spec - disable cairo; fix cairo BR; rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:25:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo; fix cairo BR; rel 2 ---- Files affected: SPECS: gstreamer-plugins.spec (1.159 -> 1.160) ---- Diffs: ================================================================ Index: SPECS/gstreamer-plugins.spec diff -u SPECS/gstreamer-plugins.spec:1.159 SPECS/gstreamer-plugins.spec:1.160 --- SPECS/gstreamer-plugins.spec:1.159 Mon Aug 8 16:42:26 2005 +++ SPECS/gstreamer-plugins.spec Sun Aug 28 21:25:02 2005 @@ -14,7 +14,7 @@ %bcond_without arts # don't build aRts audio output plugins %bcond_without audiofile # don't build audiofile plugin %bcond_without caca # don't build caca videosink plugin -%bcond_without cairo # don't build cairo plugin +%bcond_with cairo # build cairo plugin %bcond_without cdaudio # don't build cdaudio plugin %bcond_without cdio # don't build cdio plugin %bcond_without dirac # don't build dirac plugin @@ -55,7 +55,7 @@ Summary(pl): Wtyczki do ?rodowiska obr?bki strumieni GStreamer Name: gstreamer-plugins Version: 0.8.10 -Release: 1 +Release: 2 License: LGPL Group: Libraries Source0: http://gstreamer.freedesktop.org/src/gst-plugins/%{gstname}-%{version}.tar.bz2 @@ -86,7 +86,10 @@ %{?with_arts:BuildRequires: arts-devel >= 0.9.5} %{?with_arts:BuildRequires: artsc-devel >= 0.9.5} %{?with_audiofile:BuildRequires: audiofile-devel >= 1:0.2.3-5.20021108} -%{?with_cairo:BuildRequires: cairo-devel >= 0.5.0} +%if %{with cairo} +BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel < 0.6.0 +%endif BuildRequires: cdparanoia-III-devel %{?with_dirac:BuildRequires: dirac-devel >= 0.5.0} %{?with_divx4linux:BuildRequires: divx4linux-devel >= 1:5.05.20030428} @@ -2208,6 +2211,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.160 2005/08/28 19:25:02 arekm +- disable cairo; fix cairo BR; rel 2 + Revision 1.159 2005/08/08 14:42:26 glen - wavpack bconded (not yet available on builders) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gstreamer-plugins.spec?r1=1.159&r2=1.160&f=u From arekm at pld-linux.org Sun Aug 28 21:26:01 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: mozilla.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:26:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: mozilla.spec (1.372 -> 1.373) ---- Diffs: ================================================================ Index: SPECS/mozilla.spec diff -u SPECS/mozilla.spec:1.372 SPECS/mozilla.spec:1.373 --- SPECS/mozilla.spec:1.372 Sun Aug 14 08:53:13 2005 +++ SPECS/mozilla.spec Sun Aug 28 21:25:56 2005 @@ -10,7 +10,7 @@ %bcond_without gnomevfs # disable GnomeVFS support %bcond_without heimdal # disable heimdal support -%bcond_without svg # disable svg support +%bcond_with svg # enable svg support # Summary: Mozilla - web browser Summary(es): Navegador de Internet Mozilla @@ -19,7 +19,7 @@ Summary(ru): Web browser Name: mozilla Version: 1.7.11 -Release: 1 +Release: 2 Epoch: 5 License: Mozilla Public License Group: X11/Applications/Networking @@ -844,6 +844,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.373 2005/08/28 19:25:56 arekm +- disable cairo + Revision 1.372 2005/08/14 06:53:13 qboosh - require cairo only if built with svg support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla.spec?r1=1.372&r2=1.373&f=u From arekm at pld-linux.org Sun Aug 28 21:41:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: gnome-doc-utils.spec - merged from DEVEL In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:41:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL ---- Files affected: SPECS: gnome-doc-utils.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-doc-utils.spec diff -u SPECS/gnome-doc-utils.spec:1.6 SPECS/gnome-doc-utils.spec:1.7 --- SPECS/gnome-doc-utils.spec:1.6 Tue Jul 12 14:01:17 2005 +++ SPECS/gnome-doc-utils.spec Sun Aug 28 21:41:03 2005 @@ -2,12 +2,13 @@ Summary: Documentation utilities for GNOME Summary(pl): Narz?dzia do budowania dokumentacji dla GNOME Name: gnome-doc-utils -Version: 0.2.1 +Version: 0.3.2 Release: 1 License: GPL v2+/LGPL v2+ Group: Development/Tools -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 02c006ad31b2b878263025c12c4ff35a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.3/%{name}-%{version}.tar.bz2 +# Source0-md5: d29a3e10ff8cba17dbb6d3aff2f30bb8 +Patch0: %{name}-no_scrollkeeper_update.patch URL: http://www.gnome.org/ BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt-devel >= 1.1.14 @@ -25,9 +26,11 @@ %prep %setup -q +%patch0 -p1 %build -%configure +%configure \ + --disable-scrollkeeper %{__make} %install @@ -51,13 +54,13 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_pkgconfigdir}/*.pc %{_aclocaldir}/*.m4 %{_datadir}/%{name} -%{_omf_dest_dir}/* -%{_datadir}/xml/gnome %{_datadir}/xml2po +%{_datadir}/xml/gnome %{_mandir}/man1/xml2po.1* +%{_omf_dest_dir}/* +%{_pkgconfigdir}/*.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -65,6 +68,18 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 19:41:03 arekm +- merged from DEVEL + +Revision 1.6.2.3 2005/07/27 07:19:24 paladine +- updated to 0.3.2 + +Revision 1.6.2.2 2005/07/25 19:06:21 freetz +- killed scrollkeeper-update call (patch), rel.2 + +Revision 1.6.2.1 2005/07/12 12:05:23 freetz +- 0.3.1 + Revision 1.6 2005/07/12 12:01:17 freetz - 0.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-doc-utils.spec?r1=1.6&r2=1.7&f=u From arekm at pld-linux.org Sun Aug 28 21:53:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: evince.spec - disable dbus for now; reenable when new dbus ... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:53:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable dbus for now; reenable when new dbus goes into ac; rel 2 ---- Files affected: SPECS: evince.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.30 SPECS/evince.spec:1.31 --- SPECS/evince.spec:1.30 Sat Aug 27 16:24:16 2005 +++ SPECS/evince.spec Sun Aug 28 21:53:38 2005 @@ -2,11 +2,12 @@ # # TODO: fix t1lib build time misdetection (very low prio) # +%bcond_with dbus Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 @@ -17,7 +18,7 @@ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -BuildRequires: dbus-glib-devel >= 0.36 +%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.36} BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -80,7 +81,7 @@ %configure \ --disable-static \ --disable-schemas-install \ - --enable-dbus \ + %{?with_dbus:--enable-dbus} \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/28 19:53:38 arekm +- disable dbus for now; reenable when new dbus goes into ac; rel 2 + Revision 1.30 2005/08/27 14:24:16 paladine - removed disable_dbus patch - works for me, rel. 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.30&r2=1.31&f=u From troll at pld-linux.org Sun Aug 28 21:55:42 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: xchat-xchatlibdir.patch (NEW) - patch correcting XCHATLIB... In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:55:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch correcting XCHATLIBDIR variable on architectures using /usr/lib64 directory for plugins. this fixes autoloading them at startup. ---- Files affected: SOURCES: xchat-xchatlibdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchat-xchatlibdir.patch diff -u /dev/null SOURCES/xchat-xchatlibdir.patch:1.1 --- /dev/null Sun Aug 28 21:55:42 2005 +++ SOURCES/xchat-xchatlibdir.patch Sun Aug 28 21:55:37 2005 @@ -0,0 +1,18 @@ +--- xchat-2.4.4/configure.in~ 2005-08-28 21:48:43.131905736 +0200 ++++ xchat-2.4.4/configure.in 2005-08-28 21:49:12.279474632 +0200 +@@ -635,13 +635,13 @@ + PLUGIN_INCLUDES='-I$(top_srcdir)/plugins' + AC_SUBST(PLUGIN_INCLUDES) + ++AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${libdir}/xchat") ++ + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PREFIX, "${ac_default_prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${ac_default_prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${ac_default_prefix}/share/xchat") + else + AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${prefix}/share/xchat") + fi + ================================================================ From darekr at pld-linux.org Sun Aug 28 21:56:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: multi-aterm.spec - fix Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 19:56:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix Source0 ---- Files affected: SPECS: multi-aterm.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/multi-aterm.spec diff -u SPECS/multi-aterm.spec:1.9 SPECS/multi-aterm.spec:1.10 --- SPECS/multi-aterm.spec:1.9 Tue Sep 7 10:06:21 2004 +++ SPECS/multi-aterm.spec Sun Aug 28 21:56:14 2005 @@ -7,7 +7,7 @@ Release: 2 License: GPL Group: X11/Applications -Source0: http://www.nongnu.org/materm//%{name}-%{version}.tar.gz +Source0: http://www.nongnu.org/materm/%{name}-%{version}.tar.gz # Source0-md5: 52f9c25a6fad7f638f7064ff6cc74c62 Source1: %{name}.desktop Source2: %{name}.png @@ -95,6 +95,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 19:56:14 darekr +- fix Source0 + Revision 1.9 2004/09/07 08:06:21 blues - enabled mousewheel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/multi-aterm.spec?r1=1.9&r2=1.10&f=u From troll at pld-linux.org Sun Aug 28 21:56:59 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: xchat.spec - added xchatlibdir patch, - rel 2 In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:56:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added xchatlibdir patch, - rel 2 ---- Files affected: SPECS: xchat.spec (1.164 -> 1.165) ---- Diffs: ================================================================ Index: SPECS/xchat.spec diff -u SPECS/xchat.spec:1.164 SPECS/xchat.spec:1.165 --- SPECS/xchat.spec:1.164 Mon Jun 20 21:02:52 2005 +++ SPECS/xchat.spec Sun Aug 28 21:56:53 2005 @@ -22,7 +22,7 @@ Summary(zh_CN): GTK+ IRC (????) ?????? Name: xchat Version: 2.4.4 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2 Group: X11/Applications/Networking @@ -33,6 +33,7 @@ Patch1: %{name}-locale_names.patch Patch2: %{name}-long-delimiter.patch Patch3: %{name}-domains.patch +Patch4: %{name}-xchatlibdir.patch Icon: xchat.xpm URL: http://www.xchat.org/ BuildRequires: autoconf @@ -134,6 +135,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} po/pl.po @@ -184,6 +186,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.165 2005/08/28 19:56:53 troll +- added xchatlibdir patch, +- rel 2 + Revision 1.164 2005/06/20 19:02:52 wolf - 2.4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchat.spec?r1=1.164&r2=1.165&f=u From arekm at pld-linux.org Sun Aug 28 22:04:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: gst-python-0.8.2.tar.gz Message-ID: <3010.1125259485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.8.2.tar.gz 35a735711f43551722b0dbcfc7895f3e gst-python-0.8.2.tar.gz Size: 418325 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:04:40 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: python-gstreamer.spec - up to 0.8.2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:04:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.8.2 ---- Files affected: SPECS: python-gstreamer.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.7 SPECS/python-gstreamer.spec:1.8 --- SPECS/python-gstreamer.spec:1.7 Sun Jan 9 18:55:40 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:04:35 2005 @@ -3,12 +3,12 @@ Summary: GStreamer Python bindings Summary(pl): Wi?zania j?zyka Python do GStreamera Name: python-gstreamer -Version: 0.8.1 -Release: 2 +Version: 0.8.2 +Release: 1 License: GPL Group: Libraries/Python Source0: http://gstreamer.freedesktop.org/src/%{pname}/%{pname}-%{version}.tar.gz -# Source0-md5: 4666978d610b48f7f7481e41433a856c +# Source0-md5: 35a735711f43551722b0dbcfc7895f3e Patch0: %{pname}-py2pyc.patch URL: http://gstreamer.freedesktop.org/modules/gst-python.html BuildRequires: gstreamer-devel >= 0.8.0 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 20:04:35 arekm +- up to 0.8.2 + Revision 1.7 2005/01/09 17:55:40 saq - missing pyreqeq, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 22:06:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: license-installer.sh - add @COPYSOURCES@ for adobe install In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:06:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add @COPYSOURCES@ for adobe install ---- Files affected: SOURCES: license-installer.sh (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.4 SOURCES/license-installer.sh:1.5 --- SOURCES/license-installer.sh:1.4 Sun Aug 28 17:28:44 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:06:22 2005 @@ -12,6 +12,14 @@ BACKUP=1 mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i $SOURCEDIR/$i.prev + BACKUP=1 + fi + done + fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then ( cd $SRPMDIR if echo "$3" | grep '://' >/dev/null; then @@ -20,10 +28,25 @@ cp -f "$3" . fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) - ) + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + done + fi + ) cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i $TMPDIR/$i $SOURCEDIR/$i || exit 1 + done + fi else cp -i "$3" $SPECDIR || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1 + done + fi fi ( cd $SPECDIR /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec @@ -35,6 +58,14 @@ if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i.prev $SOURCEDIR/$i + BACKUP=1 + fi + done fi fi else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Sun Aug 28 22:07:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: acroread.spec - use shared license-installer.sh from SOURCE... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:07:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh from SOURCES - rel 2 ---- Files affected: SPECS: acroread.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/acroread.spec diff -u SPECS/acroread.spec:1.45 SPECS/acroread.spec:1.46 --- SPECS/acroread.spec:1.45 Fri Aug 19 13:31:03 2005 +++ SPECS/acroread.spec Sun Aug 28 22:07:12 2005 @@ -14,7 +14,7 @@ Name: %{base_name}-installer %endif Version: 7.0.1 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} Epoch: 1 License: distribution restricted (http://www.adobe.com/products/acrobat/distribute.html) # in short: @@ -23,6 +23,8 @@ Group: X11/Applications/Graphics %if %{with license_agreement} Source0: http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz +%else +Source0: license-installer.sh %endif Source1: %{base_name}.desktop Source2: %{base_name}.png @@ -81,89 +83,18 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i ]; then - mv -f \$SOURCEDIR/\$i \$SOURCEDIR/\$i.prev - BACKUP=1 - fi - done - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) - for i in %{base_name}.desktop %{base_name}.png; do - rpm2cpio \$i | ( cd \$TMPDIR; cpio -i \$i ) - done ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i \$TMPDIR/\$i \$SOURCEDIR/\$i || exit 1 - done - else - cp -i "\$3" \$SPECDIR || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i %{_datadir}/%{base_name}/\$i \$SOURCEDIR/\$i || exit 1 - done - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME1=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-plugin-%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - echo "Installing \$RPMNAME1" - RPMNAMES=\$RPMDIR/\$RPMNAME1 - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" - else - echo "Not installing \$RPMNAME2" - fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i.prev ]; then - mv -f \$SOURCEDIR/\$i.prev \$SOURCEDIR/\$i - fi - done - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@DATADIR@,%{_datadir}/%{base_name},g + s/@COPYSOURCES@/%{base_name}{.desktop,.png}/g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -193,20 +124,14 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %files %defattr(644,root,root,755) -%if ! %{with license_agreement} +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else @@ -247,6 +172,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/28 20:07:12 glen +- use shared license-installer.sh from SOURCES +- rel 2 + Revision 1.45 2005/08/19 11:31:03 blekot - up to 701 (7.0.1) (security bug fixed) @@ -312,7 +241,7 @@ - updated to 509 Revision 1.30 2003/09/26 14:03:20 adgor -- Desktop file moved to %%{_desktopdir} +- Desktop file moved to %{_desktopdir} Revision 1.29 2003/09/12 22:35:39 grzegol - added icon @@ -359,7 +288,7 @@ - security update to 506, updated patch Revision 1.15 2002/05/23 20:58:50 qboosh -- new %%doc +- new %doc - +x for nppdf.so (but it doesn't work for me anyway) Revision 1.14 2002/05/22 10:36:53 zagrodzki @@ -370,7 +299,7 @@ - ... and placed in an appropriate subpackage Revision 1.12 2002/04/25 15:41:38 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/02/22 23:28:40 kloczek - removed all Group fields translations (our rpm now can handle translating @@ -381,7 +310,7 @@ - release 3 Revision 1.9 2002/01/18 02:12:18 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.8 2001/10/31 10:50:37 qboosh - adapterized, cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.45&r2=1.46&f=u From qboosh at pld-linux.org Sun Aug 28 22:07:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: geos-2.1.4.tar.bz2 Message-ID: <10251.1125259674@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geos.refractions.net/geos-2.1.4.tar.bz2 e00524abc2cb26c8fb9173b8696be3b7 geos-2.1.4.tar.bz2 Size: 506683 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:07:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: geos.spec - updated to 2.1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:07:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.4 ---- Files affected: SPECS: geos.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/geos.spec diff -u SPECS/geos.spec:1.6 SPECS/geos.spec:1.7 --- SPECS/geos.spec:1.6 Mon Jul 25 08:34:29 2005 +++ SPECS/geos.spec Sun Aug 28 22:07:47 2005 @@ -2,12 +2,12 @@ Summary: Geometry Engine - Open Source Summary(pl): GEOS - silnik geometryczny z otwartymi ?r?d?ami Name: geos -Version: 2.1.3 +Version: 2.1.4 Release: 1 License: LGPL Group: Libraries Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2 -# Source0-md5: 29aa82867cb68fed607cd015b61499df +# Source0-md5: e00524abc2cb26c8fb9173b8696be3b7 Patch0: %{name}-config.patch URL: http://geos.refractions.net/ BuildRequires: automake @@ -100,6 +100,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 20:07:47 qboosh +- updated to 2.1.4 + Revision 1.6 2005/07/25 06:34:29 qboosh - updated to 2.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/geos.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Sun Aug 28 22:10:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: vdk.spec - libsigc++1-devel and libsigc++12-devel BRs remov... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:10:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by vdk ---- Files affected: SPECS: vdk.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.25 SPECS/vdk.spec:1.26 --- SPECS/vdk.spec:1.25 Sun Aug 28 09:16:28 2005 +++ SPECS/vdk.spec Sun Aug 28 22:10:24 2005 @@ -21,9 +21,6 @@ BuildRequires: freetype-devel >= 2.0.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel -# both??? -BuildRequires: libsigc++1-devel -BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: perl-devel >= 1:5.6 @@ -123,6 +120,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 20:10:24 twittner +- libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by + vdk + Revision 1.25 2005/08/28 07:16:28 qboosh - updated gtk+2 epoch; sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.25&r2=1.26&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: ecasound.spec - updated to 2.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:19:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.4.3 ---- Files affected: SPECS: ecasound.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/ecasound.spec diff -u SPECS/ecasound.spec:1.88 SPECS/ecasound.spec:1.89 --- SPECS/ecasound.spec:1.88 Sat Aug 13 21:03:45 2005 +++ SPECS/ecasound.spec Sun Aug 28 22:19:23 2005 @@ -9,12 +9,12 @@ Summary: Software package for multitrack audio processing Summary(pl): Oprogramowanie do wielo?cie?kowego przetwarzania d?wi?ku Name: ecasound -Version: 2.4.2 +Version: 2.4.3 Release: 1 License: GPL Group: Applications/Sound Source0: http://ecasound.seul.org/download/%{name}-%{version}.tar.gz -# Source0-md5: 77c10152f5a15da13f7876f0da30d592 +# Source0-md5: ea4af6ffa9f00743270151927f7b4584 Patch0: %{name}-link.patch URL: http://ecasound.seul.org/ %{?with_alsa:BuildRequires: alsa-lib-devel} @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/28 20:19:23 qboosh +- updated to 2.4.3 + Revision 1.88 2005/08/13 19:03:45 qboosh - updated to 2.4.2, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecasound.spec?r1=1.88&r2=1.89&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: ecasound-2.4.3.tar.gz Message-ID: <26938.1125260380@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ecasound.seul.org/download/ecasound-2.4.3.tar.gz ea4af6ffa9f00743270151927f7b4584 ecasound-2.4.3.tar.gz Size: 1112995 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:20:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: python-gstreamer.spec - add pth file; import gst works now In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:20:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pth file; import gst works now ---- Files affected: SPECS: python-gstreamer.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.8 SPECS/python-gstreamer.spec:1.9 --- SPECS/python-gstreamer.spec:1.8 Sun Aug 28 22:04:35 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:20:12 2005 @@ -49,6 +49,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +echo "gst" > $RPM_BUILD_ROOT%{py_sitedir}/gst.pth + cp -R examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %clean @@ -59,6 +61,7 @@ %doc AUTHORS ChangeLog NEWS README TODO %dir %{py_sitedir}/gst %attr(755,root,root) %{py_sitedir}/gst/*.so +%{py_sitedir}/*.pth %{py_sitescriptdir}/gst/*py[co] %{_pkgconfigdir}/*.pc %{_datadir}/%{pname} @@ -70,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 20:20:12 arekm +- add pth file; import gst works now + Revision 1.8 2005/08/28 20:04:35 arekm - up to 0.8.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Sun Aug 28 22:24:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: license-installer.sh - fix for installing from local src.rpm In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:24:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix for installing from local src.rpm ---- Files affected: SOURCES: license-installer.sh (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.5 SOURCES/license-installer.sh:1.6 --- SOURCES/license-installer.sh:1.5 Sun Aug 28 22:06:22 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:24:17 2005 @@ -21,16 +21,18 @@ done fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR + ( if echo "$3" | grep '://' >/dev/null; then + cd $SRPMDIR wget --passive-ftp -t0 "$3" else - cp -f "$3" . + cp -f "$3" $SRPMDIR + cd $SRPMDIR fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then for i in @COPYSOURCES@; do - rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i $i ) done fi ) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: fakeroot.spec - updated to 1.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.3 ---- Files affected: SPECS: fakeroot.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: SPECS/fakeroot.spec diff -u SPECS/fakeroot.spec:1.46 SPECS/fakeroot.spec:1.47 --- SPECS/fakeroot.spec:1.46 Mon Jul 18 21:23:16 2005 +++ SPECS/fakeroot.spec Sun Aug 28 22:25:16 2005 @@ -3,12 +3,12 @@ Summary(pl): Umo?liwia uzyskanie ,,podrobionego'' ?rodowiska roota Summary(pt_BR): Cria um falso ambiente de root Name: fakeroot -Version: 1.4.2 +Version: 1.4.3 Release: 1 License: GPL (see COPYING) Group: Development/Tools Source0: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz -# Source0-md5: 42f7b5fa763c9a302387d4228d9376c2 +# Source0-md5: bf9cd1d9b98adcf1a94741fc2db0442e BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: libtool @@ -97,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.47 2005/08/28 20:25:16 qboosh +- updated to 1.4.3 + Revision 1.46 2005/07/18 19:23:16 darekr - updated to 1.4.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fakeroot.spec?r1=1.46&r2=1.47&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: fakeroot_1.4.3.tar.gz Message-ID: <3788.1125260725@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.4.3.tar.gz bf9cd1d9b98adcf1a94741fc2db0442e fakeroot_1.4.3.tar.gz Size: 1141657 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:26:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: file-ia64.patch (REMOVED), file-4.14.patch1 (REMOVED) - o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:26:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: file-ia64.patch (1.5 -> NONE) (REMOVED), file-4.14.patch1 (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 22:27:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: file-debian.patch - updated for 4.15 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.15 ---- Files affected: SOURCES: file-debian.patch (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/file-debian.patch diff -u SOURCES/file-debian.patch:1.11 SOURCES/file-debian.patch:1.12 --- SOURCES/file-debian.patch:1.11 Mon Jul 18 23:19:42 2005 +++ SOURCES/file-debian.patch Sun Aug 28 22:27:00 2005 @@ -1,8 +1,8 @@ ---- file-4.13.orig/doc/file.man -+++ file-4.13/doc/file.man +--- file-4.15/doc/file.man.orig 2005-08-18 17:18:22.000000000 +0200 ++++ file-4.15/doc/file.man 2005-08-28 22:16:00.615271312 +0200 @@ -1,4 +1,4 @@ -.TH FILE __CSECTION__ "Copyright but distributable" -+.TH FILE __CSECTION__ "January 2004" "Copyrighted but distributable" ++.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable" .\" $Id$ .SH NAME file @@ -31,7 +31,7 @@ magic file .I __MAGIC__.mgc , or -@@ -339,12 +340,6 @@ +@@ -368,12 +369,6 @@ The order of entries in the magic file is significant. Depending on what system you are using, the order that they are put together may be incorrect. @@ -44,7 +44,7 @@ .SH EXAMPLES .nf $ file file.c file /dev/{wd0a,hda} -@@ -498,3 +493,7 @@ +@@ -527,3 +522,7 @@ .B ftp.astron.com in the directory .I /pub/file/file-X.YZ.tar.gz ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/file-debian.patch?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 22:27:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: file-4.15.tar.gz file-non-english-man-pages.tar.bz2 Message-ID: <7239.1125260868@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.astron.com/pub/file/file-4.15.tar.gz 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz Size: 546522 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/file-non-english-man-pages.tar.bz2 c157a183b64156f8baafaefd9cbf04c1 file-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:27:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: file.spec - updated to 4.15, updated debian patch, removed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches ---- Files affected: SPECS: file.spec (1.107 -> 1.108) ---- Diffs: ================================================================ Index: SPECS/file.spec diff -u SPECS/file.spec:1.107 SPECS/file.spec:1.108 --- SPECS/file.spec:1.107 Tue Jul 19 17:56:26 2005 +++ SPECS/file.spec Sun Aug 28 22:27:40 2005 @@ -28,25 +28,23 @@ Summary(zh_CN): ???????????????????? Summary(zh_TW): ?????M?w???????????@???u???{???C Name: file -Version: 4.14 +Version: 4.15 Release: 1 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz -# Source0-md5: 66983e60087e8bcd588c8ab38a861af0 +# Source0-md5: 09a6603dadbe06e577e98a2547201fab Source1: zisofs.magic Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source2-md5: c157a183b64156f8baafaefd9cbf04c1 Source3: %{name}-magic.mscompress Patch0: %{name}-debian.patch Patch1: %{name}-sparc.patch -Patch2: %{name}-ia64.patch -Patch3: %{name}-unicode.patch -Patch4: %{name}-dicom.patch -Patch5: %{name}-lmagic.patch -Patch6: %{name}-python2.4.patch -Patch7: %{name}-greedy-dump.patch -Patch8: ftp://ftp.astron.com/pub/file/%{name}-4.14.patch1 +Patch2: %{name}-unicode.patch +Patch3: %{name}-dicom.patch +Patch4: %{name}-lmagic.patch +Patch5: %{name}-python2.4.patch +Patch6: %{name}-greedy-dump.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -253,11 +251,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p0 - -# temporary workaround -touch magic/Magdir/mup %build %{__libtoolize} @@ -357,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108 2005/08/28 20:27:40 qboosh +- updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches + Revision 1.107 2005/07/19 15:56:26 qboosh - Conflicts: rpm-build < 4.4.1-9 (new .mgc format - needs internal file update in rpm) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file.spec?r1=1.107&r2=1.108&f=u From paladine at pld-linux.org Sun Aug 28 22:30:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: epiphany-1.7.6.tar.bz2 Message-ID: <12086.1125261049@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/epiphany-1.7.6.tar.bz2 f03624c24f021b058136b46fbf54bc31 epiphany-1.7.6.tar.bz2 Size: 3345557 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS (DEVEL): epiphany.spec - updated to 1.7.6 - enabled dbus and... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:30:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.6 - enabled dbus and python support ---- Files affected: SPECS: epiphany.spec (1.99.2.10 -> 1.99.2.11) ---- Diffs: ================================================================ Index: SPECS/epiphany.spec diff -u SPECS/epiphany.spec:1.99.2.10 SPECS/epiphany.spec:1.99.2.11 --- SPECS/epiphany.spec:1.99.2.10 Sun Aug 21 11:53:35 2005 +++ SPECS/epiphany.spec Sun Aug 28 22:30:40 2005 @@ -6,12 +6,12 @@ Summary(es): Epiphany - navigador Web de GNOME basado en gecko Summary(pl): Epiphany - przegl?darka WWW dla GNOME Name: epiphany -Version: 1.7.5 +Version: 1.7.6 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d27b716603b9c36be91430c366077423 +# Source0-md5: f03624c24f021b058136b46fbf54bc31 Patch0: %{name}-first-tab.patch Patch1: %{name}-desktop.patch Patch2: %{name}-mozilla_includes.patch @@ -22,6 +22,7 @@ BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 +BuildRequires: dbus-glib-devel >= 0.34 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gnome-desktop-devel >= 2.10.0-2 BuildRequires: gnome-doc-utils >= 0.3.2-1 @@ -45,8 +46,8 @@ BuildRequires: pango-devel >= 1:1.8.1 BuildRequires: pkgconfig # Requries but python package not present? -#BuildRequires: python-gnome-devel >= 2.6.0 -#BuildRequires: python-pygtk-devel >= 2.6.0 +BuildRequires: python-gnome-devel >= 2.6.0 +BuildRequires: python-pygtk-devel >= 2.6.0 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -113,7 +114,9 @@ %configure \ --disable-schemas-install \ + --enable-dbus \ --enable-gtk-doc \ + --enable-python \ --with-html-dir=%{_gtkdocdir} # CFLAGS is a hack for gcc 3.3 %{__make} \ @@ -179,6 +182,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99.2.11 2005/08/28 20:30:40 paladine +- updated to 1.7.6 +- enabled dbus and python support + Revision 1.99.2.10 2005/08/21 09:53:35 wiget - update to 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.99.2.10&r2=1.99.2.11&f=u From arekm at pld-linux.org Sun Aug 28 22:31:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: flumotion-0.1.9.tar.bz2 Message-ID: <13569.1125261112@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.flumotion.net/src/flumotion/flumotion-0.1.9.tar.bz2 7f2b4abbabd7756d1d689b38fd477d3e flumotion-0.1.9.tar.bz2 Size: 655419 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:31:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: flumotion.spec (NEW) - raw In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:31:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - raw ---- Files affected: SPECS: flumotion.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u /dev/null SPECS/flumotion.spec:1.1 --- /dev/null Sun Aug 28 22:31:47 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:31:42 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +# +Summary: the Fluendo Streaming Server +Name: flumotion +Version: 0.1.9 +Release: 0.1 +License: GPL +Group: Daemons +Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 +# Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e +URL: http://www.flumotion.net/ +BuildRequires: gstreamer-devel >= 0.8 +BuildRequires: python-pygtk-devel >= 2.4.0 +BuildRequires: python-gstreamer >= 0.8.2-1 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Flumotion is a streaming media server created with the backing of +Fluendo. It features intuitive graphical administration tools, making +the task of setting up and manipulating audio and video streams easy +for even novice system administrators. + +%prep +%setup -q + +%build +install %{_datadir}/automake/config.* . +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver +install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(644,root,root,755) + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 20:31:42 arekm +- raw + ================================================================ From paladine at pld-linux.org Sun Aug 28 22:32:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES (DEVEL): epiphany-extensions-mozilla_includes.patch, epiph... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:32:22 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 1.7.5 ---- Files affected: SOURCES: epiphany-extensions-mozilla_includes.patch (1.3 -> 1.3.2.1) , epiphany-extensions-locale-names.patch (1.8.2.2 -> 1.8.2.3) ---- Diffs: ================================================================ Index: SOURCES/epiphany-extensions-mozilla_includes.patch diff -u SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 SOURCES/epiphany-extensions-mozilla_includes.patch:1.3.2.1 --- SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 Mon Mar 14 11:37:43 2005 +++ SOURCES/epiphany-extensions-mozilla_includes.patch Sun Aug 28 22:32:16 2005 @@ -1,20 +1,43 @@ -diff -urN aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2005-02-08 17:20:49.260647760 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am 2005-08-28 20:49:56.203735032 +0200 ++++ epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am 2005-08-28 22:02:24.092755432 +0200 +@@ -11,6 +11,8 @@ + content \ + docshell \ + dom \ ++ necko \ ++ webbrwsr \ + xpcom + + libadblockmozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:49:56.494690800 +0200 ++++ epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:56:30.391809336 +0200 +@@ -9,6 +9,7 @@ + content \ + docshell \ + dom \ ++ webbrwsr \ + xpcom + + libautoscrollermozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:49:53.852092536 +0200 ++++ epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:54:26.401658704 +0200 @@ -16,7 +16,8 @@ . \ dom \ jsconsole \ - necko -+ necko \ ++ necko \ + webbrwsr liberrorviewermozilla_la_CPPFLAGS = \ -I.. \ -diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2005-02-08 17:25:38.975604392 +0100 -@@ -12,6 +12,7 @@ +diff -urN epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am 2005-08-28 20:49:53.625127040 +0200 ++++ epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am 2005-08-28 22:14:59.178964880 +0200 +@@ -14,6 +14,7 @@ layout \ nkcache \ necko \ @@ -22,14 +45,14 @@ uconv \ webbrwsr -diff -urN aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2004-12-08 16:33:53.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2005-02-08 17:28:31.583364024 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:49:55.301872136 +0200 ++++ epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:55:09.807060080 +0200 @@ -6,6 +6,7 @@ mozilla_include_subdirs = \ . \ -+ dom \ ++ dom \ necko \ nkcache \ webbrwsr ================================================================ Index: SOURCES/epiphany-extensions-locale-names.patch diff -u SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 SOURCES/epiphany-extensions-locale-names.patch:1.8.2.3 --- SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 Wed Jul 27 12:59:25 2005 +++ SOURCES/epiphany-extensions-locale-names.patch Sun Aug 28 22:32:17 2005 @@ -1,8 +1,8 @@ -diff -urN epiphany-extensions-1.7.3.orig/po/LINGUAS epiphany-extensions-1.7.3/po/LINGUAS ---- epiphany-extensions-1.7.3.orig/po/LINGUAS 2005-07-27 12:41:10.176624984 +0200 -+++ epiphany-extensions-1.7.3/po/LINGUAS 2005-07-27 12:41:54.018959936 +0200 +diff -urN epiphany-extensions-1.7.5.orig/po/LINGUAS epiphany-extensions-1.7.5/po/LINGUAS +--- epiphany-extensions-1.7.5.orig/po/LINGUAS 2005-08-28 19:21:04.768236424 +0200 ++++ epiphany-extensions-1.7.5/po/LINGUAS 2005-08-28 19:21:40.660779928 +0200 @@ -1,3 +1,3 @@ # please keep this list sorted alphabetically # --bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW -+bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nb nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW +-bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ++bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt nb ne nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/epiphany-extensions-mozilla_includes.patch?r1=1.3&r2=1.3.2.1&f=u http://cvs.pld-linux.org/SOURCES/epiphany-extensions-locale-names.patch?r1=1.8.2.2&r2=1.8.2.3&f=u From paladine at pld-linux.org Sun Aug 28 22:33:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: epiphany-extensions-1.7.5.tar.bz2 Message-ID: <16361.1125261216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/epiphany-extensions-1.7.5.tar.bz2 ff01cb95c6348501fbd69c4203147204 epiphany-extensions-1.7.5.tar.bz2 Size: 606693 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:33:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - updated to 1.7.5 - updat... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:33:33 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.5 - updated patches - it's DEVEL, so lets enable really all extensions ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.6 -> 1.37.2.7) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.6 SPECS/epiphany-extensions.spec:1.37.2.7 --- SPECS/epiphany-extensions.spec:1.37.2.6 Mon Aug 22 21:38:11 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 22:33:28 2005 @@ -5,18 +5,18 @@ Summary: Collection of extensions for Epiphany Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions -Version: 1.7.4 -Release: 3 +Version: 1.7.5 +Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d175f0747254595d369aa75baa64a0a4 +# Source0-md5: ff01cb95c6348501fbd69c4203147204 Patch0: %{name}-locale-names.patch Patch1: %{name}-mozilla_includes.patch URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.5 +BuildRequires: epiphany-devel >= 1.7.6 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=all + --with-extensions=really-all %{__make} %install @@ -94,6 +94,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.7 2005/08/28 20:33:28 paladine +- updated to 1.7.5 +- updated patches +- it's DEVEL, so lets enable really all extensions + Revision 1.37.2.6 2005/08/22 19:38:11 paladine - rel. 3 for epiphany 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.6&r2=1.37.2.7&f=u From darekr at pld-linux.org Sun Aug 28 22:37:09 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: flumotion.spec - BR: automake; unify In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 20:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: automake; unify ---- Files affected: SPECS: flumotion.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.1 SPECS/flumotion.spec:1.2 --- SPECS/flumotion.spec:1.1 Sun Aug 28 22:31:42 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:37:03 2005 @@ -9,6 +9,7 @@ Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 # Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e URL: http://www.flumotion.net/ +BuildRequires: automake BuildRequires: gstreamer-devel >= 0.8 BuildRequires: python-pygtk-devel >= 2.4.0 BuildRequires: python-gstreamer >= 0.8.2-1 @@ -24,7 +25,7 @@ %setup -q %build -install %{_datadir}/automake/config.* . +install /usr/share/automake/config.* . %configure %{__make} @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 20:37:03 darekr +- BR: automake; unify + Revision 1.1 2005/08/28 20:31:42 arekm - raw ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 22:44:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: flumotion.spec - pl, some files In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:44:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, some files ---- Files affected: SPECS: flumotion.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.2 SPECS/flumotion.spec:1.3 --- SPECS/flumotion.spec:1.2 Sun Aug 28 22:37:03 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:44:05 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -# -Summary: the Fluendo Streaming Server +Summary: The Fluendo Streaming Server +Summary(pl): Serwer strumieni Fluendo Name: flumotion Version: 0.1.9 Release: 0.1 @@ -21,6 +21,12 @@ the task of setting up and manipulating audio and video streams easy for even novice system administrators. +%description -l pl +Flumotion to serwer strumieni multimedialnych stworzony przy poparciu +Fluendo. Ma intuicyjne graficzne narz?dzia administracyjne, czyni?ce +zadanie konfiguracji i obr?bki strumieni d?wi?ku i obrazu ?atwym nawet +dla pocz?tkuj?cych administrator?w system?w. + %prep %setup -q @@ -46,6 +52,8 @@ %files %defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/ffserver +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -53,9 +61,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/28 20:44:05 qboosh +- pl, some files + Revision 1.2 2005/08/28 20:37:03 darekr - BR: automake; unify Revision 1.1 2005/08/28 20:31:42 arekm - raw - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.2&r2=1.3&f=u From twittner at pld-linux.org Sun Aug 28 22:59:06 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: vdkbuilder.desktop (NEW) - desktop file for vdkbuilder In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - desktop file for vdkbuilder ---- Files affected: SOURCES: vdkbuilder.desktop (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder.desktop diff -u /dev/null SOURCES/vdkbuilder.desktop:1.1 --- /dev/null Sun Aug 28 22:59:05 2005 +++ SOURCES/vdkbuilder.desktop Sun Aug 28 22:59:00 2005 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=VDK Builder IDE +Comment=VDK Builder IDE +Icon=vdkb2.png +Exec=vdkb2 +Terminal=false +Type=Application +Categories=GTK2;Development;IDE; +Encoding=UTF-8 +# vi: encoding=utf-8 ================================================================ From twittner at pld-linux.org Sun Aug 28 22:59:37 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: vdkbuilder.spec - added tutorial and desktop file In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added tutorial and desktop file ---- Files affected: SPECS: vdkbuilder.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.15 SPECS/vdkbuilder.spec:1.16 --- SPECS/vdkbuilder.spec:1.15 Sun Aug 28 02:26:44 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 22:59:32 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%define _tutver 1.1 Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder @@ -8,6 +9,9 @@ Group: Development/Tools Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz # Source0-md5: 91216ce6659e447862b2bdc7335074fc +Source1: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-%{_tutver}.pdf.gz +# Source1-md5: 06d2e9b1dab6bec28d7ea3b6819dfb67 +Source2: %{name}.desktop Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf @@ -60,6 +64,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install %{SOURCE1} . +install -D %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -68,10 +75,11 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello vdktutorial-%{_tutver}.pdf.gz %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* +%{_desktopdir}/%{name}.desktop %{_pixmapsdir}/*.png %{_datadir}/vdkb2 @@ -86,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/28 20:59:32 twittner +- added tutorial and desktop file + Revision 1.15 2005/08/28 00:26:44 twittner - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.15&r2=1.16&f=u From qboosh at pld-linux.org Sun Aug 28 23:02:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SOURCES: libfpx-fix.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: libfpx-fix.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sun Aug 28 23:02:41 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz vdktutorial-1.1.pdf.gz Message-ID: <19782.1125262961@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz STORED: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-1.1.pdf.gz 06d2e9b1dab6bec28d7ea3b6819dfb67 vdktutorial-1.1.pdf.gz Size: 1602382 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 23:02:46 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: libfpx.spec - updated to 1.2.0.13, removed obsolete fix patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.0.13, removed obsolete fix patch ---- Files affected: SPECS: libfpx.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/libfpx.spec diff -u SPECS/libfpx.spec:1.36 SPECS/libfpx.spec:1.37 --- SPECS/libfpx.spec:1.36 Wed Jun 15 23:39:26 2005 +++ SPECS/libfpx.spec Sun Aug 28 23:02:40 2005 @@ -1,19 +1,19 @@ # $Revision$, $Date$ +# # Conditional build: %bcond_without static_libs # don't build static library # Summary: FlashPIX OpenSource Toolkit Summary(pl): Biblioteka do obr?bki obrazk?w FlashPIX Name: libfpx -Version: 1.2.0.12 +Version: 1.2.0.13 Release: 1 License: distributable (see COPYING) Group: Libraries # Strange... [URL] says you can order it (for money) and doesn't contain any # link, but sources can be freely redistributed. Can be found on any IM mirror. Source0: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/%{name}-%{version}.tar.bz2 -# Source0-md5: a82d33cc0ede71752802da0f410398b8 -Patch0: %{name}-fix.patch +# Source0-md5: 5e781a17ec96e8f9af8c2ff319e8d706 URL: http://www.i3a.org/i_flashpix.html BuildRequires: autoconf >= 2.55 BuildRequires: automake >= 1:1.9 @@ -62,7 +62,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 21:02:40 qboosh +- updated to 1.2.0.13, removed obsolete fix patch + Revision 1.36 2005/06/15 21:39:26 witekfl - added bcond_without static_libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libfpx.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 23:09:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: libfpx-1.2.0.13.tar.bz2 Message-ID: <24114.1125263342@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/libfpx-1.2.0.13.tar.bz2 5e781a17ec96e8f9af8c2ff319e8d706 libfpx-1.2.0.13.tar.bz2 Size: 2259745 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 23:14:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: aspell-pl-alt.spec - up to 20050828 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:14:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 20050828 ---- Files affected: SPECS: aspell-pl-alt.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/aspell-pl-alt.spec diff -u SPECS/aspell-pl-alt.spec:1.43 SPECS/aspell-pl-alt.spec:1.44 --- SPECS/aspell-pl-alt.spec:1.43 Mon Jul 25 11:44:45 2005 +++ SPECS/aspell-pl-alt.spec Sun Aug 28 23:14:21 2005 @@ -2,12 +2,12 @@ Summary: An alternative Polish dictionary for aspell by kurnik.pl Summary(pl): Alternatywny polski s?ownik dla aspella autorstwa kurnik.pl Name: aspell-pl-alt -Version: 20050725 +Version: 20050828 Release: 1 License: Creative Commons License (see legalcode.html) Group: Applications/Text Source0: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-%{version}.tar.bz2 -# Source0-md5: f48c44862fa9da9c9d109034702ab43c +# Source0-md5: 5d4b6fe220492e79290d64f27a0204ae Source1: http://creativecommons.org/licenses/sa/1.0/legalcode # Source1-md5: 0ed76e90db3d98d93cf6f7a610c10f77 Patch0: %{name}-configure.patch @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 21:14:21 arekm +- up to 20050828 + Revision 1.43 2005/07/25 09:44:45 blekot - up to 20050725 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aspell-pl-alt.spec?r1=1.43&r2=1.44&f=u From arekm at pld-linux.org Sun Aug 28 23:14:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: alt-aspell-pl-20050828.tar.bz2 legalcode Message-ID: <7759.1125263670@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-20050828.tar.bz2 5d4b6fe220492e79290d64f27a0204ae alt-aspell-pl-20050828.tar.bz2 Size: 653409 bytes ALREADY GOT: http://creativecommons.org/licenses/sa/1.0/legalcode 0ed76e90db3d98d93cf6f7a610c10f77 legalcode -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 23:35:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - disable adblock (epiphan... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 21:35:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - disable adblock (epiphany craches on exit) - disable net-monitor (experimental) - disable sample extensions - disable tabsmenu (doesn't work) - disable greasemonkey - rel. 2 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.7 -> 1.37.2.8) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.7 SPECS/epiphany-extensions.spec:1.37.2.8 --- SPECS/epiphany-extensions.spec:1.37.2.7 Sun Aug 28 22:33:28 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 23:35:22 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.5 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=really-all + --with-extensions=all,rss %{__make} %install @@ -94,6 +94,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.8 2005/08/28 21:35:22 paladine +- disable adblock (epiphany craches on exit) +- disable net-monitor (experimental) +- disable sample extensions +- disable tabsmenu (doesn't work) +- disable greasemonkey +- rel. 2 + Revision 1.37.2.7 2005/08/28 20:33:28 paladine - updated to 1.7.5 - updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.7&r2=1.37.2.8&f=u From qboosh at pld-linux.org Sun Aug 28 23:52:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: crossalpha-binutils.spec - updated to 2.16.91.0.3 (2.16.91.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:52:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) ---- Files affected: SPECS: crossalpha-binutils.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/crossalpha-binutils.spec diff -u SPECS/crossalpha-binutils.spec:1.18 SPECS/crossalpha-binutils.spec:1.19 --- SPECS/crossalpha-binutils.spec:1.18 Thu Jul 28 21:07:52 2005 +++ SPECS/crossalpha-binutils.spec Sun Aug 28 23:52:05 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - ALPHA binutils Summary(tr): GNU geli?tirme ara?lar? - ALPHA binutils Name: crossalpha-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/28 21:52:05 qboosh +- updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) + Revision 1.18 2005/07/28 19:07:52 pluto - updated to 2.16.91.0.2. @@ -166,4 +169,3 @@ Revision 1.1 2004/06/12 10:57:11 ankry - initial - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossalpha-binutils.spec?r1=1.18&r2=1.19&f=u From arekm at pld-linux.org Sun Aug 28 23:52:55 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: openclipart.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:52:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: openclipart.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/openclipart.spec diff -u SPECS/openclipart.spec:1.5 SPECS/openclipart.spec:1.6 --- SPECS/openclipart.spec:1.5 Sat Aug 13 13:28:00 2005 +++ SPECS/openclipart.spec Sun Aug 28 23:52:50 2005 @@ -3,7 +3,7 @@ Summary(pl): Archiwum klipart?w, kt?re mo?na u?ywa? w dowolny spos?b za darmo Name: openclipart Version: 0.16 -Release: 0.1 +Release: 1 Epoch: 0 License: Creative Commons and/or Public Domain Group: Applications/Graphics @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 21:52:50 arekm +- rel 1 + Revision 1.5 2005/08/13 11:28:00 qboosh - Obsoletes for dropped subpackages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openclipart.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: SPECS: inkscape.spec - updated to 0.42.2 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:58:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.42.2 ---- Files affected: SPECS: inkscape.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/inkscape.spec diff -u SPECS/inkscape.spec:1.39 SPECS/inkscape.spec:1.40 --- SPECS/inkscape.spec:1.39 Sun Jul 31 14:05:45 2005 +++ SPECS/inkscape.spec Sun Aug 28 23:58:00 2005 @@ -9,31 +9,33 @@ Summary: Scalable vector graphics editor Summary(pl): Edytor skalowalnej grafiki wektorowej Name: inkscape -Version: 0.42 -Release: 2 +Version: 0.42.2 +Release: 1 License: GPL v2, LGPL v2.1 Group: Applications/Graphics Source0: http://dl.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# Source0-md5: 4af587b942647bf9e27861e2238844c8 +# Source0-md5: a27172087018e850e92e97e52b5dad08 URL: http://www.inkscape.org/ BuildRequires: autoconf >= 2.59-3 BuildRequires: automake >= 1:1.9.4-2 BuildRequires: freetype-devel >= 2.0 BuildRequires: gc-devel >= 6.4 +BuildRequires: gcc-c++ >= 3.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: gtkmm-devel >= 2.4 -BuildRequires: gtkspell-devel -BuildRequires: intltool +BuildRequires: gtkspell-devel >= 2.0 +BuildRequires: intltool >= 0.22 BuildRequires: libart_lgpl-devel >= 2.3.10 %{?with_gnome_print:BuildRequires: libgnomeprintui-devel >= 1.116.0} -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 1.2 BuildRequires: libsigc++-devel >= 2.0.3 BuildRequires: libtool -BuildRequires: libxml2-devel >= 2.4.24 +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pkgconfig BuildRequires: popt-devel %{?with_xft:BuildRequires: xft-devel} +BuildRequires: zlib-devel Requires(post,postun): shared-mime-info Requires: gc >= 6.4 Requires: gtk+2 >= 2:2.4.0 @@ -116,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/28 21:58:00 qboosh +- updated to 0.42.2 + Revision 1.39 2005/07/31 12:05:45 wolf - fix extensions - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/inkscape.spec?r1=1.39&r2=1.40&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:14:17 2005 Subject: DISTFILES: inkscape-0.42.2.tar.bz2 Message-ID: <19635.1125266310@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/inkscape/inkscape-0.42.2.tar.bz2 a27172087018e850e92e97e52b5dad08 inkscape-0.42.2.tar.bz2 Size: 5724173 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 00:14:37 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mutt.spec - a year has passed, time for an integer release ... In-Reply-To: References: Message-ID: Author: adamg Date: Sun Aug 21 22:14:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - a year has passed, time for an integer release :) - release 9 ---- Files affected: SPECS: mutt.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.181 SPECS/mutt.spec:1.182 --- SPECS/mutt.spec:1.181 Sun Aug 21 21:38:55 2005 +++ SPECS/mutt.spec Mon Aug 22 00:14:31 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 8.1 +Release: 9 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/21 22:14:31 adamg +- a year has passed, time for an integer release :) +- release 9 + Revision 1.181 2005/08/21 19:38:55 saq - bump ncurses BR for ncursesw - paths.patch for deterministic build with{,out} external progs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.181&r2=1.182&f=u From cvs at pld-linux.org Mon Aug 22 02:31:23 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 09:39:11 2005 Subject: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Message-ID: <6326@svn.pld-linux.org> Author: qwiat Date: Mon Aug 22 02:31:20 2005 New Revision: 6326 Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Log: - garsc roznych poprawek nadajacych rece i nogi rozdzialowi Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec ============================================================================== --- PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec (original) +++ PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Mon Aug 22 02:31:20 2005 @@ -32,8 +32,22 @@ do niego za? prowadzi ??cze o nazwie initrd. - Uwaga! Opr?cz sterownika kontrolera b?dziemy musieli doda? - modu? obs?ugi systemu plik?w dla partycji "/". + Poni?ej przedstawiono trzy metody generowania initrd. W + wi?kszo?ci wypadk?w najwygodniejszy b?dzie pierwszy spos?b, w + przypadku dw?ch pozosta?ych musimy zna? nasz sprz?t i system + plik?w partycji "/" aby wskaza? nazwy w?a?ciwych modu??w. Dwie + ostatnie maj? jedn? zasadnicz? przewag?, mog? by? + przeprowadzane na dowolnej maszynie. + + + Opis wykrywania sprz?tu i dobierania w?a?ciwych modu??w + opisano w . Przy + tworzeniu initrd przewa?nie musimy skorzysta? z operacji + chroot-a, mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba + najwygodniejsze b?dzie u?ycie systemu uruchamianego z + p?yty CD np.: PLD-Live lub + RescueCD. Opis procedury chroot-a + z p?yty typu Live znajdziemy w . @@ -42,14 +56,11 @@
Automatyczne generowanie initrd - Ca?y proces mo?emy zautomatyzowa?, pod??czaj?c dysk do - docelowej maszyny, musimy wtedy pos?u?y? si? inn? dystrybucj? - i wykona? operacj? chroot-a - opis jak to zrobi? znajduje - si? tutaj . - Mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba - najwygodniejsze b?dzie u?ycie systemu uruchamianego z - p?yty CD np.: PLD-Live lub - RescueCD. + Przewa?nie sprz?t i u?ywany system plik?w partycji + "/" mog? zosta? wykryte automatycznie. Proces ten zaczynamy + od pod??czenia dysku twardego do docelowej maszyny i + pos?u?enia si? inn? dystrybucj? w celu wykonania operacji + chroot-a. Je?li zmieni?y si? nazwy urz?dze? masowych po pod??czeniu dysku @@ -85,13 +96,13 @@
R?czne generowanie initrd - Ta operacja mo?e by? przeprowadzona z dowolnego komputera, - je?li nie jest to macierzysta maszyna u?yjemy dowolnej + Je?li nie jest to macierzysta maszyna u?yjemy dowolnej dystrybucji i operacji chroot-a. Metoda ta wymaga precyzyjnej znajomo?ci u?ywanego sprz?tu i systemu plik?w, gdy? sami musimy wskaza? odpowiednie modu?y. Jest jednak konieczna, - np. w sytuacji problemu z automatycznym wykryciem wymaganych - sterownik?w. + w przypadku problem?w z automatycznym wykryciem wymaganych + sterownik?w lub je?li chcemy operacj? wykona? na innej + maszynie ni? docelowa. Mo?emy wpisa? list? koniecznych modu??w do odpowiedniej @@ -112,30 +123,11 @@ {$nowy_initrd} {$wersja_j?dra} - np.: - -# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7 - - Powy?sze wywo?anie wymusi dodanie dodatkowo modu??w obs?ugi + Poni?ej zamieszczono przyk?adowe wywo?anie geninitrd dla systemu plik?w ext3 i kontrolera IDE - PDC20268 firmy Promise. - -
- - -
- Generowanie uniwersalnego initrd - - Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe. - Mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? - modu??w przy pomocy opcji - --with - tak jak to - przedstawiono w powy?szym rozdziale. - Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e - to spowodowa? wolniejszy start systemu i niepotrzebne - zu?ycie pami?ci operacyjnej przez nieu?ywane - sterowniki. + PDC20268 firmy Promise: +# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7
@@ -210,6 +202,27 @@
+
+ Uwagi + + Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe, + mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? + modu??w. Aby to zrobi? mo?emy dopisa? nazwy modu??w do + przedstawionych poni?ej opcji w pliku + /etc/sysconfig/geninitrd: +## Basic modules to be loaded +BASICMODULES="" +## Modules that should be loaded before anything (i.e. jbd for ext3) +PREMODS="" + mo?emy te? u?y? opcji + --with programu geninitrd, lub doda? + dodatkowe modu?y przy "r?cznym" budowaniu obrazu. + Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e + to spowodowa? wolniejszy start systemu i niepotrzebne + zu?ycie pami?ci operacyjnej przez nieu?ywane + sterowniki. + +
From adamg at pld-linux.org Mon Aug 22 06:29:33 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: Net_SMTP-1.2.7.tgz Message-ID: <19691.1124684973@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_SMTP-1.2.7.tgz 11c4de943b07206aab6193eefd8f328e Net_SMTP-1.2.7.tgz Size: 10240 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: php-pear-Net_SMTP.spec - updated to 1.2.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.7 ---- Files affected: SPECS: php-pear-Net_SMTP.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_SMTP.spec diff -u SPECS/php-pear-Net_SMTP.spec:1.16 SPECS/php-pear-Net_SMTP.spec:1.17 --- SPECS/php-pear-Net_SMTP.spec:1.16 Sat Dec 4 14:21:59 2004 +++ SPECS/php-pear-Net_SMTP.spec Mon Aug 22 06:29:29 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - implementation of the SMTP protocol Summary(pl): %{_pearname} - implementacja protoko?u SMTP Name: php-pear-%{_pearname} -Version: 1.2.6 -Release: 2 +Version: 1.2.7 +Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 69bcb47d571b72060beed0a7d8d852a5 +# Source0-md5: 11c4de943b07206aab6193eefd8f328e URL: http://pear.php.net/package/Net_SMTP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 04:29:29 adamg +- updated to 1.2.7 + Revision 1.16 2004/12/04 13:21:59 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_SMTP.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Mon Aug 22 06:29:50 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: Mail-1.1.7.tgz Message-ID: <19805.1124684990@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.7.tgz f6307041810d18da6c6d04acdcc9b72a Mail-1.1.7.tgz Size: 16165 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.7 ---- Files affected: SPECS: php-pear-Mail.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.21 SPECS/php-pear-Mail.spec:1.22 --- SPECS/php-pear-Mail.spec:1.21 Fri Dec 3 23:22:53 2004 +++ SPECS/php-pear-Mail.spec Mon Aug 22 06:29:44 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.4 -Release: 2 +Version: 1.1.7 +Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 3e14fef5bd418de87214a3271ffc4549 +# Source0-md5: f6307041810d18da6c6d04acdcc9b72a URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 04:29:44 adamg +- updated to 1.1.7 + Revision 1.21 2004/12/03 22:22:53 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.21&r2=1.22&f=u From aredridel at pld-linux.org Mon Aug 22 07:18:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: nss-mdns-0.6.tar.gz Message-ID: <7846.1124687938@distfiles.pld-linux.org> Files fetched: 1 STORED: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.6.tar.gz 46e4e6c200ee9dc4a466be5ff9247fbd nss-mdns-0.6.tar.gz Size: 323682 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Mon Aug 22 07:18:51 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: nss_mdns.spec - up to 0.6 In-Reply-To: References: Message-ID: Author: aredridel Date: Mon Aug 22 05:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6 ---- Files affected: SPECS: nss_mdns.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/nss_mdns.spec diff -u SPECS/nss_mdns.spec:1.4 SPECS/nss_mdns.spec:1.5 --- SPECS/nss_mdns.spec:1.4 Fri Feb 4 19:54:12 2005 +++ SPECS/nss_mdns.spec Mon Aug 22 07:18:44 2005 @@ -2,12 +2,12 @@ Summary: mDNS Service Switch Module Summary(pl): Modu? NSS mDNS Name: nss_mdns -Version: 0.3 +Version: 0.6 Release: 1 -License: LGPL +License: LGPL v2.1 Group: Base Source0: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz -# Source0-md5: 8fae540908567a96c2c8d71d22ccf210 +# Source0-md5: 46e4e6c200ee9dc4a466be5ff9247fbd URL: http://0pointer.de/lennart/projects/nss-mdns/ BuildRequires: autoconf BuildRequires: automake @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 05:18:44 aredridel +- up to 0.6 + Revision 1.4 2005/02/04 18:54:12 matowy - up to 0.3, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nss_mdns.spec?r1=1.4&r2=1.5&f=u From adamg at pld-linux.org Mon Aug 22 08:52:42 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: grabcartoons.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:52:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: grabcartoons.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u /dev/null SPECS/grabcartoons.spec:1.1 --- /dev/null Mon Aug 22 08:52:42 2005 +++ SPECS/grabcartoons.spec Mon Aug 22 08:52:36 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +Summary: commic-summarizing utility +Name: grabcartoons +Version: 1.11 +Release: 0.1 +License: BSD +Group: Applications +Source0: http://dl.sourceforge.net/grabcartoons/%{name}-%{version}.tar.gz +# Source0-md5: 751234c5072bb4a65a8f8d9b1775cc8c +Patch0: %{name}-DESTDIR.patch +URL: http://grabcartoons.sourceforge.net/ +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +GrabCartoons is a comic-summarizing utility. It is modular, and it is +very easy to write modules for new comics. + +%prep +%setup -q +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + PREFIX=%{_prefix} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/* +/usr/lib/grabcartoons + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 06:52:36 adamg +- new + ================================================================ From adamg at pld-linux.org Mon Aug 22 08:52:44 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: grabcartoons-1.11.tar.gz Message-ID: <18171.1124693564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/grabcartoons/grabcartoons-1.11.tar.gz 751234c5072bb4a65a8f8d9b1775cc8c grabcartoons-1.11.tar.gz Size: 16881 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 08:53:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SOURCES: grabcartoons-DESTDIR.patch (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:53:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: grabcartoons-DESTDIR.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/grabcartoons-DESTDIR.patch diff -u /dev/null SOURCES/grabcartoons-DESTDIR.patch:1.1 --- /dev/null Mon Aug 22 08:53:05 2005 +++ SOURCES/grabcartoons-DESTDIR.patch Mon Aug 22 08:52:59 2005 @@ -0,0 +1,17 @@ +--- grabcartoons-1.11/Makefile~ 2004-05-18 11:33:59.000000000 +0200 ++++ grabcartoons-1.11/Makefile 2005-08-22 08:45:49.937799616 +0200 +@@ -8,10 +8,10 @@ + @echo "Valid Targets: install targz. Use with care." + + install: +- mkdir -p -m 755 $(PREFIX)/bin +- mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules +- install -m 755 grabcartoons.pl $(PREFIX)/bin +- install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/bin ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules ++ install -m 755 grabcartoons.pl $(DESTDIR)$(PREFIX)/bin ++ install -m 644 modules/*.pl $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules + + targz: + cd $(TARGZDIR); rm -rf grabcartoon*; cvs -d :ext:zamboni@cvs.sourceforge.net:/cvsroot/grabcartoons export -Dtoday -d grabcartoons-$(VERSION) grabcartoons; tar zcvf $(TARGZFILE) grabcartoons-$(VERSION) ================================================================ From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: amavisd-new.spec - updated to 2.3.3 - release 2 ( rel 1 is ... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:08:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.3 - release 2 ( rel 1 is for Ra ) ---- Files affected: SPECS: amavisd-new.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/amavisd-new.spec diff -u SPECS/amavisd-new.spec:1.88 SPECS/amavisd-new.spec:1.89 --- SPECS/amavisd-new.spec:1.88 Tue Aug 9 21:50:14 2005 +++ SPECS/amavisd-new.spec Mon Aug 22 09:08:24 2005 @@ -5,13 +5,13 @@ Summary: A Mail Virus Scanner with SpamAssassin support - daemon Summary(pl): Antywirusowy skaner poczty elektronicznej z obs?ug? SpamAssasina - demon Name: amavisd-new -Version: 2.3.2 +Version: 2.3.3 Release: 2 Epoch: 1 License: GPL Group: Applications/Mail Source0: http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz -# Source0-md5: 4af47f7e0b2aaf71bd5783dc26a576a8 +# Source0-md5: 0b02df514c1a2bf8af346bc9c7e97111 Source1: %{name}.init Source2: %{name}-milter.init Patch0: %{name}-config.patch @@ -183,6 +183,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/22 07:08:24 paszczus +- updated to 2.3.3 +- release 2 ( rel 1 is for Ra ) + Revision 1.88 2005/08/09 19:50:14 hawk - updated to 2.3.2 - works for me, release 2 (1 will go to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/amavisd-new.spec?r1=1.88&r2=1.89&f=u From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: amavisd-new-2.3.3.tar.gz Message-ID: <26767.1124694511@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ijs.si/software/amavisd/amavisd-new-2.3.3.tar.gz 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz Size: 772280 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:15:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: awstats.spec - use apache config triggers, rel 1.10 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:15:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use apache config triggers, rel 1.10 ---- Files affected: SPECS: awstats.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/awstats.spec diff -u SPECS/awstats.spec:1.37 SPECS/awstats.spec:1.38 --- SPECS/awstats.spec:1.37 Sun Aug 21 19:59:25 2005 +++ SPECS/awstats.spec Mon Aug 22 09:15:07 2005 @@ -10,7 +10,7 @@ Summary(pl): Zaawansowany program do analizowania log?w serwera Name: awstats Version: 6.5 -Release: 1.5 +Release: 1.10 License: GPL Group: Applications/Networking Source0: http://awstats.sourceforge.net/files/%{name}-%{version}.tgz @@ -22,6 +22,8 @@ Patch1: %{name}-created_dir_mode.patch URL: http://awstats.sourceforge.net/ BuildRequires: rpm-perlprov +BuildRequires: rpmbuild(macros) >= 1.221 +Requires(triggerpostun): sed >= 4.0 Requires: perl-Geo-IP Requires: perl-Time-HiRes Requires: perl-Storable @@ -76,47 +78,51 @@ mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/awstats.model.conf $RPM_BUILD_ROOT%{_sysconfdir}/awstats mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/{lang,lib,plugins} $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/awstats -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf ln -s %{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl $RPM_BUILD_ROOT%{_bindir} -%post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf +%clean +rm -rf $RPM_BUILD_ROOT + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/awstats/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + +%triggerpostun -- %{name} < 6.5-1.10 +# migrate from old config location (only apache2, as there was no apache1 support) +if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then + cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} + mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/awstats/apache.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf +fi + +# nuke very-old config location +if [ ! -d /etc/httpd/httpd.conf ]; then + sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi +# apache2 +if [ -d /etc/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/awstats/apache.conf /etc/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %doc README.TXT docs/* tools/webmin tools/xslt %dir %{_sysconfdir}/awstats -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/*.conf -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/awstats*.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/apache.conf %attr(640,root,root) /etc/cron.d/awstats %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/%{name} @@ -138,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/22 07:15:07 glen +- use apache config triggers, rel 1.10 + Revision 1.37 2005/08/21 17:59:25 jajcus - Release: 1.5 - Awstats is started with uid of stats. Parsing logs with root privileges is a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/awstats.spec?r1=1.37&r2=1.38&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: neon.spec - updated to 0.25.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:19:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.25.3 ---- Files affected: SPECS: neon.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/neon.spec diff -u SPECS/neon.spec:1.48 SPECS/neon.spec:1.49 --- SPECS/neon.spec:1.48 Wed Jul 6 21:39:39 2005 +++ SPECS/neon.spec Mon Aug 22 09:19:21 2005 @@ -6,12 +6,12 @@ Summary: An HTTP and WebDAV client library Summary(pl): Biblioteka kliencka HTTP i WebDAV Name: neon -Version: 0.24.7 -Release: 5 +Version: 0.25.3 +Release: 1 License: GPL Group: Libraries Source0: http://www.webdav.org/neon/%{name}-%{version}.tar.gz -# Source0-md5: 5108bcbe41de4afe2e19cc58500fb9f2 +# Source0-md5: 7f0f9fe66dd8349b2aff2d8ab4d8683b URL: http://www.webdav.org/neon/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -139,6 +139,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/22 07:19:21 paszczus +- updated to 0.25.3 + Revision 1.48 2005/07/06 19:39:39 arekm - br heimdal >= 0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/neon.spec?r1=1.48&r2=1.49&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: neon-0.25.3.tar.gz Message-ID: <531.1124695174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.webdav.org/neon/neon-0.25.3.tar.gz 7f0f9fe66dd8349b2aff2d8ab4d8683b neon-0.25.3.tar.gz Size: 730495 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:54:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: kde-splash-gartoon.spec - rel 0.2 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:54:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2 ---- Files affected: SPECS: kde-splash-gartoon.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.1 SPECS/kde-splash-gartoon.spec:1.2 --- SPECS/kde-splash-gartoon.spec:1.1 Sat Aug 20 21:41:00 2005 +++ SPECS/kde-splash-gartoon.spec Mon Aug 22 09:54:49 2005 @@ -4,7 +4,7 @@ Summary(pl): Ekran startowy KDE Name: kde-splash-%{_splash} Version: 0.1 -Release: 0.1 +Release: 0.2 License: GPL Group: X11/Amusements Source0: http://www.kde-look.org/content/files/20031-gartoonss.tar.gz @@ -40,6 +40,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 07:54:49 glen +- rel 0.2 + Revision 1.1 2005/08/20 19:41:00 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 10:09:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: PLD-doc: uid_gid.db.txt - register jserv (154) In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 08:09:18 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - register jserv (154) ---- Files affected: PLD-doc: uid_gid.db.txt (1.180 -> 1.181) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.180 PLD-doc/uid_gid.db.txt:1.181 --- PLD-doc/uid_gid.db.txt:1.180 Mon Aug 1 18:14:07 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 10:09:13 2005 @@ -166,6 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -328,6 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.180&r2=1.181&f=u From havner at pld-linux.org Mon Aug 22 10:17:15 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: openvpn.spec - dont use such releases ! In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:17:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - dont use such releases ! ---- Files affected: SPECS: openvpn.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.90 SPECS/openvpn.spec:1.91 --- SPECS/openvpn.spec:1.90 Fri Jul 22 11:15:00 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:17:08 2005 @@ -3,7 +3,7 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.7.1 +Release: 0.8 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/22 08:17:08 havner +- dont use such releases ! + Revision 1.90 2005/07/22 09:15:00 areq - 2.0.1_rc7 - lzo-2.01 ready ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.90&r2=1.91&f=u From havner at pld-linux.org Mon Aug 22 10:22:39 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: openvpn.spec - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:22:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ---- Files affected: SPECS: openvpn.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.91 SPECS/openvpn.spec:1.92 --- SPECS/openvpn.spec:1.91 Mon Aug 22 10:17:08 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:22:33 2005 @@ -3,11 +3,11 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.8 +Release: 1 License: GPL Group: Networking/Daemons -Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz -# Source0-md5: 258430d04413b430ceee6317f23c3b5f +Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz +# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version}_rc7 +%setup -q -n %{name}-%{version} %build %{__aclocal} @@ -93,6 +93,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/22 08:22:33 havner +- 2.0.1 final +- CAN-2005-2531, CAN-2005-2532 + Revision 1.91 2005/08/22 08:17:08 havner - dont use such releases ! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.91&r2=1.92&f=u From havner at pld-linux.org Mon Aug 22 10:22:47 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: openvpn-2.0.1.tar.gz Message-ID: <4959.1124698967@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.1.tar.gz fad7a08c0d68371c2c0e6428bcb98fa5 openvpn-2.0.1.tar.gz Size: 662428 bytes -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 10:46:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:11 2005 Subject: SOURCES (LINUX_2_6): dev-list, linux-static-dev.patch - revert /de... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 08:46:15 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - revert /dev/inotify minor change. ---- Files affected: SOURCES: dev-list (1.28 -> 1.29) , linux-static-dev.patch (1.1.6.2 -> 1.1.6.3) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.28 SOURCES/dev-list:1.29 --- SOURCES/dev-list:1.28 Fri Aug 19 16:58:17 2005 +++ SOURCES/dev-list Mon Aug 22 10:46:10 2005 @@ -3932,7 +3932,7 @@ %dev(c,185,1) %attr(600,root,root) /dev/intermezzo1 %dev(c,185,2) %attr(600,root,root) /dev/intermezzo2 %dev(c,185,3) %attr(600,root,root) /dev/intermezzo3 -%dev(c,10,62) %attr(444,root,root) /dev/inotify +%dev(c,10,61) %attr(444,root,root) /dev/inotify %dev(c,95,3) %attr(600,root,root) /dev/ipauth %dev(c,254,0) %attr(600,root,root) /dev/ipmi0 %dev(c,10,173) %attr(600,root,root) /dev/ipmikcs ================================================================ Index: SOURCES/linux-static-dev.patch diff -u SOURCES/linux-static-dev.patch:1.1.6.2 SOURCES/linux-static-dev.patch:1.1.6.3 --- SOURCES/linux-static-dev.patch:1.1.6.2 Fri Aug 19 16:58:17 2005 +++ SOURCES/linux-static-dev.patch Mon Aug 22 10:46:10 2005 @@ -5,7 +5,7 @@ if (misc->minor == MISC_DYNAMIC_MINOR) { - int i = DYNAMIC_MINORS; -+ int i = DYNAMIC_MINORS - 2 /* reserved */; ++ int i = DYNAMIC_MINORS - 3 /* reserved */; while (--i >= 0) if ( (misc_minors[i>>3] & (1 << (i&7))) == 0) break; @@ -27,7 +27,7 @@ static struct miscdevice inotify_device = { - .minor = MISC_DYNAMIC_MINOR, -+ .minor = 62 /* MISC_DYNAMIC_MINOR */, ++ .minor = 61 /* MISC_DYNAMIC_MINOR */, .name = "inotify", .fops = &inotify_fops, }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SOURCES/linux-static-dev.patch?r1=1.1.6.2&r2=1.1.6.3&f=u From glen at pld-linux.org Mon Aug 22 11:31:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: openvpn.spec - initscript is not config In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:31:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initscript is not config ---- Files affected: SPECS: openvpn.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.92 SPECS/openvpn.spec:1.93 --- SPECS/openvpn.spec:1.92 Mon Aug 22 10:22:33 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:31:14 2005 @@ -83,7 +83,7 @@ %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/openvpn %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name} -%attr(754,root,root) %config(noreplace) /etc/rc.d/init.d/%{name} +%attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man?/* %dir /var/run/openvpn @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/22 09:31:14 glen +- initscript is not config + Revision 1.92 2005/08/22 08:22:33 havner - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.92&r2=1.93&f=u From glen at pld-linux.org Mon Aug 22 11:33:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: openvpn.spec - simplify %prep In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:33:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - simplify %prep ---- Files affected: SPECS: openvpn.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.93 SPECS/openvpn.spec:1.94 --- SPECS/openvpn.spec:1.93 Mon Aug 22 11:31:14 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:33:20 2005 @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version} +%setup -q %build %{__aclocal} @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/22 09:33:20 glen +- simplify %prep + Revision 1.93 2005/08/22 09:31:14 glen - initscript is not config @@ -375,9 +378,9 @@ - doesn't seem to build on Ra (old automake/autoconf) Revision 1.2 2002/05/21 23:14:19 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.1 2002/03/25 12:03:11 misiek - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.93&r2=1.94&f=u From glen at pld-linux.org Mon Aug 22 11:48:00 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: PLD-doc: uid_gid.db.txt - corrections In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:48:00 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - corrections ---- Files affected: PLD-doc: uid_gid.db.txt (1.181 -> 1.182) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.181 PLD-doc/uid_gid.db.txt:1.182 --- PLD-doc/uid_gid.db.txt:1.181 Mon Aug 22 10:09:13 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 11:47:55 2005 @@ -166,7 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -329,7 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.181&r2=1.182&f=u From glen at pld-linux.org Mon Aug 22 12:21:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mysql-connector-j.spec (NEW) - new In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:21:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: mysql-connector-j.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u /dev/null SPECS/mysql-connector-j.spec:1.1 --- /dev/null Mon Aug 22 12:21:35 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:21:26 2005 @@ -0,0 +1,70 @@ +# $Revision$, $Date$ +%bcond_without bindist # don't use binary distribution (not finished) +Summary: MySQL Connector/J +Name: mysql-connector-j +Version: 3.1.10 +Release: 0.1 +License: GPL v2+ + MySQL FLOSS Exception +Group: Libraries +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +# Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 +URL: http://www.mysql.com/products/connector/j/ +%{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL +and connect all corporate data, even in a heterogeneous environment. +MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC +feature set that supports the capabilities of MySQL. + +%package doc +Summary: Documentation for MySQL Connector/J +Group: Documentation + +%description doc +Documentation for MySQL Connector/J. + +%prep +%setup -q -n mysql-connector-java-%{version} +rm -f docs/README # duplicate + +%build +%{!?with_bindist:ant} + +%install +rm -rf $RPM_BUILD_ROOT + +%if %{with bindist} +install -d $RPM_BUILD_ROOT%{_javadir} +install mysql-connector-java-%{version}-bin.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java-%{version}.jar +ln -s mysql-connector-java-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java.jar +%else +%{error:not finished} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CHANGES EXCEPTIONS-CONNECTOR-J README +%{_javadir}/* + +%files doc +%defattr(644,root,root,755) +%doc docs + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:21:26 glen +- new + ================================================================ From glen at pld-linux.org Mon Aug 22 12:22:22 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mysql-connector-j.spec - updated description In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:22:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated description ---- Files affected: SPECS: mysql-connector-j.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.1 SPECS/mysql-connector-j.spec:1.2 --- SPECS/mysql-connector-j.spec:1.1 Mon Aug 22 12:21:26 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:22:17 2005 @@ -22,6 +22,8 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. + %package doc Summary: Documentation for MySQL Connector/J Group: Documentation @@ -65,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:22:17 glen +- updated description + Revision 1.1 2005/08/22 10:21:26 glen - new ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 12:23:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <14816.1124706183@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <15411.1124706216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:29:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mysql-connector-j.spec - adapterized, no extra subdir on -d... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:29:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterized, no extra subdir on -doc package ---- Files affected: SPECS: mysql-connector-j.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.2 SPECS/mysql-connector-j.spec:1.3 --- SPECS/mysql-connector-j.spec:1.2 Mon Aug 22 12:22:17 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:29:40 2005 @@ -6,7 +6,7 @@ Release: 0.1 License: GPL v2+ + MySQL FLOSS Exception Group: Libraries -Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/%{name}ava-%{version}.tar.gz # Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 URL: http://www.mysql.com/products/connector/j/ %{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} @@ -22,7 +22,7 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. -MySQL Connector/J is the official JDBC driver for MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. %package doc Summary: Documentation for MySQL Connector/J @@ -59,7 +59,7 @@ %files doc %defattr(644,root,root,755) -%doc docs +%doc docs/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -67,9 +67,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 10:29:40 glen +- adapterized, no extra subdir on -doc package + Revision 1.2 2005/08/22 10:22:17 glen - updated description Revision 1.1 2005/08/22 10:21:26 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.2&r2=1.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS (DEVEL): abiword.spec - verison 2.3.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 10:39:12 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - verison 2.3.5 ---- Files affected: SPECS: abiword.spec (1.106.2.2 -> 1.106.2.3) ---- Diffs: ================================================================ Index: SPECS/abiword.spec diff -u SPECS/abiword.spec:1.106.2.2 SPECS/abiword.spec:1.106.2.3 --- SPECS/abiword.spec:1.106.2.2 Tue Jul 26 00:19:22 2005 +++ SPECS/abiword.spec Mon Aug 22 12:39:04 2005 @@ -11,13 +11,13 @@ Summary: Multi-platform word processor Summary(pl): Wieloplatformowy procesor tekstu Name: abiword -Version: 2.3.4 +Version: 2.3.5 Release: 1 Epoch: 1 License: GPL Group: X11/Applications Source0: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2 -# Source0-md5: b205d8bb5240fdcb126daf8a7a9e45c8 +# Source0-md5: 2b2f2b5f5379b6dd7fe4145b3f7a28d4 Patch0: %{name}-desktop.patch Patch1: %{name}-home_etc.patch Patch2: %{name}-mailmerge.patch @@ -958,6 +958,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106.2.3 2005/08/22 10:39:04 aflinta +- verison 2.3.5 + Revision 1.106.2.2 2005/07/25 22:19:22 freetz - renumbered patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.106.2.2&r2=1.106.2.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: abiword-2.3.5.tar.bz2 Message-ID: <25708.1124707190@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.abisource.com/downloads/abiword/2.3.5/source/abiword-2.3.5.tar.bz2 2b2f2b5f5379b6dd7fe4145b3f7a28d4 abiword-2.3.5.tar.bz2 Size: 24112015 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:50 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: kchmviewer-1.0.tar.gz Message-ID: <29803.1124707550@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/kchmviewer/kchmviewer-1.0.tar.gz 0f9595cbb13eb950261e660c168dc033 kchmviewer-1.0.tar.gz Size: 558754 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:49 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: kchmviewer.spec (NEW) - init In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:45:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init ---- Files affected: SPECS: kchmviewer.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u /dev/null SPECS/kchmviewer.spec:1.1 --- /dev/null Mon Aug 22 12:45:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:45:44 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_with kde # enable KDE support +%bcond_without arts # build without aRts default=no +# +Summary: KchmViewer is a chm (MS HTML help file format) viewer +Name: kchmviewer +Version: 1.0 +Release: 0.6 +License: GPL v2 +Group: Applications/Publishing +Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz +# Source0-md5: 0f9595cbb13eb950261e660c168dc033 +URL: http://kchmviewer.sourceforge.net/ +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +%{?with_kde:BuildRequires: kdelibs-devel} +BuildRequires: qt-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget +library, and does not depend on KDE or Gnome. However, it may be +compiled with full KDE support, including KDE widgets and KIO/KHTML. + +%prep +%setup -q + +%build +%configure \ + %{?with_kde:--with-kde} + %{?without_arts:--without-arts} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc ChangeLog +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:45:44 spider +- init + ================================================================ From spider at pld-linux.org Mon Aug 22 12:47:54 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: kchmviewer.spec - missing br In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:47:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br ---- Files affected: SPECS: kchmviewer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.1 SPECS/kchmviewer.spec:1.2 --- SPECS/kchmviewer.spec:1.1 Mon Aug 22 12:45:44 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:47:49 2005 @@ -16,6 +16,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel +BuildRequires: zlib-devel %{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:47:49 spider +- missing br + Revision 1.1 2005/08/22 10:45:44 spider - init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.1&r2=1.2&f=u From havner at pld-linux.org Mon Aug 22 13:19:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: evolution-webcal.spec - rebuild against gnutls SONAME chang... In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:19:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gnutls SONAME change - rel 2 ---- Files affected: SPECS: evolution-webcal.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20 SPECS/evolution-webcal.spec:1.21 --- SPECS/evolution-webcal.spec:1.20 Wed Apr 13 21:25:21 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 13:19:20 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal Version: 2.2.1 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.2/%{name}-%{version}.tar.bz2 @@ -72,6 +72,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 11:19:20 havner +- rebuild against gnutls SONAME change +- rel 2 + Revision 1.20 2005/04/13 19:25:21 paladine - updated to 2.2.1 - new style macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20&r2=1.21&f=u From havner at pld-linux.org Mon Aug 22 13:53:12 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: gpc.spec - rebuild against gcc 3.3.6 - rel 2 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:53:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gcc 3.3.6 - rel 2 ---- Files affected: SPECS: gpc.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gpc.spec diff -u SPECS/gpc.spec:1.26 SPECS/gpc.spec:1.27 --- SPECS/gpc.spec:1.26 Mon Jun 20 10:17:40 2005 +++ SPECS/gpc.spec Mon Aug 22 13:53:05 2005 @@ -7,7 +7,7 @@ Summary(pl): Kompilator Pascala GNU Name: gpc Version: %{GPC_VERSION} -Release: 1 +Release: 2 License: GPL Group: Development/Languages Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/gcc-%{GCC_VERSION}.tar.bz2 @@ -151,6 +151,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 11:53:05 havner +- rebuild against gcc 3.3.6 +- rel 2 + Revision 1.26 2005/06/20 08:17:40 qboosh - use gcc 3.3.6 (gpc patch for 3.3.5 still applies) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpc.spec?r1=1.26&r2=1.27&f=u From adamg at pld-linux.org Mon Aug 22 14:11:41 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: abridge.spec, libcfu.spec, muttprint.spec, patchutils.spec, ... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:11:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: ---- Files affected: SPECS: abridge.spec (1.7 -> 1.8) , libcfu.spec (1.2 -> 1.3) , muttprint.spec (1.27 -> 1.28) , patchutils.spec (1.27 -> 1.28) , pcre.spec (1.62 -> 1.63) , php-pear-HTML_Template_IT.spec (1.17 -> 1.18) , php-pear-MDB2.spec (1.7 -> 1.8) , php.spec (1.464 -> 1.465) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.62&r2=1.63&f=u http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php.spec?r1=1.464&r2=1.465&f=u From adamg at pld-linux.org Mon Aug 22 14:13:38 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: abridge.spec - reverted last commit In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: abridge.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/abridge.spec diff -u SPECS/abridge.spec:1.8 SPECS/abridge.spec:1.9 --- SPECS/abridge.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/abridge.spec Mon Aug 22 14:13:33 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: wxGTK2-devel -BuildRequires: wxWidgets-devel +BuildRequires: wxWindows-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -34,7 +34,7 @@ %{__autoheader} %{__automake} %configure \ - --with-wx-config=/usr/bin/wx-gtk2-ansi-config + --with-wx-config=/usr/bin/wxgtk2-2.4-config %{__make} %install @@ -58,8 +58,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.9 2005/08/22 12:13:33 adamg +- reverted last commit Revision 1.7 2005/05/21 15:59:17 ankry - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.8&r2=1.9&f=u From adamg at pld-linux.org Mon Aug 22 14:15:09 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: libcfu.spec, muttprint.spec, patchutils.spec - reverted las... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:15:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: libcfu.spec (1.3 -> 1.4) , muttprint.spec (1.28 -> 1.29) , patchutils.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/libcfu.spec diff -u SPECS/libcfu.spec:1.3 SPECS/libcfu.spec:1.4 --- SPECS/libcfu.spec:1.3 Mon Aug 22 14:11:35 2005 +++ SPECS/libcfu.spec Mon Aug 22 14:15:03 2005 @@ -9,7 +9,6 @@ Source0: http://dl.sourceforge.net/libcfu/%{name}-%{version}.tar.bz2 # Source0-md5: 5e9e1a474119c8340509323f81c4c527 Patch0: %{name}-shared.patch -Patch1: %{name}-64bit.patch URL: http://www.sourceforge.net/projects/libcfu/ BuildRequires: autoconf BuildRequires: automake @@ -56,7 +55,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -110,8 +108,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.3 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.4 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.2 2005/08/02 22:07:17 qboosh - BR: ac,am,lt ================================================================ Index: SPECS/muttprint.spec diff -u SPECS/muttprint.spec:1.28 SPECS/muttprint.spec:1.29 --- SPECS/muttprint.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/muttprint.spec Mon Aug 22 14:15:03 2005 @@ -2,12 +2,12 @@ Summary: Formats the output of mail clients to a good-looking printing Summary(pl): Program formatuj?cy wyj?cie klient?w pocztowych w dobrze wygl?daj?cy wydruk Name: muttprint -Version: 0.72d +Version: 0.72c Release: 1 License: GPL Group: Applications/Printing Source0: http://dl.sourceforge.net/muttprint/%{name}-%{version}.tar.gz -# Source0-md5: cab04c11b7dfb29a9c3a6348a07b86a3 +# Source0-md5: b3e99f8f6f37c0711f6e20f8cf3ef6cb URL: http://muttprint.sourceforge.net/ Requires: perl-Text-Iconv Requires: psutils @@ -28,7 +28,7 @@ %{__make} -C langinfo clean %build -%{__make} \ +%{__make} -C langinfo \ CC="%{__cc}" \ CCFLAGS="%{rpmcflags}" @@ -90,8 +90,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2005/06/21 19:05:22 czucz - changed md5 ================================================================ Index: SPECS/patchutils.spec diff -u SPECS/patchutils.spec:1.28 SPECS/patchutils.spec:1.29 --- SPECS/patchutils.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/patchutils.spec Mon Aug 22 14:15:03 2005 @@ -5,12 +5,12 @@ Summary(ru): ????? ???????????? ??? ?????? ? patch-??????? Summary(uk): ????? ???????????? ??? ?????? ? patch-??????? Name: patchutils -Version: 0.2.31 +Version: 0.2.30 Release: 1 License: GPL Group: Applications/Text Source0: http://cyberelk.net/tim/data/%{name}/stable/%{name}-%{version}.tar.bz2 -# Source0-md5: 3aa902cb7a57a4aa09427de603ebf17b +# Source0-md5: 6a33888e34c23f7fde09a6e94e4f5950 Patch1: %{name}-fixcvsdiff.patch URL: http://cyberelk.net/tim/patchutils/ BuildRequires: autoconf @@ -170,8 +170,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2004/10/29 22:55:04 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.28&r2=1.29&f=u From adamg at pld-linux.org Mon Aug 22 14:17:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: pcre.spec - fixed previous changelog entry In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:17:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed previous changelog entry ---- Files affected: SPECS: pcre.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.63 SPECS/pcre.spec:1.64 --- SPECS/pcre.spec:1.63 Mon Aug 22 14:11:35 2005 +++ SPECS/pcre.spec Mon Aug 22 14:16:57 2005 @@ -275,8 +275,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.64 2005/08/22 12:16:57 adamg +- fixed previous changelog entry + Revision 1.63 2005/08/22 12:11:35 adamg -*** empty log message *** +- updated to 6.3 +- -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.63&r2=1.64&f=u From adamg at pld-linux.org Mon Aug 22 14:17:06 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: pcre-6.3.tar.bz2 Message-ID: <27121.1124713026@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.3.tar.bz2 e6779ead12cd20fa055fb3a05b004f2c pcre-6.3.tar.bz2 Size: 565852 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 14:23:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SOURCES: ApacheJServ.init - still not finished In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 12:23:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - still not finished ---- Files affected: SOURCES: ApacheJServ.init (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ.init diff -u SOURCES/ApacheJServ.init:1.1 SOURCES/ApacheJServ.init:1.2 --- SOURCES/ApacheJServ.init:1.1 Fri Aug 19 19:14:27 2005 +++ SOURCES/ApacheJServ.init Mon Aug 22 14:23:36 2005 @@ -27,14 +27,13 @@ exit 0 fi - # See how we were called. case "$1" in start) # Check if the service is already running? if [ ! -f /var/lock/subsys/jserv ]; then msg_starting jserv - daemon jserv + daemon --user jserv jserv RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/jserv else @@ -58,12 +57,10 @@ ;; reload) if [ -f /var/lock/subsys/jserv ]; then - # show "Reload %s service" jserv msg_reloading jserv killproc jserv -HUP RETVAL=$? else - # show "%s service is not running." jserv msg_not_running jserv >&2 RETVAL=7 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/ApacheJServ.init?r1=1.1&r2=1.2&f=u From pluto at pld-linux.org Mon Aug 22 15:00:56 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:11 2005 Subject: SOURCES: qt4-buildsystem.patch, qt4-tools.patch - updated for 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:00:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.0.1. ---- Files affected: SOURCES: qt4-buildsystem.patch (1.4 -> 1.5) , qt4-tools.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/qt4-buildsystem.patch diff -u SOURCES/qt4-buildsystem.patch:1.4 SOURCES/qt4-buildsystem.patch:1.5 --- SOURCES/qt4-buildsystem.patch:1.4 Mon May 16 14:39:06 2005 +++ SOURCES/qt4-buildsystem.patch Mon Aug 22 15:00:49 2005 @@ -15,15 +15,14 @@ --- qt-copy/tools/assistant/lib/lib.pro.orig 2005-05-13 16:39:04.000000000 +0200 +++ qt-copy/tools/assistant/lib/lib.pro 2005-05-13 20:21:32.014137768 +0200 -@@ -4,9 +4,9 @@ +@@ -4,9 +4,8 @@ VERSION = 1.0 CONFIG += qt warn_on --CONFIG += staticlib debug_and_release -+CONFIG += dll debug_and_release +-CONFIG += staticlib debug_and_release ++CONFIG += dll debug_and_release mac:unix:CONFIG += explicitlib -CONFIG -= dll -+ HEADERS = qassistantclient.h SOURCES = qassistantclient.cpp ================================================================ Index: SOURCES/qt4-tools.patch diff -u SOURCES/qt4-tools.patch:1.3 SOURCES/qt4-tools.patch:1.4 --- SOURCES/qt4-tools.patch:1.3 Thu Jun 16 21:20:09 2005 +++ SOURCES/qt4-tools.patch Mon Aug 22 15:00:50 2005 @@ -7,6 +7,6 @@ - porting + porting \ + qvfb - !contains(QT_PRODUCT, .*Console.*):SUBDIRS += designer + !contains(QT_EDITION, Console):SUBDIRS += designer unix:SUBDIRS += qtconfig } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qt4-buildsystem.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.3&r2=1.4&f=u From pluto at pld-linux.org Mon Aug 22 15:01:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: qt4.spec - updated to 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.0.1. ---- Files affected: SPECS: qt4.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.35 SPECS/qt4.spec:1.36 --- SPECS/qt4.spec:1.35 Tue Aug 16 12:02:06 2005 +++ SPECS/qt4.spec Mon Aug 22 15:01:45 2005 @@ -28,20 +28,18 @@ %define _withsql 1 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}} -%define _packager djurban - Summary: The Qt GUI application framework Summary(es): Biblioteca para ejecutar aplicaciones GUI Qt Summary(pl): Biblioteka Qt do tworzenia GUI Summary(pt_BR): Estrutura para rodar aplica??es GUI Qt Name: qt4 -Version: 4.0.0 +Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.3 +Release: 0.1 License: GPL/QPL Group: X11/Libraries -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-%{version}.tar.bz2 -# Source0-md5: a6183269fab293282daf2da9ac940577 +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz +# Source0-md5: 2db4a4d797d37d0605b776420327503a Source2: qtconfig.desktop Source3: designer.desktop Source4: assistant.desktop @@ -598,15 +596,15 @@ %prep #setup -q -n %{_name}-copy-%{_snap} -%setup -q -n qt-x11-opensource-desktop-%{version} +%setup -q -n qt-x11-opensource-src-%{version} %patch0 -p1 %if %{with dont_enable} %patch1 -p1 %patch3 -p1 %endif -%patch2 -p1 -b .niedakh -%patch4 -p1 -b .niedakh -%patch8 -p1 -b .niedakh +%patch2 -p1 +%patch4 -p1 +%patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -1137,6 +1135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/22 13:01:45 pluto +- updated to 4.0.1. + Revision 1.35 2005/08/16 10:02:06 prism - commas in cflags are allowed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.35&r2=1.36&f=u From pluto at pld-linux.org Mon Aug 22 15:02:44 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: qt-x11-opensource-src-4.0.1.tar.gz Message-ID: <27767.1124715764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.0.1.tar.gz 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz Size: 20141717 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 15:08:04 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: kchmviewer.spec - spaces -> tabs In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 13:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs ---- Files affected: SPECS: kchmviewer.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.2 SPECS/kchmviewer.spec:1.3 --- SPECS/kchmviewer.spec:1.2 Mon Aug 22 12:47:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 15:07:58 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_with kde # enable KDE support +%bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # Summary: KchmViewer is a chm (MS HTML help file format) viewer @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 13:07:58 spider +- spaces -> tabs + Revision 1.2 2005/08/22 10:47:49 spider - missing br ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.2&r2=1.3&f=u From saq at pld-linux.org Mon Aug 22 15:11:40 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 09:39:11 2005 Subject: SOURCES: mutt-paths.patch - fixed In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:11:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed ---- Files affected: SOURCES: mutt-paths.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mutt-paths.patch diff -u SOURCES/mutt-paths.patch:1.1 SOURCES/mutt-paths.patch:1.2 --- SOURCES/mutt-paths.patch:1.1 Sun Aug 21 21:38:05 2005 +++ SOURCES/mutt-paths.patch Mon Aug 22 15:11:35 2005 @@ -19,7 +19,7 @@ -ac_aux_path_sendmail=/usr/sbin:/usr/lib -AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail) -+SENDMAIL=/usr/sbin/sendmail ++ac_cv_path_SENDMAIL=/usr/sbin/sendmail AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) OPS='$(srcdir)/OPS' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mutt-paths.patch?r1=1.1&r2=1.2&f=u From saq at pld-linux.org Mon Aug 22 15:12:07 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mutt.spec - rel 10 for fixed paths.patch In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:12:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for fixed paths.patch ---- Files affected: SPECS: mutt.spec (1.182 -> 1.183) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.182 SPECS/mutt.spec:1.183 --- SPECS/mutt.spec:1.182 Mon Aug 22 00:14:31 2005 +++ SPECS/mutt.spec Mon Aug 22 15:12:02 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 9 +Release: 10 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.183 2005/08/22 13:12:02 saq +- rel 10 for fixed paths.patch + Revision 1.182 2005/08/21 22:14:31 adamg - a year has passed, time for an integer release :) - release 9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.182&r2=1.183&f=u From paszczus at pld-linux.org Mon Aug 22 15:49:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: mldonkey-2.6.3.tar.bz2 Message-ID: <12316.1124718543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://savannah.nongnu.org/download/mldonkey/mldonkey-2.6.3.tar.bz2 5a71317970b0c5c2a50d3d4e98c14f41 mldonkey-2.6.3.tar.bz2 Size: 2660337 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 15:48:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: mldonkey.spec - updated to 2.6.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 13:48:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.3 ---- Files affected: SPECS: mldonkey.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.121 SPECS/mldonkey.spec:1.122 --- SPECS/mldonkey.spec:1.121 Thu Aug 11 17:33:56 2005 +++ SPECS/mldonkey.spec Mon Aug 22 15:48:54 2005 @@ -26,7 +26,7 @@ Name: mldonkey %define ocaml_ver 3.08.3 #%define patch_pack c -%define real_ver 2.6.1 +%define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} Version: %{real_ver} Release: 1 @@ -36,7 +36,7 @@ #Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.gz #Source0: http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/%{name}-%{real_ver}.tar.bz2 Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.bz2 -# Source0-md5: 193c397a0cb22391275054cebfaa5d8a +# Source0-md5: 5a71317970b0c5c2a50d3d4e98c14f41 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.sh @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 13:48:54 paszczus +- updated to 2.6.3 + Revision 1.121 2005/08/11 15:33:56 paszczus - removed 2 entries from TODO - added R: nc (small package, so no sense to move mldonkey_command to -utils) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.121&r2=1.122&f=u From matkor at pld-linux.org Mon Aug 22 16:03:14 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: kdetv.spec - Autoupdated to 0.8.8-0.1. Builds. Not tested. In-Reply-To: References: Message-ID: Author: matkor Date: Mon Aug 22 14:03:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Autoupdated to 0.8.8-0.1. Builds. Not tested. ---- Files affected: SPECS: kdetv.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/kdetv.spec diff -u SPECS/kdetv.spec:1.21 SPECS/kdetv.spec:1.22 --- SPECS/kdetv.spec:1.21 Fri Apr 29 14:16:40 2005 +++ SPECS/kdetv.spec Mon Aug 22 16:03:09 2005 @@ -2,12 +2,12 @@ Summary: KDE Video4Linux Stream Capture Viewer Summary(pl): Przegl?darka strumienia Video4Linux dla KDE Name: kdetv -Version: 0.8.7 -Release: 1 +Version: 0.8.8 +Release: 0.1 License: GPL Group: X11/Applications/Multimedia Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: e69c429497dc715b00f75fdada523fe7 +# Source0-md5: 587885b528b3b737d3bce07526b7f8e8 Patch0: %{name}.desktop.patch URL: http://www.kdetv.org/ BuildRequires: OpenGL-devel @@ -88,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 14:03:09 matkor +- Autoupdated to 0.8.8-0.1. Builds. Not tested. + Revision 1.21 2005/04/29 12:16:40 charles - updated to 0.8.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdetv.spec?r1=1.21&r2=1.22&f=u From matkor at pld-linux.org Mon Aug 22 16:04:27 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: kdetv-0.8.8.tar.bz2 Message-ID: <21004.1124719467@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dziegel.free.fr/releases/kdetv-0.8.8.tar.bz2 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 Size: 1184833 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: lighttpd-1.4.1.tar.gz Message-ID: <7434.1124720970@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.lighttpd.net/download/lighttpd-1.4.1.tar.gz 3abffbe574fd835721760a37c00d3714 lighttpd-1.4.1.tar.gz Size: 759063 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: lighttpd.spec - 1.4.1 - reviewed dependencies - mod_webdav ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:29:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.1 - reviewed dependencies - mod_webdav subpackage due extra deps ---- Files affected: SPECS: lighttpd.spec (1.120 -> 1.121) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.120 SPECS/lighttpd.spec:1.121 --- SPECS/lighttpd.spec:1.120 Sat Aug 20 18:07:43 2005 +++ SPECS/lighttpd.spec Mon Aug 22 16:29:20 2005 @@ -2,7 +2,8 @@ # TODO: # - test ldap and mysql (failed at this time) # - mysql issue: http://www.freebsd.org/cgi/query-pr.cgi?pr=76866 -# - gdbm for mod_trigger_b4_dl http://www.lighttpd.net/documentation/trigger_b4_dl.html +# - fam over gamin is possible, just configure doesn't check other than gamin +# - lua50 isn't properly detected # # NOTES: # - fcgi-devel is only used for the test-scripts @@ -10,16 +11,19 @@ # see http://article.gmane.org/gmane.comp.web.lighttpd:722 # # Conditional build for lighttpd: -%bcond_without xattr # with support of extended attributes (doesn't compile in 1.4.0) -%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) -%bcond_without largefile # without largefile support (see notes above) -%bcond_without ssl # disable ssl support -%bcond_without mysql # without mysql -%bcond_with ldap # with ldap -%bcond_with lua # enable LUA support in mod_cml -%bcond_with memcache # enable memcached support in mod_cml / mod_trigger_b4_dl -%bcond_with valgrind # compile code with valgrind support. -%bcond_with dirhide # with 'hide from dirlisting' hack +%bcond_without xattr # support of extended attributes +%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) +%bcond_without largefile # largefile support (see notes above) +%bcond_without ssl # ssl support +%bcond_with mysql # mysql support in mod_mysql_vhost +%bcond_with ldap # ldap support in mod_auth +%bcond_with lua # LUA support in mod_cml +%bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl +%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gdbm # gdbm in mod_trigger_b4_dl +%bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) +%bcond_with valgrind # compile code with valgrind support. +%bcond_with dirhide # with 'hide from dirlisting' hack # Prerelease snapshot: DATE-TIME #define _snap 20050116-1743 @@ -30,17 +34,17 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 1 +%define _rel 0.1 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.0 +Version: 1.4.1 Release: %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)} Group: Networking/Daemons License: BSD Source0: %{_source} -# Source0-md5: 926a3603615c9edf5859977f1b8b6033 +# Source0-md5: 3abffbe574fd835721760a37c00d3714 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -54,12 +58,16 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bzip2-devel +%{?with_gamin:BuildRequires: gamin-devel} +%{?with_webdav_props:BuildRequires: sqlite3-devel} +%{?with_webdav_props:BuildRequires: libxml2-devel} BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} %{?with_lua:BuildRequires: lua50-devel} %{?with_memcache:BuildRequires: libmemcache-devel} +%{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel BuildRequires: rpmbuild(macros) >= 1.202 %{?debug:BuildRequires: valgrind} @@ -146,6 +154,28 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%package mod_webdav +Summary: WebDAV module for lighttpd +Group: Networking/Daemons +URL: http://www.lighttpd.net/documentation/webdav.html +Requires: %{name} = %{version}-%{release} + +%description mod_webdav +The WebDAV module is a very minimalistic implementation of RFC 2518. +Minimalistic means that not all operations are implementated yet. + +So far we have +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT + +and the usual GET, POST, HEAD from HTTP/1.1. + +So far mounting a webdav resource into Windows XP works and the basic +litmus tests are passed. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -166,21 +196,23 @@ %patch2 -p1 %build -sed -i -e 's#stat_cache_attr_get#stat_cache_entry_attr_get#g' src/stat_cache.c %{__libtoolize} %{__aclocal} %{__autoconf} %configure \ + %{!?with_ipv6:--disable-ipv6} \ + %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ %{?with_xattr:--with-attr} \ %{?with_mysql:--with-mysql} \ %{?with_ldap:--with-ldap} \ - %{!?with_ipv6:--disable-ipv6} \ - %{!?with_largefile:--disable-lfs} \ %{?with_ssl:--with-openssl} \ %{?with_lua:--with-lua} \ - %{?with_memcache:--with-memcache} + %{?with_memcache:--with-memcache} \ + %{?with_webdav_props:--with-webdav-props} \ + %{?with_gamin:--with-gamin} \ + %{?with_gdbm:--with-gdbm} %{__make} @@ -268,7 +300,6 @@ %attr(755,root,root) %{_libdir}/mod_status.so %attr(755,root,root) %{_libdir}/mod_userdir.so %attr(755,root,root) %{_libdir}/mod_usertrack.so -%attr(755,root,root) %{_libdir}/mod_webdav.so %attr(750,root,root) %dir /var/log/archiv/%{name} %dir %attr(750,lighttpd,root) /var/log/%{name} %attr(755,lighttpd,lighttpd) %{_lighttpddir} @@ -288,14 +319,20 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_cml.so +%if %{with mysql} %files mod_mysql_vhost %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_mysql_vhost.so +%endif %files mod_trigger_b4_dl %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_trigger_b4_dl.so +%files mod_webdav +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/mod_webdav.so + %files -n spawn-fcgi %defattr(644,root,root,755) %doc doc/spawn-php.sh @@ -307,6 +344,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.121 2005/08/22 14:29:20 glen +- 1.4.1 +- reviewed dependencies +- mod_webdav subpackage due extra deps + Revision 1.120 2005/08/20 16:07:43 arekm - reenable xattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.120&r2=1.121&f=u From paszczus at pld-linux.org Mon Aug 22 16:35:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: nmm.spec - sorted BR In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:35:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BR ---- Files affected: SPECS: nmm.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/nmm.spec diff -u SPECS/nmm.spec:1.11 SPECS/nmm.spec:1.12 --- SPECS/nmm.spec:1.11 Thu Aug 18 00:45:31 2005 +++ SPECS/nmm.spec Mon Aug 22 16:35:41 2005 @@ -15,11 +15,11 @@ BuildRequires: automake BuildRequires: avifile-devel BuildRequires: htmldoc -BuildRequires: libtool BuildRequires: libdivxdecore-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel BuildRequires: libshout-devel +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: lirc-devel BuildRequires: live @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 14:35:41 paszczus +- sorted BR + Revision 1.11 2005/08/17 22:45:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nmm.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Mon Aug 22 16:36:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: lua50.spec - parallel make unfriendly make In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:36:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - parallel make unfriendly make ---- Files affected: SPECS: lua50.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.19 SPECS/lua50.spec:1.20 --- SPECS/lua50.spec:1.19 Thu Aug 11 11:46:18 2005 +++ SPECS/lua50.spec Mon Aug 22 16:36:22 2005 @@ -116,7 +116,7 @@ %{__make} clean %endif -%{__make} all so sobin \ +%{__make} -j1 all so sobin \ CC="%{__cc}" \ MYCFLAGS="%{rpmcflags} -fPIC" \ EXTRA_DEFS="-DPIC -D_GNU_SOURCE" @@ -185,6 +185,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:36:22 glen +- parallel make unfriendly make + Revision 1.19 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:43:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <19209.1124721809@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:43:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: rlocate.spec - updated to 0.3.2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:43:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.2 ---- Files affected: SPECS: rlocate.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.26 SPECS/rlocate.spec:1.27 --- SPECS/rlocate.spec:1.26 Tue May 31 09:22:46 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:43:26 2005 @@ -19,7 +19,7 @@ Summary: Finds files on a system via a central database Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate -Version: 0.3.1 +Version: 0.3.2 %define _rel 0.1 Release: %{_rel} License: GPL @@ -239,6 +239,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 14:43:26 paszczus +- updated to 0.3.2 + Revision 1.26 2005/05/31 07:22:46 glen - sgid rlocate the rlocate binary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.26&r2=1.27&f=u From blekot at pld-linux.org Mon Aug 22 16:50:11 2005 From: blekot at pld-linux.org (blekot) Date: Tue Dec 20 09:39:11 2005 Subject: SPECS: darkice.spec - BR: s/lame-libs-devel/lame-libs-static/ In-Reply-To: References: Message-ID: Author: blekot Date: Mon Aug 22 14:50:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: s/lame-libs-devel/lame-libs-static/ ---- Files affected: SPECS: darkice.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.19 SPECS/darkice.spec:1.20 --- SPECS/darkice.spec:1.19 Thu Oct 28 12:15:41 2004 +++ SPECS/darkice.spec Mon Aug 22 16:50:06 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-devel +BuildRequires: lame-libs-static BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:50:06 blekot +- BR: s/lame-libs-devel/lame-libs-static/ + Revision 1.19 2004/10/28 10:15:41 paladine - "MP3" unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:50:33 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <24301.1124722233@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:50:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: rlocate.spec - added init script (temporary from redhat) In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:50:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added init script (temporary from redhat) ---- Files affected: SPECS: rlocate.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.27 SPECS/rlocate.spec:1.28 --- SPECS/rlocate.spec:1.27 Mon Aug 22 16:43:26 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:50:29 2005 @@ -35,10 +35,11 @@ %endif BuildRequires: libtool BuildRequires: perl-base -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.228 Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(postun): /usr/sbin/groupdel +Requires(post,preun): /sbin/chkconfig Requires: crondaemon Provides: group(rlocate) Conflicts: slocate @@ -159,6 +160,8 @@ %install rm -rf $RPM_BUILD_ROOT +install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -197,6 +200,16 @@ %groupremove rlocate fi +%post init +/sbin/chkconfig --add %{name} +%service %{name} restart + +%preun init +if [ "$1" = "0" ]; then + %service -q %{name} stop + /sbin/chkconfig --del %{name} +fi + %if %{with kernel} %files -n kernel-misc-%{name} %defattr(644,root,root,755) @@ -211,6 +224,9 @@ %endif %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} + %if %{with userspace} %files %defattr(644,root,root,755) @@ -239,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/22 14:50:29 paszczus +- added init script (temporary from redhat) + Revision 1.27 2005/08/22 14:43:26 paszczus - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.27&r2=1.28&f=u From pawcioos at pld-linux.org Mon Aug 22 16:51:55 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: tomboy-0.3.3.tar.gz Message-ID: <25171.1124722315@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.beatniksoftware.com/tomboy/releases/tomboy-0.3.3.tar.gz 7ad987216b484f747f53aa7f9055a46b tomboy-0.3.3.tar.gz Size: 608252 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Mon Aug 22 16:51:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: tomboy.spec - updated to 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 14:51:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.3 ---- Files affected: SPECS: tomboy.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.8 SPECS/tomboy.spec:1.9 --- SPECS/tomboy.spec:1.8 Sun May 15 16:33:03 2005 +++ SPECS/tomboy.spec Mon Aug 22 16:51:48 2005 @@ -2,12 +2,12 @@ Summary: Tomboy - a desktop note-taking application Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy -Version: 0.3.2 +Version: 0.3.3 Release: 1 License: GPL Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz -# Source0-md5: cb4c48860601e636e075644c40b973de +# Source0-md5: 7ad987216b484f747f53aa7f9055a46b Source1: %{name}.desktop #Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ @@ -86,12 +86,14 @@ %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins +%{_libdir}/dbus-1.0/services/*.service %{_libdir}/%{name}/Plugins/*.dll %{_libdir}/bonobo/servers/* %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png +%{_pkgconfigdir}/tomboy-plugins.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -99,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 14:51:48 pawcioos +- updated to 0.3.3 + Revision 1.8 2005/05/15 14:33:03 pawcioos - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.8&r2=1.9&f=u From wolf at pld-linux.org Mon Aug 22 17:07:53 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: f-spot.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 15:07:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: f-spot.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.16 SPECS/f-spot.spec:1.17 --- SPECS/f-spot.spec:1.16 Sat Aug 20 00:16:32 2005 +++ SPECS/f-spot.spec Mon Aug 22 17:07:47 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot @@ -78,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 15:07:47 wolf +- mono auto deps + Revision 1.16 2005/08/19 22:16:32 aflinta - rebuild with better gtk-sharp ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.16&r2=1.17&f=u From paszczus at pld-linux.org Mon Aug 22 17:16:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: CVSROOT: users - chwilowo, gmail.com In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - chwilowo, gmail.com ---- Files affected: CVSROOT: users (1.384 -> 1.385) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.384 CVSROOT/users:1.385 --- CVSROOT/users:1.384 Wed Jul 20 18:40:45 2005 +++ CVSROOT/users Mon Aug 22 17:16:05 2005 @@ -167,7 +167,7 @@ osamyn:osamyn@easynet.be:Olivier Samyn paladine:paladine@pld-dc.org:Kamil Kosi?ski:paladine@chrome.pl pascalek:rafi@pers.pl:Rafa? Cygnarowski:pascalek79@jabber.org -paszczus:paszczus@darpa.pl:S?awomir Paszkiewicz:paszczus@pld-linux.org +paszczus:paszczus@gmail.com:S?awomir Paszkiewicz:paszczus@pld-linux.org patrys:patrys@pld-dc.org:Patryk Zawadzki:patrys@pld-linux.org pawcioos:pawcio-s@go2.pl:Pawe? Synowiec:pawcioos@pld-linux.org pawelb:pawelb@students.mimuw.edu.pl:Pawe? Boguszewski:pawelb@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.384&r2=1.385&f=u From glen at pld-linux.org Mon Aug 22 17:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SOURCES: lighttpd-lua-pkgconfig.patch (NEW) - use pkgconfig first ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:17:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use pkgconfig first to find lua, this way configure is able to pick up lua libs ---- Files affected: SOURCES: lighttpd-lua-pkgconfig.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-lua-pkgconfig.patch diff -u /dev/null SOURCES/lighttpd-lua-pkgconfig.patch:1.1 --- /dev/null Mon Aug 22 17:17:52 2005 +++ SOURCES/lighttpd-lua-pkgconfig.patch Mon Aug 22 17:17:46 2005 @@ -0,0 +1,61 @@ +--- ./configure.in 2005-08-22 13:56:17.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/configure.in 2005-08-22 18:03:23.000000000 +0300 +@@ -328,21 +328,35 @@ + + AC_MSG_RESULT($WITH_LUA) + if test "$WITH_LUA" != "no"; then ++ PKG_CHECK_MODULES(LUA, lua50, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ ++ if test $succeeded = no; then ++ PKG_CHECK_MODULES(LUA, lua, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ fi ++ ++ if test $succeeded = no; then + AC_PATH_PROG(LUACONFIG, lua-config) + if test x"$LUACONFIG" != x; then + LUA_CFLAGS=`$LUACONFIG --include` +- LUA_LIB=`$LUACONFIG --libs --extralibs` ++ LUA_LIBS=`$LUACONFIG --libs --extralibs` + else + AC_CHECK_LIB(lua, lua_open, [ + AC_CHECK_HEADERS([lua.h],[ +- LUA_LIB=-llua ++ LUA_LIBS=-llua + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + ]) + fi + AC_SUBST(LUA_CFLAGS) +- AC_SUBST(LUA_LIB) ++ AC_SUBST(LUA_LIBS) ++ fi + fi + + +@@ -511,7 +525,7 @@ + fi + + plugins="mod_cml" +-if test ! "x$LUA_LIB" = x; then ++if test ! "x$LUA_LIBS" = x; then + do_build="$do_build $plugins" + else + no_build="$no_build $plugins" +--- ./src/Makefile.am 2005-08-20 12:16:29.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/src/Makefile.am 2005-08-22 18:05:10.000000000 +0300 +@@ -78,7 +78,7 @@ + mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c + mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) + mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +-mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB) ++mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS) + + lib_LTLIBRARIES += mod_trigger_b4_dl.la + mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c ================================================================ From glen at pld-linux.org Mon Aug 22 17:18:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: lighttpd.spec - add pkgconfig support for locating lua libs In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:18:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pkgconfig support for locating lua libs ---- Files affected: SPECS: lighttpd.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.121 SPECS/lighttpd.spec:1.122 --- SPECS/lighttpd.spec:1.121 Mon Aug 22 16:29:20 2005 +++ SPECS/lighttpd.spec Mon Aug 22 17:18:39 2005 @@ -9,6 +9,9 @@ # - fcgi-devel is only used for the test-scripts # - disable largefile, if you have 2.4 kernel to get sendfile() support, and don't need > 2GB file requests, # see http://article.gmane.org/gmane.comp.web.lighttpd:722 +# - please make subpackages of modules that depend other modules than: +# - pcre (core binary needs it too) +# - openssl (core binary needs it too) # # Conditional build for lighttpd: %bcond_without xattr # support of extended attributes @@ -19,7 +22,7 @@ %bcond_with ldap # ldap support in mod_auth %bcond_with lua # LUA support in mod_cml %bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl -%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" %bcond_with gdbm # gdbm in mod_trigger_b4_dl %bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) %bcond_with valgrind # compile code with valgrind support. @@ -34,7 +37,7 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 0.1 +%define _rel 0.4 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP @@ -53,6 +56,7 @@ Patch0: http://minghetti.ch/blob/dirlist-hide.patch Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch +Patch3: %{name}-lua-pkgconfig.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -65,7 +69,7 @@ %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} -%{?with_lua:BuildRequires: lua50-devel} +%{?with_lua:BuildRequires: lua50-devel >= 5.0.2-4.1} %{?with_memcache:BuildRequires: libmemcache-devel} %{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel @@ -194,11 +198,13 @@ %{?with_dirhide:%patch0 -p0} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} %{__aclocal} %{__autoconf} +%{__automake} %configure \ %{!?with_ipv6:--disable-ipv6} \ @@ -344,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 15:18:39 glen +- add pkgconfig support for locating lua libs + Revision 1.121 2005/08/22 14:29:20 glen - 1.4.1 - reviewed dependencies ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.121&r2=1.122&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:17 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: gnomebaker.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 15:19:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: gnomebaker.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/gnomebaker.spec diff -u SPECS/gnomebaker.spec:1.12 SPECS/gnomebaker.spec:1.13 --- SPECS/gnomebaker.spec:1.12 Tue Aug 16 17:10:39 2005 +++ SPECS/gnomebaker.spec Mon Aug 22 17:19:12 2005 @@ -2,12 +2,12 @@ Summary: GNOME program for creating CDs Summary(pl): Program dla GNOME do nagrywania p?yt CD Name: gnomebaker -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Multimedia Source0: http://dl.sourceforge.net/gnomebaker/%{name}-%{version}.tar.gz -# Source0-md5: 11bd141fc1f3a52729c4baeff3578899 +# Source0-md5: caac582ec6896a49cd76779e54ef6d3e Patch0: %{name}-desktop.patch URL: http://gnomebaker.sourceforge.net/ BuildRequires: autoconf @@ -106,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 15:19:12 pawcioos +- updated to 0.4.2 + Revision 1.12 2005/08/16 15:10:39 freetz - 0.4.1, updated banner, R: gst-gnomevfs, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnomebaker.spec?r1=1.12&r2=1.13&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:18 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: gnomebaker-0.4.2.tar.gz Message-ID: <11490.1124723958@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnomebaker/gnomebaker-0.4.2.tar.gz caac582ec6896a49cd76779e54ef6d3e gnomebaker-0.4.2.tar.gz Size: 761044 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 17:19:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: lua50.spec - create lua50.pc. inspired from gentoo In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:19:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - create lua50.pc. inspired from gentoo ---- Files affected: SPECS: lua50.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.20 SPECS/lua50.spec:1.21 --- SPECS/lua50.spec:1.20 Mon Aug 22 16:36:22 2005 +++ SPECS/lua50.spec Mon Aug 22 17:19:20 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4 +Release: 4.1 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -148,6 +148,23 @@ install bin.static/luac $RPM_BUILD_ROOT%{_bindir}/luac50.static %endif +# create pkgconfig file +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +cat > $RPM_BUILD_ROOT%{_pkgconfigdir}/%{name}.pc <<'EOF' +prefix=%{_prefix} +exec_prefix=%{_exec_prefix} +includedir=%{_includedir}/%{name} +libdir=%{_libdir} +interpreter=%{_bindir}/%{name} +compiler=%{_bindir}/%{name} + +Name: Lua +Description: An extension programming language +Version: %{version} +Cflags: -I%{_includedir}/%{name} +Libs: -L%{_libdir} -llua50 -llualib50 -ldl -lm +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -168,6 +185,7 @@ %doc refman.ps.gz doc test %attr(755,root,root) %{_libdir}/lib*.so %{_includedir}/lua50 +%{_pkgconfigdir}/%{name}.pc %files static %defattr(644,root,root,755) @@ -185,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 15:19:20 glen +- create lua50.pc. inspired from gentoo + Revision 1.20 2005/08/22 14:36:22 glen - parallel make unfriendly make ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.20&r2=1.21&f=u From baggins at pld-linux.org Mon Aug 22 17:20:58 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: pam: configure.in, modules/pammodutil/modutil_cleanup.c, modules/p... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:20:58 2005 GMT Module: pam Tag: HEAD ---- Log message: - include config.h and check for required functions ---- Files affected: pam: configure.in (1.65 -> 1.66) pam/modules/pammodutil: modutil_cleanup.c (1.1 -> 1.2) , modutil_getgrgid.c (1.2 -> 1.3) , modutil_getgrnam.c (1.2 -> 1.3) , modutil_getlogin.c (1.4 -> 1.5) , modutil_getpwnam.c (1.3 -> 1.4) , modutil_getpwuid.c (1.3 -> 1.4) , modutil_getspnam.c (1.2 -> 1.3) , modutil_ingroup.c (1.1 -> 1.2) , modutil_ioloop.c (1.1 -> 1.2) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.65 pam/configure.in:1.66 --- pam/configure.in:1.65 Thu Jul 14 17:40:31 2005 +++ pam/configure.in Mon Aug 22 17:20:53 2005 @@ -173,7 +173,7 @@ AC_FUNC_MMAP AC_FUNC_VPRINTF AC_CHECK_FUNCS(gethostname gettimeofday mkdir select strcspn strdup strerror strspn strstr strtol) -AC_CHECK_FUNCS(getpwnam_r getgrnam_r) +AC_CHECK_FUNCS(getgrgid_r getpwuid_r getspnam_r getpwnam_r getgrnam_r getgrouplist) dnl Checks for libraries. ================================================================ Index: pam/modules/pammodutil/modutil_cleanup.c diff -u pam/modules/pammodutil/modutil_cleanup.c:1.1 pam/modules/pammodutil/modutil_cleanup.c:1.2 --- pam/modules/pammodutil/modutil_cleanup.c:1.1 Thu Mar 7 14:30:17 2002 +++ pam/modules/pammodutil/modutil_cleanup.c Mon Aug 22 17:20:53 2005 @@ -4,6 +4,8 @@ * This function provides a common pam_set_data() friendly version of free(). */ +#include "config.h" + #include "pammodutil.h" void _pammodutil_cleanup(pam_handle_t *pamh, void *data, int error_status) ================================================================ Index: pam/modules/pammodutil/modutil_getgrgid.c diff -u pam/modules/pammodutil/modutil_getgrgid.c:1.2 pam/modules/pammodutil/modutil_getgrgid.c:1.3 --- pam/modules/pammodutil/modutil_getgrgid.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrgid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getgrnam.c diff -u pam/modules/pammodutil/modutil_getgrnam.c:1.2 pam/modules/pammodutil/modutil_getgrnam.c:1.3 --- pam/modules/pammodutil/modutil_getgrnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getlogin.c diff -u pam/modules/pammodutil/modutil_getlogin.c:1.4 pam/modules/pammodutil/modutil_getlogin.c:1.5 --- pam/modules/pammodutil/modutil_getlogin.c:1.4 Mon Jul 11 16:58:44 2005 +++ pam/modules/pammodutil/modutil_getlogin.c Mon Aug 22 17:20:53 2005 @@ -6,6 +6,8 @@ * there. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwnam.c diff -u pam/modules/pammodutil/modutil_getpwnam.c:1.3 pam/modules/pammodutil/modutil_getpwnam.c:1.4 --- pam/modules/pammodutil/modutil_getpwnam.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwuid.c diff -u pam/modules/pammodutil/modutil_getpwuid.c:1.3 pam/modules/pammodutil/modutil_getpwuid.c:1.4 --- pam/modules/pammodutil/modutil_getpwuid.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwuid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getspnam.c diff -u pam/modules/pammodutil/modutil_getspnam.c:1.2 pam/modules/pammodutil/modutil_getspnam.c:1.3 --- pam/modules/pammodutil/modutil_getspnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getspnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ingroup.c diff -u pam/modules/pammodutil/modutil_ingroup.c:1.1 pam/modules/pammodutil/modutil_ingroup.c:1.2 --- pam/modules/pammodutil/modutil_ingroup.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ingroup.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * specified group. */ +#include "config.h" + #include "pammodutil.h" #include "include/security/_pam_modutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ioloop.c diff -u pam/modules/pammodutil/modutil_ioloop.c:1.1 pam/modules/pammodutil/modutil_ioloop.c:1.2 --- pam/modules/pammodutil/modutil_ioloop.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ioloop.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * write occurs. It handles EINTR and partial read/write returns. */ +#include "config.h" + #include #include ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.65&r2=1.66&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_cleanup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrgid.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getlogin.c?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwnam.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwuid.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getspnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ingroup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ioloop.c?r1=1.1&r2=1.2&f=u From baggins at pld-linux.org Mon Aug 22 17:21:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: pam: configure.in - 0.80.1 In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:21:17 2005 GMT Module: pam Tag: HEAD ---- Log message: - 0.80.1 ---- Files affected: pam: configure.in (1.66 -> 1.67) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.66 pam/configure.in:1.67 --- pam/configure.in:1.66 Mon Aug 22 17:20:53 2005 +++ pam/configure.in Mon Aug 22 17:21:12 2005 @@ -5,7 +5,7 @@ PAM_MAJOR_VERSION=0 PAM_MINOR_VERSION=80 -PAM_MICRO_VERSION=0 +PAM_MICRO_VERSION=1 PAM_VERSION=$PAM_MAJOR_VERSION.$PAM_MINOR_VERSION.$PAM_MICRO_VERSION PAM_VERSION_INFO=$PAM_MINOR_VERSION:$PAM_MAJOR_VERSION:$PAM_MINOR_VERSION ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.66&r2=1.67&f=u From glen at pld-linux.org Mon Aug 22 17:22:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: lua50.spec - rel 5 with included pkgconfig. STBR aswell In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:22:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 5 with included pkgconfig. STBR aswell ---- Files affected: SPECS: lua50.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.21 SPECS/lua50.spec:1.22 --- SPECS/lua50.spec:1.21 Mon Aug 22 17:19:20 2005 +++ SPECS/lua50.spec Mon Aug 22 17:22:21 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4.1 +Release: 5 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 15:22:21 glen +- rel 5 with included pkgconfig. STBR aswell + Revision 1.21 2005/08/22 15:19:20 glen - create lua50.pc. inspired from gentoo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Mon Aug 22 17:27:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: lua50.spec - fix compiler path in pkgconfig file In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:27:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix compiler path in pkgconfig file ---- Files affected: SPECS: lua50.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.22 SPECS/lua50.spec:1.23 --- SPECS/lua50.spec:1.22 Mon Aug 22 17:22:21 2005 +++ SPECS/lua50.spec Mon Aug 22 17:27:36 2005 @@ -156,7 +156,7 @@ includedir=%{_includedir}/%{name} libdir=%{_libdir} interpreter=%{_bindir}/%{name} -compiler=%{_bindir}/%{name} +compiler=%{_bindir}/luac50 Name: Lua Description: An extension programming language @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/22 15:27:36 glen +- fix compiler path in pkgconfig file + Revision 1.22 2005/08/22 15:22:21 glen - rel 5 with included pkgconfig. STBR aswell ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.22&r2=1.23&f=u From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <5715.1124725884@distfiles.pld-linux.org> wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: pam.spec - 0.80.1 - fix modules miscompile due to lack of i... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:51:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.80.1 - fix modules miscompile due to lack of includes ---- Files affected: SPECS: pam.spec (1.223 -> 1.224) ---- Diffs: ================================================================ Index: SPECS/pam.spec diff -u SPECS/pam.spec:1.223 SPECS/pam.spec:1.224 --- SPECS/pam.spec:1.223 Thu Aug 11 11:46:18 2005 +++ SPECS/pam.spec Mon Aug 22 17:51:18 2005 @@ -21,13 +21,13 @@ Summary(tr): Mod?ler, art?msal do?rulama birimleri Summary(uk): ??????????, ?? ?????????? ?????????????? ??? ??????? Name: pam -Version: 0.80.0 +Version: 0.80.1 Release: 1 Epoch: 0 License: GPL or BSD Group: Base Source0: ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{version}.tar.gz -# Source0-md5: 330683490b44e2fe584efb0b1bf52fbd +# Source0-md5: df374f625e7178f43a263a32e376dd46 Source1: system-auth.pamd URL: http://www.kernel.org/pub/linux/libs/pam/ BuildRequires: bison @@ -446,6 +446,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.224 2005/08/22 15:51:18 baggins +- 0.80.1 +- fix modules miscompile due to lack of includes + Revision 1.223 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.223&r2=1.224&f=u From baggins at pld-linux.org Mon Aug 22 17:52:38 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <6541.1124725958@distfiles.pld-linux.org> wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 17:58:11 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: mldonkey.spec - ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:58:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ocaml 3.08.4 ---- Files affected: SPECS: mldonkey.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.122 SPECS/mldonkey.spec:1.123 --- SPECS/mldonkey.spec:1.122 Mon Aug 22 15:48:54 2005 +++ SPECS/mldonkey.spec Mon Aug 22 17:58:04 2005 @@ -24,7 +24,7 @@ Summary: eDonkey 2000 p2p network client Summary(pl): Klient sieci p2p eDonkey 2000 Name: mldonkey -%define ocaml_ver 3.08.3 +%define ocaml_ver 3.08.4 #%define patch_pack c %define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/22 15:58:04 paszczus +- ocaml 3.08.4 + Revision 1.122 2005/08/22 13:48:54 paszczus - updated to 2.6.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.122&r2=1.123&f=u From spider at pld-linux.org Mon Aug 22 18:05:14 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: idesk.spec - extended description In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 16:05:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - extended description ---- Files affected: SPECS: idesk.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.16 SPECS/idesk.spec:1.17 --- SPECS/idesk.spec:1.16 Mon Aug 8 17:49:04 2005 +++ SPECS/idesk.spec Mon Aug 22 18:05:09 2005 @@ -21,7 +21,11 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not -provided by all window managers. +provided by all window managers. The icon graphics are either from a +png or svg (vector) file and support some eyecandy effects like +transparency. Each icon can be confgured to run one or more shell +commands and the actions which run those commands are completely +configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie @@ -60,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 16:05:09 spider +- extended description + Revision 1.16 2005/08/08 15:49:04 kolodko - up to 0.7.3, fixed bug with CaptionTip - rm Makefile patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.16&r2=1.17&f=u From baggins at pld-linux.org Mon Aug 22 18:13:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <20370.1124727183@distfiles.pld-linux.org> wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 18:14:30 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:12 2005 Subject: SOURCES (LINUX_2_6): bootsplash-3.1.6-2.6.12.diff (NEW) - official... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:14:30 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - official bootsplash patch + minor rework. ---- Files affected: SOURCES: bootsplash-3.1.6-2.6.12.diff (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/bootsplash-3.1.6-2.6.12.diff diff -u /dev/null SOURCES/bootsplash-3.1.6-2.6.12.diff:1.1.2.1 --- /dev/null Mon Aug 22 18:14:30 2005 +++ SOURCES/bootsplash-3.1.6-2.6.12.diff Mon Aug 22 18:14:25 2005 @@ -0,0 +1,2788 @@ +diff -urN linux-2.6.12/drivers/char/keyboard.c linux-2.6.12-bootsplash/drivers/char/keyboard.c +--- linux-2.6.12/drivers/char/keyboard.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/keyboard.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1063,6 +1063,15 @@ + if (keycode < BTN_MISC) + printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode); + ++#ifdef CONFIG_BOOTSPLASH ++ /* This code has to be redone for some non-x86 platforms */ ++ if (down == 1 && (keycode == 0x3c || keycode == 0x01)) { /* F2 and ESC on PC keyboard */ ++ extern int splash_verbose(void); ++ if (splash_verbose()) ++ return; ++ } ++#endif ++ + #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ + if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) { + sysrq_down = down; +diff -urN linux-2.6.12/drivers/char/n_tty.c linux-2.6.12-bootsplash/drivers/char/n_tty.c +--- linux-2.6.12/drivers/char/n_tty.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/n_tty.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1299,6 +1299,15 @@ + tty->minimum_to_wake = (minimum - (b - buf)); + + if (!input_available_p(tty, 0)) { ++#ifdef CONFIG_BOOTSPLASH ++ if (file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,1) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,1)) { ++ extern int splash_verbose(void); ++ (void)splash_verbose(); ++ } ++#endif + if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { + retval = -EIO; + break; +diff -urN linux-2.6.12/drivers/char/vt.c linux-2.6.12-bootsplash/drivers/char/vt.c +--- linux-2.6.12/drivers/char/vt.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/vt.c 2005-06-18 09:22:11.000000000 +0200 +@@ -3221,6 +3221,31 @@ + } + } + ++#ifdef CONFIG_BOOTSPLASH ++void con_remap_def_color(struct vc_data *vc, int new_color) ++{ ++ unsigned short *sbuf = vc->vc_screenbuf; ++ unsigned c, len = vc->vc_screenbuf_size >> 1; ++ int old_color; ++ ++ if (sbuf) { ++ old_color = vc->vc_def_color << 8; ++ new_color <<= 8; ++ while(len--) { ++ c = *sbuf; ++ if (((c ^ old_color) & 0xf000) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0xf000; ++ if (((c ^ old_color) & 0x0f00) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0x0f00; ++ sbuf++; ++ } ++ new_color >>= 8; ++ } ++ vc->vc_def_color = vc->vc_color = new_color; ++ update_attr(vc); ++} ++#endif ++ + /* + * Visible symbols for modules + */ +diff -urN linux-2.6.12/drivers/video/bootsplash/bootsplash.c linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c +--- linux-2.6.12/drivers/video/bootsplash/bootsplash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c 2005-06-18 09:22:11.000000000 +0200 +@@ -0,0 +1,984 @@ ++/* ++ * linux/drivers/video/bootsplash/bootsplash.c - ++ * splash screen handling functions. ++ * ++ * (w) 2001-2004 by Volker Poplawski, , ++ * Stefan Reinauer, , ++ * Steffen Winterfeldt, , ++ * Michael Schroeder ++ * ++ * Ideas & SuSE screen work by Ken Wimer, ++ * ++ * For more information on this code check http://www.bootsplash.org/ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "../console/fbcon.h" ++#include "bootsplash.h" ++#include "decode-jpg.h" ++ ++/* extern struct fb_ops vesafb_ops; */ ++extern signed char con2fb_map[MAX_NR_CONSOLES]; ++ ++#define SPLASH_VERSION "3.1.6-2004/03/31" ++ ++/* These errors have to match fbcon-jpegdec.h */ ++static unsigned char *jpg_errors[] = { ++ "no SOI found", ++ "not 8 bit", ++ "height mismatch", ++ "width mismatch", ++ "bad width or height", ++ "too many COMPPs", ++ "illegal HV", ++ "quant table selector", ++ "picture is not YCBCR 221111", ++ "unknow CID in scan", ++ "dct not sequential", ++ "wrong marker", ++ "no EOI", ++ "bad tables", ++ "depth mismatch" ++}; ++ ++static struct jpeg_decdata *decdata = 0; /* private decoder data */ ++ ++static int splash_registered = 0; ++static int splash_usesilent = 0; /* shall we display the silentjpeg? */ ++int splash_default = 0xf01; ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth); ++ ++static int __init splash_setup(char *options) ++{ ++ if(!strncmp("silent", options, 6)) { ++ printk(KERN_INFO "bootsplash: silent mode.\n"); ++ splash_usesilent = 1; ++ /* skip "silent," */ ++ if (strlen(options) == 6) ++ return 0; ++ options += 7; ++ } ++ if(!strncmp("verbose", options, 7)) { ++ printk(KERN_INFO "bootsplash: verbose mode.\n"); ++ splash_usesilent = 0; ++ return 0; ++ } ++ splash_default = simple_strtoul(options, NULL, 0); ++ return 0; ++} ++ ++__setup("splash=", splash_setup); ++ ++ ++static int splash_hasinter(unsigned char *buf, int num) ++{ ++ unsigned char *bufend = buf + num * 12; ++ while(buf < bufend) { ++ if (buf[1] > 127) /* inter? */ ++ return 1; ++ buf += buf[3] > 127 ? 24 : 12; /* blend? */ ++ } ++ return 0; ++} ++ ++static int boxextract(unsigned char *buf, unsigned short *dp, unsigned char *cols, int *blendp) ++{ ++ dp[0] = buf[0] | buf[1] << 8; ++ dp[1] = buf[2] | buf[3] << 8; ++ dp[2] = buf[4] | buf[5] << 8; ++ dp[3] = buf[6] | buf[7] << 8; ++ *(unsigned int *)(cols + 0) = ++ *(unsigned int *)(cols + 4) = ++ *(unsigned int *)(cols + 8) = ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 8); ++ if (dp[1] > 32767) { ++ dp[1] = ~dp[1]; ++ *(unsigned int *)(cols + 4) = *(unsigned int *)(buf + 12); ++ *(unsigned int *)(cols + 8) = *(unsigned int *)(buf + 16); ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 20); ++ *blendp = 1; ++ return 24; ++ } ++ return 12; ++} ++ ++static void boxit(unsigned char *pic, int bytes, unsigned char *buf, int num, int percent, int overpaint) ++{ ++ int x, y, i, p, doblend, r, g, b, a, add; ++ unsigned short data1[4]; ++ unsigned char cols1[16]; ++ unsigned short data2[4]; ++ unsigned char cols2[16]; ++ unsigned char *bufend; ++ unsigned short *picp; ++ unsigned int stipple[32], sti, stin, stinn, stixs, stixe, stiys, stiye; ++ int xs, xe, ys, ye, xo, yo; ++ ++ if (num == 0) ++ return; ++ bufend = buf + num * 12; ++ stipple[0] = 0xffffffff; ++ stin = 1; ++ stinn = 0; ++ stixs = stixe = 0; ++ stiys = stiye = 0; ++ while(buf < bufend) { ++ doblend = 0; ++ buf += boxextract(buf, data1, cols1, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32767) { ++ /* box stipple */ ++ if (stinn == 32) ++ continue; ++ if (stinn == 0) { ++ stixs = data1[2]; ++ stixe = data1[3]; ++ stiys = stiye = 0; ++ } else if (stinn == 4) { ++ stiys = data1[2]; ++ stiye = data1[3]; ++ } ++ stipple[stinn++] = (cols1[ 0] << 24) | (cols1[ 1] << 16) | (cols1[ 2] << 8) | cols1[ 3] ; ++ stipple[stinn++] = (cols1[ 4] << 24) | (cols1[ 5] << 16) | (cols1[ 6] << 8) | cols1[ 7] ; ++ stipple[stinn++] = (cols1[ 8] << 24) | (cols1[ 9] << 16) | (cols1[10] << 8) | cols1[11] ; ++ stipple[stinn++] = (cols1[12] << 24) | (cols1[13] << 16) | (cols1[14] << 8) | cols1[15] ; ++ stin = stinn; ++ continue; ++ } ++ stinn = 0; ++ if (data1[0] > 32767) ++ buf += boxextract(buf, data2, cols2, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32766) { ++ /* box copy */ ++ i = 12 * (short)data1[3]; ++ doblend = 0; ++ i += boxextract(buf + i, data1, cols1, &doblend); ++ if (data1[0] > 32767) ++ boxextract(buf + i, data2, cols2, &doblend); ++ } ++ if (data1[0] == 32767) ++ continue; ++ if (data1[2] > 32767) { ++ if (overpaint) ++ continue; ++ data1[2] = ~data1[2]; ++ } ++ if (data1[3] > 32767) { ++ if (percent == 65536) ++ continue; ++ data1[3] = ~data1[3]; ++ } ++ if (data1[0] > 32767) { ++ data1[0] = ~data1[0]; ++ for (i = 0; i < 4; i++) ++ data1[i] = (data1[i] * (65536 - percent) + data2[i] * percent) >> 16; ++ for (i = 0; i < 16; i++) ++ cols1[i] = (cols1[i] * (65536 - percent) + cols2[i] * percent) >> 16; ++ } ++ *(unsigned int *)cols2 = *(unsigned int *)cols1; ++ a = cols2[3]; ++ if (a == 0 && !doblend) ++ continue; ++ ++ if (stixs >= 32768) { ++ xo = xs = (stixs ^ 65535) + data1[0]; ++ xe = stixe ? stixe + data1[0] : data1[2]; ++ } else if (stixe >= 32768) { ++ xs = stixs ? data1[2] - stixs : data1[0]; ++ xe = data1[2] - (stixe ^ 65535); ++ xo = xe + 1; ++ } else { ++ xo = xs = stixs; ++ xe = stixe ? stixe : data1[2]; ++ } ++ if (stiys >= 32768) { ++ yo = ys = (stiys ^ 65535) + data1[1]; ++ ye = stiye ? stiye + data1[1] : data1[3]; ++ } else if (stiye >= 32768) { ++ ys = stiys ? data1[3] - stiys : data1[1]; ++ ye = data1[3] - (stiye ^ 65535); ++ yo = ye + 1; ++ } else { ++ yo = ys = stiys; ++ ye = stiye ? stiye : data1[3]; ++ } ++ xo = 32 - (xo & 31); ++ yo = stin - (yo % stin); ++ if (xs < data1[0]) ++ xs = data1[0]; ++ if (xe > data1[2]) ++ xe = data1[2]; ++ if (ys < data1[1]) ++ ys = data1[1]; ++ if (ye > data1[3]) ++ ye = data1[3]; ++ ++ for (y = ys; y <= ye; y++) { ++ sti = stipple[(y + yo) % stin]; ++ x = (xs + xo) & 31; ++ if (x) ++ sti = (sti << x) | (sti >> (32 - x)); ++ if (doblend) { ++ if ((p = data1[3] - data1[1]) != 0) ++ p = ((y - data1[1]) << 16) / p; ++ for (i = 0; i < 8; i++) ++ cols2[i + 8] = (cols1[i] * (65536 - p) + cols1[i + 8] * p) >> 16; ++ } ++ add = (xs & 1); ++ add ^= (add ^ y) & 1 ? 1 : 3; /* 2x2 ordered dithering */ ++ picp = (unsigned short *)(pic + xs * 2 + y * bytes); ++ for (x = xs; x <= xe; x++) { ++ if (!(sti & 0x80000000)) { ++ sti <<= 1; ++ picp++; ++ add ^= 3; ++ continue; ++ } ++ sti = (sti << 1) | 1; ++ if (doblend) { ++ if ((p = data1[2] - data1[0]) != 0) ++ p = ((x - data1[0]) << 16) / p; ++ for (i = 0; i < 4; i++) ++ cols2[i] = (cols2[i + 8] * (65536 - p) + cols2[i + 12] * p) >> 16; ++ a = cols2[3]; ++ } ++ r = cols2[0]; ++ g = cols2[1]; ++ b = cols2[2]; ++ if (a != 255) { ++ i = *picp; ++ r = ((i >> 8 & 0xf8) * (255 - a) + r * a) / 255; ++ g = ((i >> 3 & 0xfc) * (255 - a) + g * a) / 255; ++ b = ((i << 3 & 0xf8) * (255 - a) + b * a) / 255; ++ } ++ #define CLAMP(x) ((x) >= 256 ? 255 : (x)) ++ i = ((CLAMP(r + add*2+1) & 0xf8) << 8) | ++ ((CLAMP(g + add ) & 0xfc) << 3) | ++ ((CLAMP(b + add*2+1) ) >> 3); ++ *picp++ = i; ++ add ^= 3; ++ } ++ } ++ } ++} ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth) ++{ ++ int size, err; ++ unsigned char *mem; ++ ++ size = ((width + 15) & ~15) * ((height + 15) & ~15) * (depth >> 3); ++ mem = vmalloc(size); ++ if (!mem) { ++ printk(KERN_INFO "bootsplash: no memory for decoded picture.\n"); ++ return -1; ++ } ++ if (!decdata) ++ decdata = vmalloc(sizeof(*decdata)); ++ if ((err = jpeg_decode(jpeg, mem, ((width + 15) & ~15), ((height + 15) & ~15), depth, decdata))) ++ printk(KERN_INFO "bootsplash: error while decompressing picture: %s (%d)\n",jpg_errors[err - 1], err); ++ vfree(mem); ++ return err ? -1 : 0; ++} ++ ++static void splash_free(struct vc_data *vc, struct fb_info *info) ++{ ++ if (!vc->vc_splash_data) ++ return; ++ if (info->silent_screen_base) ++ info->screen_base = info->silent_screen_base; ++ info->silent_screen_base = 0; ++ if (vc->vc_splash_data->splash_silentjpeg) ++ vfree(vc->vc_splash_data->splash_sboxes); ++ vfree(vc->vc_splash_data); ++ vc->vc_splash_data = 0; ++ info->splash_data = 0; ++} ++ ++static int splash_mkpenguin(struct splash_data *data, int pxo, int pyo, int pwi, int phe, int pr, int pg, int pb) ++{ ++ unsigned char *buf; ++ int i; ++ ++ if (pwi ==0 || phe == 0) ++ return 0; ++ buf = (unsigned char *)data + sizeof(*data); ++ pwi += pxo - 1; ++ phe += pyo - 1; ++ *buf++ = pxo; ++ *buf++ = pxo >> 8; ++ *buf++ = pyo; ++ *buf++ = pyo >> 8; ++ *buf++ = pwi; ++ *buf++ = pwi >> 8; ++ *buf++ = phe; ++ *buf++ = phe >> 8; ++ *buf++ = pr; ++ *buf++ = pg; ++ *buf++ = pb; ++ *buf++ = 0; ++ for (i = 0; i < 12; i++, buf++) ++ *buf = buf[-12]; ++ buf[-24] ^= 0xff; ++ buf[-23] ^= 0xff; ++ buf[-1] = 0xff; ++ return 2; ++} ++ ++static const int splash_offsets[3][16] = { ++ /* len, unit, size, state, fgcol, col, xo, yo, wi, he ++ boxcnt, ssize, sboxcnt, percent, overok, palcnt */ ++ /* V1 */ ++ { 20, -1, 16, -1, -1, -1, 8, 10, 12, 14, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V2 */ ++ { 35, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V3 */ ++ { 38, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ 24, 28, 32, 34, 36, 37 }, ++}; ++ ++#define SPLASH_OFF_LEN offsets[0] ++#define SPLASH_OFF_UNIT offsets[1] ++#define SPLASH_OFF_SIZE offsets[2] ++#define SPLASH_OFF_STATE offsets[3] ++#define SPLASH_OFF_FGCOL offsets[4] ++#define SPLASH_OFF_COL offsets[5] ++#define SPLASH_OFF_XO offsets[6] ++#define SPLASH_OFF_YO offsets[7] ++#define SPLASH_OFF_WI offsets[8] ++#define SPLASH_OFF_HE offsets[9] ++#define SPLASH_OFF_BOXCNT offsets[10] ++#define SPLASH_OFF_SSIZE offsets[11] ++#define SPLASH_OFF_SBOXCNT offsets[12] ++#define SPLASH_OFF_PERCENT offsets[13] ++#define SPLASH_OFF_OVEROK offsets[14] ++#define SPLASH_OFF_PALCNT offsets[15] ++ ++static inline int splash_getb(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off]; ++} ++ ++static inline int splash_gets(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off] | pos[off + 1] << 8; ++} ++ ++static inline int splash_geti(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : ++ pos[off] | pos[off + 1] << 8 | pos[off + 2] << 16 | pos[off + 3] << 24; ++} ++ ++static int splash_getraw(unsigned char *start, unsigned char *end, int *update) ++{ ++ unsigned char *ndata; ++ int version; ++ int splash_size; ++ int unit; ++ int width, height; ++ int silentsize; ++ int boxcnt; ++ int sboxcnt; ++ int palcnt; ++ int i, len; ++ const int *offsets; ++ struct vc_data *vc; ++ struct fb_info *info; ++ struct splash_data *sd; ++ ++ if (update) ++ *update = -1; ++ ++ if (!update || start[7] < '2' || start[7] > '3' || splash_geti(start, 12) != (int)0xffffffff) ++ printk(KERN_INFO "bootsplash %s: looking for picture...", SPLASH_VERSION); ++ ++ for (ndata = start; ndata < end; ndata++) { ++ if (ndata[0] != 'B' || ndata[1] != 'O' || ndata[2] != 'O' || ndata[3] != 'T') ++ continue; ++ if (ndata[4] != 'S' || ndata[5] != 'P' || ndata[6] != 'L' || ndata[7] < '1' || ndata[7] > '3') ++ continue; ++ version = ndata[7] - '0'; ++ offsets = splash_offsets[version - 1]; ++ len = SPLASH_OFF_LEN; ++ unit = splash_getb(ndata, SPLASH_OFF_UNIT); ++ if (unit >= MAX_NR_CONSOLES) ++ continue; ++ if (unit) { ++ vc_allocate(unit); ++ } ++ vc = vc_cons[unit].d; ++ info = registered_fb[(int)con2fb_map[unit]]; ++ width = info->var.xres; ++ height = info->var.yres; ++ splash_size = splash_geti(ndata, SPLASH_OFF_SIZE); ++ if (splash_size == (int)0xffffffff && version > 1) { ++ if ((sd = vc->vc_splash_data) != 0) { ++ int up = 0; ++ i = splash_getb(ndata, SPLASH_OFF_STATE); ++ if (i != 255) { ++ sd->splash_state = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_FGCOL); ++ if (i != 255) { ++ sd->splash_fg_color = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_COL); ++ if (i != 255) { ++ sd->splash_color = i; ++ up = -1; ++ } ++ boxcnt = sboxcnt = 0; ++ if (ndata + len <= end) { ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ } ++ if (boxcnt) { ++ i = splash_gets(ndata, len); ++ if (boxcnt + i <= sd->splash_boxcount && ndata + len + 2 + boxcnt * 12 <= end) { ++ ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_boxes + i * 12, 8)) { ++ ++ memcpy(sd->splash_boxes + i * 12, ndata + len + 2, boxcnt * 12); ++ up |= 1; ++ } ++ } ++ len += boxcnt * 12 + 2; ++ } ++ if (sboxcnt) { ++ i = splash_gets(ndata, len); ++ if (sboxcnt + i <= sd->splash_sboxcount && ndata + len + 2 + sboxcnt * 12 <= end) { ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_sboxes + i * 12, 8)) { ++ memcpy(sd->splash_sboxes + i * 12, ndata + len + 2, sboxcnt * 12); ++ up |= 2; ++ } ++ } ++ } ++ if (update) ++ *update = up; ++ } ++ return unit; ++ } ++ if (splash_size == 0) { ++ printk(KERN_INFO"...found, freeing memory.\n"); ++ if (vc->vc_splash_data) ++ splash_free(vc, info); ++ return unit; ++ } ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ palcnt = 3 * splash_getb(ndata, SPLASH_OFF_PALCNT); ++ if (ndata + len + splash_size > end) { ++ printk(KERN_INFO "...found, but truncated!\n"); ++ return -1; ++ } ++ if (!jpeg_check_size(ndata + len + boxcnt * 12 + palcnt, width, height)) { ++ ndata += len + splash_size - 1; ++ continue; ++ } ++ if (splash_check_jpeg(ndata + len + boxcnt * 12 + palcnt, width, height, info->var.bits_per_pixel)) ++ return -1; ++ silentsize = splash_geti(ndata, SPLASH_OFF_SSIZE); ++ if (silentsize) ++ printk(KERN_INFO" silentjpeg size %d bytes,", silentsize); ++ if (silentsize >= splash_size) { ++ printk(KERN_INFO " bigger than splashsize!\n"); ++ return -1; ++ } ++ splash_size -= silentsize; ++ if (!splash_usesilent) ++ silentsize = 0; ++ else if (height * 2 * info->fix.line_length > info->fix.smem_len) { ++ printk(KERN_INFO " does not fit into framebuffer.\n"); ++ silentsize = 0; ++ } ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ if (silentsize) { ++ unsigned char *simage = ndata + len + splash_size + 12 * sboxcnt; ++ if (!jpeg_check_size(simage, width, height) || ++ splash_check_jpeg(simage, width, height, info->var.bits_per_pixel)) { ++ printk(KERN_INFO " error in silent jpeg.\n"); <> From pluto at pld-linux.org Mon Aug 22 18:20:06 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:12 2005 Subject: SOURCES (LINUX_2_6): kernel-i386.config, kernel-i386-smp.config -C... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:20:06 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set +CONFIG_BOOTSPLASH=y ---- Files affected: SOURCES: kernel-i386.config (1.82.10.107 -> 1.82.10.108) , kernel-i386-smp.config (1.59.10.102 -> 1.59.10.103) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.107 SOURCES/kernel-i386.config:1.82.10.108 --- SOURCES/kernel-i386.config:1.82.10.107 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386.config Mon Aug 22 18:20:01 2005 @@ -2151,16 +2151,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.102 SOURCES/kernel-i386-smp.config:1.59.10.103 --- SOURCES/kernel-i386-smp.config:1.59.10.102 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386-smp.config Mon Aug 22 18:20:01 2005 @@ -2069,16 +2069,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.107&r2=1.82.10.108&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.102&r2=1.59.10.103&f=u From pluto at pld-linux.org Mon Aug 22 18:22:04 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (LINUX_2_6): kernel.spec - fbsplash dropped, bootsplash-3.1.... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:22:04 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ---- Files affected: SPECS: kernel.spec (1.441.2.1159 -> 1.441.2.1160) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1159 SPECS/kernel.spec:1.441.2.1160 --- SPECS/kernel.spec:1.441.2.1159 Thu Aug 18 13:59:16 2005 +++ SPECS/kernel.spec Mon Aug 22 18:21:58 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.2 +%define _rel 0.3 %define _netfilter_snap 20050801 @@ -213,8 +213,7 @@ Patch58: inotify-2.6.12.patch # derived from http://www.syskonnect.com/syskonnect/support/driver/zip/linux/install-8_18.tar.bz2 Patch59: linux-2.6-sk98lin-8.18.2.2.patch -# http://dev.gentoo.org/~spock/projects/gensplash/ -Patch60: fbsplash-0.9.2-r3-2.6.12-rc3.patch +Patch60: bootsplash-3.1.6-2.6.12.diff # reserve dynamic minors for fbsplash and device mapper Patch61: linux-static-dev.patch Patch62: linux-2.6-lirc-0.7.patch @@ -1467,6 +1466,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1160 2005/08/22 16:21:58 pluto +- fbsplash dropped, bootsplash-3.1.6 added, release 0.3. + Revision 1.441.2.1159 2005/08/18 11:59:16 pluto - nptl signal delivery deadlock fix. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1159&r2=1.441.2.1160&f=u From twittner at pld-linux.org Mon Aug 22 18:32:23 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: luma.spec $ luma QPainter::begin: Cannot paint null pixmap ... In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 16:32:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: $ luma QPainter::begin: Cannot paint null pixmap QPainter::setPen: Will be reset by begin() zsh: segmentation fault luma $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ - unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py ---- Files affected: SPECS: luma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.6 SPECS/luma.spec:1.7 --- SPECS/luma.spec:1.6 Thu Aug 18 12:14:37 2005 +++ SPECS/luma.spec Mon Aug 22 18:32:07 2005 @@ -39,12 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.pyc' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png %py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} -find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.py -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +64,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 16:32:07 twittner +$ luma +QPainter::begin: Cannot paint null pixmap +QPainter::setPen: Will be reset by begin() +zsh: segmentation fault luma +$ cat /usr/bin/luma +#!/usr/bin/python /usr/lib/luma/luma.pyc +$ +- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py + Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.6&r2=1.7&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): evolution-webcal.spec - up to version 2.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 16:59:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.4.0 ---- Files affected: SPECS: evolution-webcal.spec (1.20.2.1 -> 1.20.2.2) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20.2.1 SPECS/evolution-webcal.spec:1.20.2.2 --- SPECS/evolution-webcal.spec:1.20.2.1 Mon Jul 25 21:40:07 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 18:59:12 2005 @@ -2,25 +2,25 @@ Summary: Web calendar subscription utility for Evolution Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal -Version: 2.3.90 +Version: 2.4.0 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ff5d99835ba505f92ce2671fc0223792 +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/%{name}-%{version}.tar.bz2 +# Source0-md5: 3a09711675d82075f007e565a0277185 BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.53 BuildRequires: automake -BuildRequires: evolution-data-server-devel >= 1.3.5 -BuildRequires: gtk+2-devel >= 2:2.6.4 +BuildRequires: evolution-data-server-devel >= 1.3.7-3 +BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: intltool BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libsoup-devel >= 2.2.3 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: evolution >= 2.3.5.1 -Requires: gtk+2 >= 2:2.6.4 +Requires: evolution >= 2.3.7-3 +Requires: gtk+2 >= 2:2.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_libdir}/evolution-webcal -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/evolution-webcal.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.2 2005/08/22 16:59:12 aflinta +- up to version 2.4.0 + Revision 1.20.2.1 2005/07/25 19:40:07 freetz - 2.3.90, bumped evo BRs/Rs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20.2.1&r2=1.20.2.2&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: evolution-webcal-2.4.0.tar.bz2 Message-ID: <15275.1124729971@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/evolution-webcal-2.4.0.tar.bz2 3a09711675d82075f007e565a0277185 evolution-webcal-2.4.0.tar.bz2 Size: 147170 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:06:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: gdm.spec - version 2.8.0.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:06:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.8.0.3 ---- Files affected: SPECS: gdm.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: SPECS/gdm.spec diff -u SPECS/gdm.spec:1.165 SPECS/gdm.spec:1.166 --- SPECS/gdm.spec:1.165 Tue Aug 9 15:57:53 2005 +++ SPECS/gdm.spec Mon Aug 22 19:05:56 2005 @@ -15,13 +15,13 @@ Summary(ru): ?????????? ???????? GNOME Summary(uk): ?????????? ???????? GNOME Name: gdm -Version: 2.8.0.2 +Version: 2.8.0.3 Release: 0.1 Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 738287f41471194b1b770a145590dc44 +# Source0-md5: e5fc040850ae90c456716d3dd6493f27 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}-pld-logo.png @@ -263,7 +263,7 @@ %{_pixmapsdir}/* %{_desktopdir}/gdmsetup.desktop %{_desktopdir}/gdmflexiserver.desktop -%{_datadir}/gnome/capplets/* +%{_desktopdir}/gdmphotosetup.desktop %{_datadir}/gdm #%%{_datadir}/xsessions - moved to gnome-session %{_datadir}/xsessions/default.desktop @@ -288,6 +288,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166 2005/08/22 17:05:56 aflinta +- version 2.8.0.3 + Revision 1.165 2005/08/09 13:57:53 aflinta - up to version 2.8.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.165&r2=1.166&f=u From aflinta at pld-linux.org Mon Aug 22 19:06:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: gdm-2.8.0.3.tar.bz2 gdm-storky.tar.gz Message-ID: <19193.1124730366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/gdm-2.8.0.3.tar.bz2 e5fc040850ae90c456716d3dd6493f27 gdm-2.8.0.3.tar.bz2 Size: 3920359 bytes ALREADY GOT: no-url://gdm-storky.tar.gz e293fbe4a60004056f6894463b874ae8 gdm-storky.tar.gz -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:12:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): gnome-games.spec - up to version 2.11.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:12:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.11.5 ---- Files affected: SPECS: gnome-games.spec (1.159.2.4 -> 1.159.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-games.spec diff -u SPECS/gnome-games.spec:1.159.2.4 SPECS/gnome-games.spec:1.159.2.5 --- SPECS/gnome-games.spec:1.159.2.4 Thu Aug 18 00:57:49 2005 +++ SPECS/gnome-games.spec Mon Aug 22 19:11:54 2005 @@ -7,13 +7,13 @@ Summary(uk): ???? ??? GNOME Summary(wa): Djeus po GNOME Name: gnome-games -Version: 2.11.4 -Release: 2 +Version: 2.11.5 +Release: 1 Epoch: 1 License: LGPL Group: X11/Applications/Games Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a1918551b282a04d74d4950955a433f0 +# Source0-md5: 7e55c2cce68886b48b81a513175956cb Patch0: %{name}-schemas.patch Patch1: %{name}-include.patch Patch2: %{name}-desktop.patch @@ -822,6 +822,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.159.2.5 2005/08/22 17:11:54 aflinta +- up to version 2.11.5 + Revision 1.159.2.4 2005/08/17 22:57:49 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-games.spec?r1=1.159.2.4&r2=1.159.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:12:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: gnome-games-2.11.5.tar.bz2 Message-ID: <22838.1124730726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/gnome-games-2.11.5.tar.bz2 7e55c2cce68886b48b81a513175956cb gnome-games-2.11.5.tar.bz2 Size: 4967289 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: libwnck-2.11.92.tar.bz2 Message-ID: <25075.1124730926@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/libwnck-2.11.92.tar.bz2 a21bde983e63bd3f12b44484b39c13e6 libwnck-2.11.92.tar.bz2 Size: 428692 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): libwnck.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:15:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: libwnck.spec (1.46.2.3 -> 1.46.2.4) ---- Diffs: ================================================================ Index: SPECS/libwnck.spec diff -u SPECS/libwnck.spec:1.46.2.3 SPECS/libwnck.spec:1.46.2.4 --- SPECS/libwnck.spec:1.46.2.3 Sun Aug 21 10:02:06 2005 +++ SPECS/libwnck.spec Mon Aug 22 19:15:19 2005 @@ -2,12 +2,12 @@ Summary: General Window Manager interfacing for GNOME utilities Summary(pl): Interfejs General Window Manager dla narz?dzi GNOME Name: libwnck -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 930daefe4d6bc2fce9426b0a594e1b0e +# Source0-md5: a21bde983e63bd3f12b44484b39c13e6 BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk+2-devel >= 2:2.8.0 @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.4 2005/08/22 17:15:19 aflinta +- version 2.11.92 + Revision 1.46.2.3 2005/08/21 08:02:06 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libwnck.spec?r1=1.46.2.3&r2=1.46.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 19:18:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): GConf2.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:18:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: GConf2.spec (1.91.2.4 -> 1.91.2.5) ---- Diffs: ================================================================ Index: SPECS/GConf2.spec diff -u SPECS/GConf2.spec:1.91.2.4 SPECS/GConf2.spec:1.91.2.5 --- SPECS/GConf2.spec:1.91.2.4 Wed Aug 17 23:12:34 2005 +++ SPECS/GConf2.spec Mon Aug 22 19:18:53 2005 @@ -11,12 +11,12 @@ Summary(pt_BR): Sistema de Configura??o do GNOME 2 Summary(ru): ??????? ???????????? GNOME 2 Name: GConf2 -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-%{version}.tar.bz2 -# Source0-md5: a36b17b2d5c58db36b17e826de0e0f25 +# Source0-md5: e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 Patch0: %{name}-NO_MAJOR_VERSION.patch Patch1: %{name}-path.patch URL: http://www.gnome.org/ @@ -165,6 +165,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91.2.5 2005/08/22 17:18:53 aflinta +- version 2.11.92 + Revision 1.91.2.4 2005/08/17 21:12:34 aflinta - rebuild with new cairo, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.91.2.4&r2=1.91.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:19:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: GConf-2.11.92.tar.bz2 Message-ID: <27037.1124731141@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-2.11.92.tar.bz2 e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 GConf-2.11.92.tar.bz2 Size: 1891439 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:21:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: MayaVi.spec - fixed License field - added %doc, missing BRs... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:21:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed License field - added %doc, missing BRs and R ---- Files affected: SPECS: MayaVi.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/MayaVi.spec diff -u SPECS/MayaVi.spec:1.11 SPECS/MayaVi.spec:1.12 --- SPECS/MayaVi.spec:1.11 Tue Jun 29 12:55:03 2004 +++ SPECS/MayaVi.spec Mon Aug 22 19:21:05 2005 @@ -4,11 +4,14 @@ Name: MayaVi Version: 1.3 Release: 1 -License: GPL +License: BSD Group: Applications/Graphics Source0: http://dl.sourceforge.net/mayavi/%{name}-%{version}.tar.gz # Source0-md5: 38ae9dbe09a6bdb35289d8d6d98c65ba URL: http://mayavi.sourceforge.net/ +BuildRequires: python +BuildRequires: python-devel +Requires: python-tkinter BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,6 +42,7 @@ %files %defattr(644,root,root,755) +%doc doc/guide/*.html doc/CREDITS.txt doc/NEWS.txt doc/README.txt doc/TODO.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/mayavi %{py_sitescriptdir}/vtkPipeline @@ -49,6 +53,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 17:21:05 darekr +- fixed License field +- added %doc, missing BRs and R + Revision 1.11 2004/06/29 10:55:03 qboosh - use proper py macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/MayaVi.spec?r1=1.11&r2=1.12&f=u From undefine at pld-linux.org Mon Aug 22 19:35:19 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: getdp.spec - up to 1.1.0 In-Reply-To: References: Message-ID: Author: undefine Date: Mon Aug 22 17:35:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.1.0 ---- Files affected: SPECS: getdp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.4 SPECS/getdp.spec:1.5 --- SPECS/getdp.spec:1.4 Wed Jun 1 13:05:41 2005 +++ SPECS/getdp.spec Mon Aug 22 19:35:13 2005 @@ -2,12 +2,12 @@ Summary: A General environment for the treatment of Discrete Problems Summary(pl): ?rodowisko do rozwi?zywania problem?w dyskretnych Name: getdp -Version: 1.0.1 +Version: 1.1.0 Release: 1 License: GPL Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz -# Source0-md5: 5ed9b143d2205a7bbe5a13c91065593c +# Source0-md5: cceb5f66c3d2889048fd5f35d178171e URL: http://www.geuz.org/getdp/ BuildRequires: gcc-g77 BuildRequires: gsl-devel @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 17:35:13 undefine +- up to 1.1.0 + Revision 1.4 2005/06/01 11:05:41 zbyniu - BR: texinfo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.4&r2=1.5&f=u From undefine at pld-linux.org Mon Aug 22 19:35:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: getdp-1.1.0-source.tgz Message-ID: <6658.1124732123@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geuz.org/getdp/src/getdp-1.1.0-source.tgz cceb5f66c3d2889048fd5f35d178171e getdp-1.1.0-source.tgz Size: 1426981 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:37:47 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: alien.spec - updated to 8.56 In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 8.56 ---- Files affected: SPECS: alien.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/alien.spec diff -u SPECS/alien.spec:1.61 SPECS/alien.spec:1.62 --- SPECS/alien.spec:1.61 Mon Jun 27 02:35:00 2005 +++ SPECS/alien.spec Mon Aug 22 19:37:41 2005 @@ -3,12 +3,12 @@ Summary: Pakages converter (tgz, rpm, deb, slp) Summary(pl): Konwerter pakiet?w (tgz, rpm, deb, slp) Name: alien -Version: 8.53 +Version: 8.56 Release: 1 License: GPL Group: Applications/System Source0: http://kitenet.net/programs/alien/%{name}_%{version}.tar.gz -# Source0-md5: 48ace120b3f3810e0d2d005b6f8b0512 +# Source0-md5: a6b1f6278ab819635e65b0836186c777 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 44f9b3381776077447bbdb8c64d3f215 Patch0: %{name}-DESTDIR.patch @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/22 17:37:41 darekr +- updated to 8.56 + Revision 1.61 2005/06/27 00:35:00 undefine - up to 8.53 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/alien.spec?r1=1.61&r2=1.62&f=u From darekr at pld-linux.org Mon Aug 22 19:37:48 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: alien_8.56.tar.gz alien-non-english-man-pages.tar.bz2 Message-ID: <8173.1124732268@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kitenet.net/programs/alien/alien_8.56.tar.gz a6b1f6278ab819635e65b0836186c777 alien_8.56.tar.gz Size: 73618 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/alien-non-english-man-pages.tar.bz2 44f9b3381776077447bbdb8c64d3f215 alien-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:42:25 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: getdp.spec - kill setting perms in %install In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill setting perms in %install ---- Files affected: SPECS: getdp.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.5 SPECS/getdp.spec:1.6 --- SPECS/getdp.spec:1.5 Mon Aug 22 19:35:13 2005 +++ SPECS/getdp.spec Mon Aug 22 19:42:20 2005 @@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_infodir}} -install -m 755 bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp +install bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp install doc/getdp.1 $RPM_BUILD_ROOT%{_mandir}/man1 install doc/texinfo/getdp.info* $RPM_BUILD_ROOT%{_infodir} @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 17:42:20 darekr +- kill setting perms in %install + Revision 1.5 2005/08/22 17:35:13 undefine - up to 1.1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.5&r2=1.6&f=u From wolf at pld-linux.org Mon Aug 22 19:50:39 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: dotnet-gecko-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 17:50:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14 SPECS/dotnet-gecko-sharp.spec:1.15 --- SPECS/dotnet-gecko-sharp.spec:1.14 Tue May 3 23:15:27 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 19:50:34 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -92,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 17:50:34 wolf +- mono auto deps + Revision 1.14 2005/05/03 21:15:27 qboosh - build on alpha, revised deps, fix webshot if only mint is available; release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Mon Aug 22 19:56:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: lat.spec - up to 0.7 In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 17:56:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7 ---- Files affected: SPECS: lat.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/lat.spec diff -u SPECS/lat.spec:1.8 SPECS/lat.spec:1.9 --- SPECS/lat.spec:1.8 Mon Aug 1 17:40:11 2005 +++ SPECS/lat.spec Mon Aug 22 19:56:16 2005 @@ -2,12 +2,12 @@ Summary: LAT - LDAP Administration Tool Summary(pl): LAT - narz?dzie administracyjne dla LDAP Name: lat -Version: 0.6.1 +Version: 0.7 Release: 0.1 License: GPL v2 Group: Applications/Networking Source0: http://people.mmgsecurity.com/~lorenb/lat/releases/%{name}-%{version}.tar.gz -# Source0-md5: 59eb63b1cd8273822eca1198b3fcbff6 +# Source0-md5: cb9c01a20bf58bb8e6396f54a148f4e8 Source1: %{name}.png Patch0: %{name}-scrollkeeper_dir.patch Patch1: %{name}-desktop.patch @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 17:56:16 twittner +- up to 0.7 + Revision 1.8 2005/08/01 15:40:11 twittner - up to 0.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lat.spec?r1=1.8&r2=1.9&f=u From twittner at pld-linux.org Mon Aug 22 19:56:36 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: lat-0.7.tar.gz Message-ID: <19981.1124733396@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.mmgsecurity.com/~lorenb/lat/releases/lat-0.7.tar.gz cb9c01a20bf58bb8e6396f54a148f4e8 lat-0.7.tar.gz Size: 591415 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 20:01:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: getdp.spec - proper License, added README to %doc In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 18:01:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License, added README to %doc ---- Files affected: SPECS: getdp.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.6 SPECS/getdp.spec:1.7 --- SPECS/getdp.spec:1.6 Mon Aug 22 19:42:20 2005 +++ SPECS/getdp.spec Mon Aug 22 20:01:16 2005 @@ -4,7 +4,7 @@ Name: getdp Version: 1.1.0 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz # Source0-md5: cceb5f66c3d2889048fd5f35d178171e @@ -63,7 +63,7 @@ %files %defattr(644,root,root,755) -%doc doc/VERSIONS doc/FAQ doc/CREDITS demos +%doc doc/VERSIONS doc/FAQ doc/CREDITS demos README %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_infodir}/%{name}* @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 18:01:16 darekr +- proper License, added README to %doc + Revision 1.6 2005/08/22 17:42:20 darekr - kill setting perms in %install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Mon Aug 22 20:19:05 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: nx.spec - typo In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 18:19:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: nx.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/nx.spec diff -u SPECS/nx.spec:1.3 SPECS/nx.spec:1.4 --- SPECS/nx.spec:1.3 Sat Nov 20 14:21:30 2004 +++ SPECS/nx.spec Mon Aug 22 20:18:59 2005 @@ -44,7 +44,7 @@ dialup links or anything better. %description -l pl -NoMachine NX to schemat kompresji dla X nowej generacji. Dziala na +NoMachine NX to schemat kompresji dla X nowej generacji. Dzia?a na zdalnych sesjach X11 nawet przy pr?dkosci 56k albo wi?kszej. %prep @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/22 18:18:59 twittner +- typo + Revision 1.3 2004/11/20 13:21:30 qboosh - adjusted build for clean to work, fixed dups in files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.3&r2=1.4&f=u From wolf at pld-linux.org Mon Aug 22 20:28:57 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): dotnet-gecko-sharp.spec - mono auto deps - monodoc ... In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:28:57 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps - monodoc documentation ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14.2.4 -> 1.14.2.5) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14.2.4 SPECS/dotnet-gecko-sharp.spec:1.14.2.5 --- SPECS/dotnet-gecko-sharp.spec:1.14.2.4 Sun Jun 19 18:35:07 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 20:28:51 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -13,14 +14,13 @@ URL: http://www.mono-project.com/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.3 BuildRequires: mono-csharp >= 1.1.0 BuildRequires: gtk+2-devel >= 2.0.0 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildConflicts: gecko-sharp < 0.2 Requires: mozilla-embedded -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: dotnet-gecko Provides: gecko-sharp = %{version} Obsoletes: dotnet-gecko @@ -92,6 +92,7 @@ %files devel %defattr(644,root,root,755) %{_pkgconfigdir}/* +%{_libdir}/monodoc/sources/* /usr/lib/mono/gecko-sharp-2.0 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -100,6 +101,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14.2.5 2005/08/22 18:28:51 wolf +- mono auto deps +- monodoc documentation + Revision 1.14.2.4 2005/06/19 16:35:07 prism - fixed install (mv failed because a destination was the same as a source) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14.2.4&r2=1.14.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:41 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: horde-passwd.spec - updated to 3.0-beta which works with ho... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:32:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0-beta which works with horde 3.x series ---- Files affected: SPECS: horde-passwd.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.11 SPECS/horde-passwd.spec:1.12 --- SPECS/horde-passwd.spec:1.11 Sun May 29 14:39:38 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:32:36 2005 @@ -4,19 +4,19 @@ Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd -Version: 2.2.2 +Version: 3.0 Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: http://ftp.horde.org/pub/passwd/passwd-%{version}.tar.gz -# Source0-md5: d1c63a16c67e302c9e4885c1386d638e +Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 PreReq: apache Requires(post): grep -Requires: horde < 3.0 +Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch @@ -38,16 +38,16 @@ modu?. %prep -%setup -q -n passwd-%{version} +%setup -q -n passwd-h3-%{version}-beta %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{graphics,lib,locale,templates,scripts} +install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} install -d $RPM_BUILD_ROOT%{confdir}/passwd cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/graphics +cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates @@ -106,7 +106,7 @@ %doc README docs/* %dir %{hordedir}/passwd %attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/graphics +%attr(750,root,http) %{hordedir}/passwd/themes/graphics %attr(750,root,http) %{hordedir}/passwd/lib %attr(750,root,http) %{hordedir}/passwd/locale %attr(750,root,http) %{hordedir}/passwd/templates @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 18:32:36 paszczus +- updated to 3.0-beta which works with horde 3.x series + Revision 1.11 2005/05/29 12:39:38 paszczus - runs only with horde >= 2.0 but < 3.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.11&r2=1.12&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:55 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: passwd-h3-3.0-beta.tar.gz Message-ID: <10609.1124735575@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/passwd/passwd-h3-3.0-beta.tar.gz 9ea299d2822c9d3ca5efca03ce6a23a4 passwd-h3-3.0-beta.tar.gz Size: 894549 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 20:33:18 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): dotnet-gtksourceview-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:33:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gtksourceview-sharp.spec (1.17.2.7 -> 1.17.2.8) ---- Diffs: ================================================================ Index: SPECS/dotnet-gtksourceview-sharp.spec diff -u SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.8 --- SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 Sun Jul 17 14:11:04 2005 +++ SPECS/dotnet-gtksourceview-sharp.spec Mon Aug 22 20:33:13 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: .NET language bindings for GtkSourceView Summary(pl): Wi?zania GtkSourceView dla .NET Name: dotnet-gtksourceview-sharp @@ -13,15 +14,13 @@ ExcludeArch: alpha BuildRequires: autoconf BuildRequires: automake >= 1:1.7 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 -BuildRequires: dotnet-gtk-sharp-gnome-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-gnome-devel >= 1.9.3 BuildRequires: gtksourceview-devel >= 1.0.1 BuildRequires: libtool BuildRequires: monodoc >= 0.16 BuildRequires: mono-csharp >= 1.1.6 BuildRequires: pkgconfig Requires: gtksourceview >= 1.0.1 -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: gtksourceview-sharp Obsoletes: gtksourceview-sharp Provides: dotnet-gtksourceview @@ -105,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17.2.8 2005/08/22 18:33:13 wolf +- mono auto deps + Revision 1.17.2.7 2005/07/17 12:11:04 deejay1 - BR: dotnet-gtk-sharp-gnome-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gtksourceview-sharp.spec?r1=1.17.2.7&r2=1.17.2.8&f=u From paszczus at pld-linux.org Mon Aug 22 20:37:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: horde-passwd.spec - added _noautoreq In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq ---- Files affected: SPECS: horde-passwd.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.12 SPECS/horde-passwd.spec:1.13 --- SPECS/horde-passwd.spec:1.12 Mon Aug 22 20:32:36 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:37:53 2005 @@ -22,6 +22,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' + %define apachedir /etc/httpd %define hordedir /usr/share/horde %define confdir /etc/horde.org @@ -124,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 18:37:53 paszczus +- added _noautoreq + Revision 1.12 2005/08/22 18:32:36 paszczus - updated to 3.0-beta which works with horde 3.x series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.12&r2=1.13&f=u From wolf at pld-linux.org Mon Aug 22 20:42:30 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: monodevelop.spec - auto mono deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:42:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - auto mono deps ---- Files affected: SPECS: monodevelop.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/monodevelop.spec diff -u SPECS/monodevelop.spec:1.23 SPECS/monodevelop.spec:1.24 --- SPECS/monodevelop.spec:1.23 Wed Jun 29 02:23:21 2005 +++ SPECS/monodevelop.spec Mon Aug 22 20:42:25 2005 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -%define monoversion 1.1.5 +%include /usr/lib/rpm/macros.mono Summary: Mono IDE Summary(pl): IDE dla Mono Name: monodevelop @@ -19,7 +19,7 @@ BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: dotnet-gecko-sharp-devel >= 0.10 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.5 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.5 BuildRequires: dotnet-gtksourceview-sharp-devel >= 0.10 BuildRequires: gettext-devel BuildRequires: intltool @@ -29,12 +29,7 @@ BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildRequires: shared-mime-info -Requires: mono -Requires: monodoc Requires: mozilla-embedded -Requires: dotnet-gtksourceview-sharp -Requires: dotnet-gecko-sharp -Requires: dotnet-gtk-sharp Requires(post,postun): shared-mime-info Obsoletes: MonoDevelop ExcludeArch: alpha @@ -136,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/22 18:42:25 wolf +- auto mono deps + Revision 1.23 2005/06/29 00:23:21 charles - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monodevelop.spec?r1=1.23&r2=1.24&f=u From arekm at pld-linux.org Mon Aug 22 21:02:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: digikam.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:02:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikam.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.41 SPECS/digikam.spec:1.42 --- SPECS/digikam.spec:1.41 Mon Jul 18 13:15:53 2005 +++ SPECS/digikam.spec Mon Aug 22 21:01:58 2005 @@ -2,12 +2,12 @@ Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.3 +Version: 0.7.4 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 19a2b479ea16ce4a227e04215f885780 +# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -105,6 +105,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la +%{_includedir}/*.h %{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -113,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/22 19:01:58 arekm +- up to 0.7.4 + Revision 1.41 2005/07/18 11:15:53 charles - updated to 0.7.3 - updated build section, added --all-name to find_lang ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Mon Aug 22 21:02:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: digikam-0.7.4.tar.bz2 Message-ID: <683.1124737335@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikam-0.7.4.tar.bz2 3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 Size: 2322119 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:03:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: horde-passwd.spec - convert to horde 3.x style In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:03:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - convert to horde 3.x style ---- Files affected: SPECS: horde-passwd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.13 SPECS/horde-passwd.spec:1.14 --- SPECS/horde-passwd.spec:1.13 Mon Aug 22 20:37:53 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:03:39 2005 @@ -1,11 +1,12 @@ # $Revision$, $Date$ # +%define _hordeapp passwd %include /usr/lib/rpm/macros.php Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.1 +Release: 0.4 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -13,20 +14,23 @@ # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ +BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 -PreReq: apache -Requires(post): grep +Requires: apache >= 1.3.33-2 +Requires: apache(mod_access) Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +# horde accesses it directly in help->about +%define _noautocompressdoc CREDITS +%define _noautoreq 'pear(Horde/.*)' -%define apachedir /etc/httpd %define hordedir /usr/share/horde -%define confdir /etc/horde.org +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} %description Passwd is the Horde password changing application. While it has been @@ -42,58 +46,52 @@ %prep %setup -q -n passwd-h3-%{version}-beta +# considered harmful (horde/docs/SECURITY) +rm -f test.php + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} -install -d $RPM_BUILD_ROOT%{confdir}/passwd +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ + $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} + +cp -pR *.php $RPM_BUILD_ROOT%{_appdir} +for i in config/*.dist; do + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) +done + +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak + +cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib +cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale +cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates +cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd -cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics -cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib -cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale -cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates -cp -p config/.htaccess $RPM_BUILD_ROOT%{confdir}/passwd -cp -p templates/.htaccess $RPM_BUILD_ROOT%{hordedir}/passwd/templates - -ln -fs %{confdir}/passwd $RPM_BUILD_ROOT%{hordedir}/passwd/config - -install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir} - -# bit unclean.. -cd $RPM_BUILD_ROOT%{confdir}/passwd -for i in *.dist; do cp $i `basename $i .dist`; done +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %triggerpostun -- horde-passwd <= 2.2-0.1 for i in backends.php conf.php; do @@ -105,20 +103,22 @@ %files %defattr(644,root,root,755) -%doc README docs/* -%dir %{hordedir}/passwd -%attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/themes/graphics -%attr(750,root,http) %{hordedir}/passwd/lib -%attr(750,root,http) %{hordedir}/passwd/locale -%attr(750,root,http) %{hordedir}/passwd/templates - -%attr(750,root,http) %dir %{confdir}/passwd -%{hordedir}/passwd/config -%attr(640,root,http) %{confdir}/passwd/*.dist -%attr(640,root,http) %{confdir}/passwd/.htaccess -%attr(640,root,http) %config(noreplace) %{confdir}/passwd/*.php -%attr(640,root,http) %{apachedir}/%{name}.conf +%doc README docs/* scripts +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml + +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/config +%{_appdir}/docs +%{_appdir}/lib +%{_appdir}/locale +%{_appdir}/templates +%{_appdir}/themes %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/22 19:03:39 glen +- convert to horde 3.x style + Revision 1.13 2005/08/22 18:37:53 paszczus - added _noautoreq ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.13&r2=1.14&f=u From paszczus at pld-linux.org Mon Aug 22 21:10:24 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <6908.1124737824@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz de81a870fda572fe1d4d81db8c31f41f imp-FRAMEWORK_3-2005-08-22.tar.gz Size: 3307364 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 21:10:06 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): imp.spec - updated to 2005-08-22 snap ; removed TODO In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 19:10:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-22 snap ; removed TODO ---- Files affected: SPECS: imp.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.2 SPECS/imp.spec:1.81.2.3 --- SPECS/imp.spec:1.81.2.2 Thu Jul 21 00:07:56 2005 +++ SPECS/imp.spec Mon Aug 22 21:10:00 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# TODO -# - imap login broken, see http://bugs.horde.org/ticket/?id=1937 -%define _snap 2005-05-21 +%define _snap 2005-08-22 %include /usr/lib/rpm/macros.php Summary: Web Based IMAP Mail Program @@ -14,13 +12,8 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW -%if 0%{?_snap} Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: 15e787abce02eaafeb4fab78aa653e02 -%else -Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz -# Source0-md5: 42e7232663f65c2edf5e5bb8c85e84f9 -%endif +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -164,6 +157,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/22 19:10:00 paszczus +- updated to 2005-08-22 snap ; removed TODO + Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From arekm at pld-linux.org Mon Aug 22 21:13:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: digikamimageplugins.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:13:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikamimageplugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.5 SPECS/digikamimageplugins.spec:1.6 --- SPECS/digikamimageplugins.spec:1.5 Mon May 23 17:25:47 2005 +++ SPECS/digikamimageplugins.spec Mon Aug 22 21:13:06 2005 @@ -2,12 +2,12 @@ Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.2 -Release: 0.1 +Version: 0.7.4 +Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: ff3d2da71168b7e2f166b450fe8053e2 +# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -51,7 +51,8 @@ %setup -q %build -%configure +%configure \ + --with-qt-libraries=%{_libdir} %{__make} %install @@ -82,6 +83,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 19:13:06 arekm +- up to 0.7.4 + Revision 1.5 2005/05/23 15:25:47 darekr - 1.129 macros for _kdedocdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.5&r2=1.6&f=u From arekm at pld-linux.org Mon Aug 22 21:13:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: digikamimageplugins-0.7.4.tar.bz2 Message-ID: <8804.1124737994@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikamimageplugins-0.7.4.tar.bz2 5ea3c0dd6e6f1eb99211e75d0bf17d3d digikamimageplugins-0.7.4.tar.bz2 Size: 2341192 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 21:13:38 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS: f-spot.spec - remove manual requires In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 19:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - remove manual requires ---- Files affected: SPECS: f-spot.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.17 SPECS/f-spot.spec:1.18 --- SPECS/f-spot.spec:1.17 Mon Aug 22 17:07:47 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:13:33 2005 @@ -24,8 +24,6 @@ BuildRequires: mono-csharp >= 1.0 BuildRequires: sqlite-devel >= 2.8.6 BuildRequires: pkgconfig -Requires: dotnet-gtk-sharp2 >= 2.3.90 -Requires: mono >= 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -79,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/22 19:13:33 wolf +- remove manual requires + Revision 1.17 2005/08/22 15:07:47 wolf - mono auto deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.17&r2=1.18&f=u From aflinta at pld-linux.org Mon Aug 22 21:21:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: gnome-desktop-2.11.92.tar.bz2 pld-logo.svg Message-ID: <14995.1124738485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/gnome-desktop-2.11.92.tar.bz2 1addb9e2b94d9df9b6463643419c53ba gnome-desktop-2.11.92.tar.bz2 Size: 1035085 bytes ALREADY GOT: no-url://pld-logo.svg 9fda4ca70a6e8e82e8e5bebe0e28db74 pld-logo.svg -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:21:20 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): gnome-desktop.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:21:20 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-desktop.spec (1.83.2.4 -> 1.83.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-desktop.spec diff -u SPECS/gnome-desktop.spec:1.83.2.4 SPECS/gnome-desktop.spec:1.83.2.5 --- SPECS/gnome-desktop.spec:1.83.2.4 Wed Aug 17 22:37:59 2005 +++ SPECS/gnome-desktop.spec Mon Aug 22 21:21:13 2005 @@ -2,12 +2,12 @@ Summary: The core programs for the GNOME2 GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME2 Name: gnome-desktop -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 704d14f959ab6a9186f45d27bb83e4b7 +# Source0-md5: 1addb9e2b94d9df9b6463643419c53ba Source1: pld-logo.svg # Source1-md5: 9fda4ca70a6e8e82e8e5bebe0e28db74 Patch0: %{name}-crystalsvg.patch @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83.2.5 2005/08/22 19:21:13 aflinta +- version 2.11.92 + Revision 1.83.2.4 2005/08/17 20:37:59 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-desktop.spec?r1=1.83.2.4&r2=1.83.2.5&f=u From glen at pld-linux.org Mon Aug 22 21:24:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): imp.spec - fix broken trigger In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:24:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix broken trigger ---- Files affected: SPECS: imp.spec (1.81.2.3 -> 1.81.2.4) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.3 SPECS/imp.spec:1.81.2.4 --- SPECS/imp.spec:1.81.2.3 Mon Aug 22 21:10:00 2005 +++ SPECS/imp.spec Mon Aug 22 21:24:39 2005 @@ -12,8 +12,9 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW +#Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: de81a870fda572fe1d4d81db8c31f41f +# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -69,7 +70,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} @@ -122,9 +123,9 @@ done %triggerpostun -- imp <= 4.0.2-1 -if [ -f %{_apache2dir}/imp.conf.rpmsave ]; then +if [ -f /etc/httpd/imp.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi if [ -f /var/lock/subsys/httpd ]; then @@ -157,8 +158,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.4 2005/08/22 19:24:39 glen +- fix broken trigger + Revision 1.81.2.3 2005/08/22 19:10:00 paszczus -- updated to 2005-08-22 snap ; removed TODO +- updated to 2005-08-22 snap; removed TODO Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.3&r2=1.81.2.4&f=u From glen at pld-linux.org Mon Aug 22 21:25:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: ERRORS: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <17040.1124738708@distfiles.pld-linux.org> FATAL: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz md5 mismatch, needed c222e646c31afe0f3d7934880aa1aa0c, got de81a870fda572fe1d4d81db8c31f41f Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:25:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): imp.spec - fixed md5 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:25:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed md5 ---- Files affected: SPECS: imp.spec (1.81.2.4 -> 1.81.2.5) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.4 SPECS/imp.spec:1.81.2.5 --- SPECS/imp.spec:1.81.2.4 Mon Aug 22 21:24:39 2005 +++ SPECS/imp.spec Mon Aug 22 21:25:45 2005 @@ -14,7 +14,7 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -158,6 +158,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.5 2005/08/22 19:25:45 glen +- fixed md5 + Revision 1.81.2.4 2005/08/22 19:24:39 glen - fix broken trigger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.4&r2=1.81.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 21:28:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: gnome-netstatus-2.11.92.tar.bz2 Message-ID: <20208.1124738935@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/gnome-netstatus-2.11.92.tar.bz2 3dcd5a260b74f0ec8cdbd09578011f0c gnome-netstatus-2.11.92.tar.bz2 Size: 467494 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:28:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:28:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.3 -> 1.20.2.4) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.3 SPECS/gnome-netstatus.spec:1.20.2.4 --- SPECS/gnome-netstatus.spec:1.20.2.3 Thu Aug 18 12:58:11 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:28:51 2005 @@ -2,12 +2,12 @@ Summary: Applet that displays the network status in a GNOME panel Summary(pl): Aplet wy?wietlaj?cy stan po??cze? sieciowych na panelu GNOME Name: gnome-netstatus -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: eea34fad7531398d68dc880fb343c296 +# Source0-md5: 3dcd5a260b74f0ec8cdbd09578011f0c URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -43,7 +43,8 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.4 2005/08/22 19:28:51 aflinta +- version 2.11.92 + Revision 1.20.2.3 2005/08/18 10:58:11 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.3&r2=1.20.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:32:46 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: DISTFILES: vino-2.11.92.tar.bz2 Message-ID: <22923.1124739166@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/vino-2.11.92.tar.bz2 58047c590714e983e2a3daafb3661c81 vino-2.11.92.tar.bz2 Size: 566304 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:32:32 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): vino.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:32:32 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: vino.spec (1.18.2.3 -> 1.18.2.4) ---- Diffs: ================================================================ Index: SPECS/vino.spec diff -u SPECS/vino.spec:1.18.2.3 SPECS/vino.spec:1.18.2.4 --- SPECS/vino.spec:1.18.2.3 Thu Aug 18 14:07:20 2005 +++ SPECS/vino.spec Mon Aug 22 21:32:19 2005 @@ -2,12 +2,12 @@ Summary: A remote desktop system for GNOME Summary(pl): System zdalnego pulpitu dla GNOME Name: vino -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 78440fe650378c2d6b63ff7174558df3 +# Source0-md5: 58047c590714e983e2a3daafb3661c81 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18.2.4 2005/08/22 19:32:19 aflinta +- version 2.11.92 + Revision 1.18.2.3 2005/08/18 12:07:20 aflinta - rebuild with caito, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vino.spec?r1=1.18.2.3&r2=1.18.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:36:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SOURCES (DEVEL): gnome-menus-pl.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:36:26 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - obsoleted ---- Files affected: SOURCES: gnome-menus-pl.patch (1.1.2.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Mon Aug 22 21:37:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:12 2005 Subject: SPECS (DEVEL): gnome-menus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:37:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-menus.spec (1.24.2.8 -> 1.24.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-menus.spec diff -u SPECS/gnome-menus.spec:1.24.2.8 SPECS/gnome-menus.spec:1.24.2.9 --- SPECS/gnome-menus.spec:1.24.2.8 Tue Aug 9 15:37:41 2005 +++ SPECS/gnome-menus.spec Mon Aug 22 21:37:45 2005 @@ -2,14 +2,13 @@ Summary: Implementation of the draft Desktop Menu Specification Summary(pl): Implementacja specyfikacji menu system?w biurkowych Name: gnome-menus -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 7e90fda926e28dc31043281562a83da4 +# Source0-md5: 75ba6497923b00a2f186f27a135b6800 Patch0: %{name}-PLD.patch -Patch1: %{name}-pl.patch URL: http://www.gnome.org/ BuildRequires: autoconf BuildRequires: automake @@ -106,7 +105,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -175,6 +173,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24.2.9 2005/08/22 19:37:45 aflinta +- version 2.11.92 + Revision 1.24.2.8 2005/08/09 13:37:41 aflinta - ups, missing desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-menus.spec?r1=1.24.2.8&r2=1.24.2.9&f=u From aflinta at pld-linux.org Mon Aug 22 21:37:49 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gnome-menus-2.11.92.tar.bz2 Message-ID: <26277.1124739469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/gnome-menus-2.11.92.tar.bz2 75ba6497923b00a2f186f27a135b6800 gnome-menus-2.11.92.tar.bz2 Size: 389415 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Mon Aug 22 21:38:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - rel. 3 for epiphany 1.7.5 In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:38:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - rel. 3 for epiphany 1.7.5 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.5 -> 1.37.2.6) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.5 SPECS/epiphany-extensions.spec:1.37.2.6 --- SPECS/epiphany-extensions.spec:1.37.2.5 Tue Aug 9 16:19:33 2005 +++ SPECS/epiphany-extensions.spec Mon Aug 22 21:38:11 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.4 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -16,7 +16,7 @@ URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.4 +BuildRequires: epiphany-devel >= 1.7.5 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.6 2005/08/22 19:38:11 paladine +- rel. 3 for epiphany 1.7.5 + Revision 1.37.2.5 2005/08/09 14:19:33 paladine - rel. 2 for rebuild with epiphany 1.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.5&r2=1.37.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: f-spot.spec - version 0.1.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:41:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 0.1.1 ---- Files affected: SPECS: f-spot.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.18 SPECS/f-spot.spec:1.19 --- SPECS/f-spot.spec:1.18 Mon Aug 22 21:13:33 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:41:11 2005 @@ -3,12 +3,12 @@ Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot -Version: 0.1.0 -Release: 0.2 +Version: 0.1.1 +Release: 0.1 License: GPL Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/%{name}-%{version}.tar.bz2 -# Source0-md5: f9cab78264a978e025d2af6425ea0ec5 +# Source0-md5: 7f0230dd8fa1e0bc071951c03c6ac375 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/projects/f-spot/ BuildRequires: GConf2-devel @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/22 19:41:11 aflinta +- version 0.1.1 + Revision 1.18 2005/08/22 19:13:33 wolf - remove manual requires ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: f-spot-0.1.1.tar.bz2 Message-ID: <28577.1124739677@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/f-spot-0.1.1.tar.bz2 7f0230dd8fa1e0bc071951c03c6ac375 f-spot-0.1.1.tar.bz2 Size: 792413 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:41:46 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: horde-passwd.spec - set default list of usernames where pas... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:41:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - set default list of usernames where password set is refused based on target machine system users ---- Files affected: SPECS: horde-passwd.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.14 SPECS/horde-passwd.spec:1.15 --- SPECS/horde-passwd.spec:1.14 Mon Aug 22 21:03:39 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:41:41 2005 @@ -6,7 +6,7 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.4 +Release: 0.10 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -16,6 +16,7 @@ URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -81,6 +82,15 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi +# take uids with < 500 and update refused logins in default conf.xml +USERLIST=$(awk -F: '{ if ($3 < 500) print $1 }' < /etc/passwd | xargs | tr ' ' ',') +if [ "$USERLIST" ]; then + sed -i -e " + # primitive xml parser ;) + /configlist name=\"refused\"/s/>.*$USERLIST= 1.3.33-2 %apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf @@ -126,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 19:41:41 glen +- set default list of usernames where password set is refused based on target machine system users + Revision 1.14 2005/08/22 19:03:39 glen - convert to horde 3.x style ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.14&r2=1.15&f=u From paladine at pld-linux.org Mon Aug 22 21:49:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - gnome-doc-utils for omf file... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:49:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - gnome-doc-utils for omf files - itemize schemas ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.4 -> 1.20.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.4 SPECS/gnome-netstatus.spec:1.20.2.5 --- SPECS/gnome-netstatus.spec:1.20.2.4 Mon Aug 22 21:28:51 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:49:29 2005 @@ -14,6 +14,7 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-panel-devel >= 2.10.0 BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.0 @@ -37,15 +38,14 @@ %setup -q %build +gnome-doc-prepare --copy --force %{__gnome_doc_common} %{__libtoolize} %{__aclocal} %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ - --disable-scrollkeeper - + --disable-schemas-install %{__make} %install @@ -82,7 +82,7 @@ %{_libdir}/bonobo/servers/* %{_omf_dest_dir}/%{name} %{_pixmapsdir}/* -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/netstatus.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -90,6 +90,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.5 2005/08/22 19:49:29 paladine +- gnome-doc-utils for omf files +- itemize schemas + Revision 1.20.2.4 2005/08/22 19:28:51 aflinta - version 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.4&r2=1.20.2.5&f=u From arekm at pld-linux.org Mon Aug 22 22:03:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: tpop3d.spec - rel 16; new cvs patch In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 16; new cvs patch ---- Files affected: SPECS: tpop3d.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/tpop3d.spec diff -u SPECS/tpop3d.spec:1.62 SPECS/tpop3d.spec:1.63 --- SPECS/tpop3d.spec:1.62 Fri Jul 22 01:59:42 2005 +++ SPECS/tpop3d.spec Mon Aug 22 22:03:46 2005 @@ -9,6 +9,7 @@ %bcond_without pgsql # without PostgreSQL support %bcond_without ssl # without ssl support %bcond_without whoson # without WHOSON protocol support +%bcond_without gdbm # without gdbm auth db %bcond_without snide # without snide server responses %bcond_with skipgetpwcheck # with getpwuid returned struct check ommited (see patch for details) # @@ -16,7 +17,7 @@ Summary(pl): Serwer POP3 Name: tpop3d Version: 1.5.3 -Release: 15 +Release: 16 License: GPL Group: Networking/Daemons Source0: http://www.ex-parrot.com/~chris/tpop3d/%{name}-%{version}.tar.gz @@ -25,7 +26,7 @@ Source2: %{name}.init Source3: %{name}.conf Patch0: %{name}-ac_am_fixes.patch -Patch1: %{name}-cvs20041005.patch +Patch1: %{name}-cvs20050822.patch Patch2: %{name}-resolv.patch Patch3: %{name}-pam-vdomain.patch Patch4: %{name}-disable-dotfile-locking.patch @@ -39,6 +40,7 @@ %{?with_pgsql:BuildRequires: postgresql-devel} %{?with_whoson:BuildRequires: whoson-devel} %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +%{?with_gdbm:BuildRequires: gdbm-devel} PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig Requires: pam >= 0.79.0 @@ -136,6 +138,7 @@ %{?with_whoson: --enable-whoson} \ %{?with_perl: --enable-auth-perl} \ %{?with_pgsql: --enable-auth-pgsql} \ +%{?with_gdbm: --enable-gdbm} \ %{?with_authother: --enable-auth-other} \ --enable-mbox-maildir \ %{?with_ssl: --enable-tls} \ @@ -193,6 +196,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/22 20:03:46 arekm +- rel 16; new cvs patch + Revision 1.62 2005/07/21 23:59:42 romke - added bcond skipgetpwcheck - it allows using uids (in {my,pg}sql virtual users) that don't belong to any system user (when getpwuid returns NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tpop3d.spec?r1=1.62&r2=1.63&f=u From arekm at pld-linux.org Mon Aug 22 22:03:42 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES: tpop3d-cvs20050822.patch (NEW), tpop3d-cvs20041005.patch ... In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up cvs patch to 20050822 ---- Files affected: SOURCES: tpop3d-cvs20050822.patch (NONE -> 1.1) (NEW), tpop3d-cvs20041005.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: SOURCES/tpop3d-cvs20050822.patch diff -u /dev/null SOURCES/tpop3d-cvs20050822.patch:1.1 --- /dev/null Mon Aug 22 22:03:42 2005 +++ SOURCES/tpop3d-cvs20050822.patch Mon Aug 22 22:03:37 2005 @@ -0,0 +1,2080 @@ +Index: tpop3d/CHANGES +Index: tpop3d/INSTALL +diff -u tpop3d/INSTALL:1.22 tpop3d/INSTALL:1.24 +--- tpop3d/INSTALL:1.22 Thu Jan 9 23:25:59 2003 ++++ tpop3d/INSTALL Sun May 22 11:54:12 2005 +@@ -1,5 +1,5 @@ + Installation instructions for tpop3d +-$Id$ ++$Id$ + + Thanks to the efforts of Mark Longair, tpop3d can now be configured and built + using the standard GNU autoconf approach. For most users, it should be +@@ -19,7 +19,7 @@ + also review the contents of README.darwin. + + NB that tpop3d now obeys the --sysconfdir of configure, so you will need to +-set --sysconfidr=/etc if you already have a /etc/tpop3d.conf and do not wish to ++set --sysconfdir=/etc if you already have a /etc/tpop3d.conf and do not wish to + move it. + + * Authentication +@@ -56,6 +56,7 @@ + {plaintext}... plain text password used for APOP + {mysql}... password hashed using MySQL's PASSWORD() + {md5}... straight MD5 hash ++ {sha1}... straight SHA1 hash + + Note that to use APOP, the plaintext password type must be specified for + a user, but this does not stop them logging in via any other method with +Index: tpop3d/Makefile.am +diff -u tpop3d/Makefile.am:1.41 tpop3d/Makefile.am:1.42 +--- tpop3d/Makefile.am:1.41 Mon Nov 24 19:58:28 2003 ++++ tpop3d/Makefile.am Fri Aug 5 14:48:22 2005 +@@ -4,12 +4,12 @@ + # + # Copyright (c) 2001 Chris Lightfoot, Mark Longair. All rights reserved. + # +-# $Id$ ++# $Id$ + # + + sbin_PROGRAMS = tpop3d + +-tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c \ ++tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c auth_gdbm.c \ + auth_perl.c auth_pam.c auth_passwd.c auth_flatfile.c \ + authcache.c authswitch.c buffer.c cfgdirectives.c config.c \ + connection.c ioabs_tcp.c ioabs_tls.c listener.c locks.c \ +@@ -21,7 +21,7 @@ + auth_passwd.h auth_flatfile.h auth_pgsql.h authswitch.h \ + buffer.h config.h connection.h listener.h locks.h mailbox.h \ + md5.h password.h pidfile.h signals.h stringmap.h tls.h \ +- tokenise.h vector.h util.h ++ tokenise.h vector.h util.h auth_gdbm.h + + CFLAGS += -Wall -g -O2 -DCONFIG_DIR='"@sysconfdir@"' # -Wstrict-prototypes + +Index: tpop3d/README +diff -u tpop3d/README:1.22 tpop3d/README:1.23 +--- tpop3d/README:1.22 Mon Nov 24 19:59:13 2003 ++++ tpop3d/README Tue Feb 3 19:52:02 2004 +@@ -1,7 +1,7 @@ + tpop3d, copyright (c) 2000-2003 Chris Lightfoot + http://www.ex-parrot.com/~chris/tpop3d/ + +-$Id$ ++$Id$ + + 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 +@@ -23,6 +23,7 @@ + auth-mysql a vmail-sql style MySQL database; see + http://www.ex-parrot.com/~chris/vmail-sql/ + or another database with user-specified SQL queries ++ auth-pgsql a PostgreSQL database + auth-ldap an LDAP directory + auth-flatfile /etc/passwd-style flat files + auth-other an external program +Index: tpop3d/README.auth_mysql +diff -u tpop3d/README.auth_mysql:1.7 tpop3d/README.auth_mysql:1.8 +--- tpop3d/README.auth_mysql:1.7 Wed Nov 7 00:50:41 2001 ++++ tpop3d/README.auth_mysql Wed Sep 29 20:57:59 2004 +@@ -1,5 +1,5 @@ + README for MySQL authentication in tpop3d +-$Id$ ++$Id$ + + The auth-mysql authentication driver was developed for use with the vmail-sql + database schema for virtual domains, though it is easy to adjust for a +@@ -80,6 +80,7 @@ + {crypt_md5}... crypt_md5 hash + {plaintext}... plaintext password + {mysql}... password hashed using MySQL's PASSWORD() ++ {sha1} simple SHA1 password + {md5} or no prefix old-style simple MD5 password + + {crypt} is the format of the system crypt(3) function-- two salt characters +@@ -89,10 +90,11 @@ + in crypt(3), but for portability it is included as a separate case. + {plaintext} is a password saved in plain text; this format is useful if you + want to support authentication by the APOP shared-secret mechanism. {mysql} +- is the format produced by the PASSWORD() function in MySQL. {md5} is a +- simple MD5 hash of the password, without salt, saved as a 32-character hex +- string. This is the historical format for vmail-sql, and so is the default +- if no prefix is used. This may go away at some point. ++ is the format produced by the PASSWORD() function in MySQL. {sha1} is a ++ simple 20-character hex SHA1 hash of the password. {md5} is a simple MD5 ++ hash of the password, without salt, saved as a 32-character hex string or a ++ 24-character base64 one. This is the historical format for vmail-sql, and so ++ is the default if no prefix is used. This may go away at some point. + + Now, we compare the user's password against the stored hash or password, + and decide whether to authenticate the user or not. If this does not +Index: tpop3d/TODO +diff -u tpop3d/TODO:1.46 tpop3d/TODO:1.48 +--- tpop3d/TODO:1.46 Mon Nov 24 19:58:28 2003 ++++ tpop3d/TODO Sun Jun 20 00:06:30 2004 +@@ -1,5 +1,5 @@ + Things To Do +-$Id$ ++$Id$ + + * A proper code audit + +@@ -96,3 +96,18 @@ + + * Latency vs. throughput tradeoff under high load? + ++* Deferred writes in connection_sendmessage -- that should bring the cost of ++ sending messages down to the cost of substituting \r\n for \n, etc. ++ ++* Configurable (or adaptive?) SO_SNDBUF ++ We probably don't have enough information to measure the necessary ++ parameters (though in principle we could measure the delay between sending ++ +OK... and receiving a new command), so just make this a config file option. ++ ++* NTLM authentication ++ ++* STLS+APOP issue (email of 20040306) ++ ++* Repeated messages (email of 20040325) ++ ++* Maildir semantics (email of 20040331) +Index: tpop3d/auth_flatfile.c +diff -u tpop3d/auth_flatfile.c:1.2 tpop3d/auth_flatfile.c:1.3 +--- tpop3d/auth_flatfile.c:1.2 Mon Feb 17 23:18:32 2003 ++++ tpop3d/auth_flatfile.c Sun Jun 20 00:06:30 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_FLATFILE +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include + +@@ -86,7 +86,7 @@ + * second field to the password hash. Any subsequent fields are ignored. */ + static char *read_user_passwd(const char *local_part, const char *domain) { + FILE *fp = NULL; +- char *filename = NULL; ++ char *filename = NULL, *result = NULL; + struct sverr err; + static char *buf, *pwhash; + static size_t buflen; +@@ -149,6 +149,8 @@ + if ((end = strchr(pwhash, ':'))) + *end = 0; + ++ result = pwhash; ++ + break; + } + +@@ -159,7 +161,7 @@ + if (filename) + xfree(filename); + +- return pwhash; ++ return result; + } + + /* auth_flatfile_new_user_pass: +Index: tpop3d/auth_gdbm.c +diff -u /dev/null tpop3d/auth_gdbm.c:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.c Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,196 @@ ++/* ++ * auth_gdbm.c: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include ++ ++#ifdef HAVE_CRYPT_H /* XXX */ ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "auth_gdbm.h" ++#include "authswitch.h" ++#include "password.h" ++#include "config.h" ++#include "util.h" ++ ++static gid_t virtual_gid; ++static uid_t virtual_uid; ++static char *user_passwd_file; ++GDBM_FILE dbf; ++int persistent; ++ ++/* auth_gdbm_init: ++ * Initialise the driver. Reads the config directives. */ ++int auth_gdbm_init() { ++ char *s; ++ ++ /* Obtain uid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-user"))) { ++ if (!parse_uid(s, &virtual_uid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-user directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-user directive in config")); ++ return 0; ++ } ++ ++ /* Obtain gid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-group"))) { ++ if (!parse_gid(s, &virtual_gid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-group directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-group directive in config")); ++ return 0; ++ } ++ ++ /* Obtain path to passwd file */ ++ if ((s = config_get_string("auth-gdbm-passwd-file"))) { ++ user_passwd_file = s; ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-passwd-file directive in config")); ++ return 0; ++ } ++ ++ /* persistent GDBM filehandle? */ ++ if (config_get_bool("auth-gdbm-persistent")) { ++ persistent = 1; ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ } else { ++ persistent = 0; ++ } ++ ++ return 1; ++} ++ ++/* auth_gdbm_new_user_pass: ++ * Attempt to authenticate user and pass using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password(who, value.dptr, pass, "{crypt}")) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++/* auth_gdbm_new_apop: ++ * Attempt to authenticate user via APOP using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password_apop(who, value.dptr, timestamp, digest)) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++void auth_gdbm_postfork() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++void auth_gdbm_close() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++#endif /* AUTH_GDBM */ +Index: tpop3d/auth_gdbm.h +diff -u /dev/null tpop3d/auth_gdbm.h:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.h Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,35 @@ ++/* ++ * auth_gdbm.h: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifndef __AUTH_GDBM_H_ /* include guard */ ++#define __AUTH_GDBM_H_ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include "authswitch.h" ++ ++/* auth_gdbm.c */ ++int auth_gdbm_init(void); ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost, const char *serverhost); ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost, const char *serverhost); ++void auth_gdbm_postfork(void); ++void auth_gdbm_close(void); ++ ++ ++#endif /* AUTH_GDBM */ ++ ++#endif /* __AUTH_GDBM_H_ */ +Index: tpop3d/auth_mysql.c +diff -u tpop3d/auth_mysql.c:1.54 tpop3d/auth_mysql.c:1.56 +--- tpop3d/auth_mysql.c:1.54 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_mysql.c Thu Aug 19 23:57:05 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_MYSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -44,7 +44,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -52,7 +52,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -60,20 +60,20 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + + /* + * Connection to the MySQL server. + */ +-MYSQL *mysql = NULL; +-tokens mysql_servers; +-char mysql_driver_active = 0; ++static MYSQL *mysql = NULL; ++static tokens mysql_servers; ++static char mysql_driver_active = 0; + + /* get_mysql_server: + * If we are not currently connected to a MySQL server, or if the current MySQL +@@ -267,7 +267,7 @@ + + /* User was not lying (about her password) */ + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +@@ -367,7 +367,7 @@ + } + + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +Index: tpop3d/auth_pgsql.c +diff -u tpop3d/auth_pgsql.c:1.1 tpop3d/auth_pgsql.c:1.2 +--- tpop3d/auth_pgsql.c:1.1 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_pgsql.c Thu Aug 19 23:57:05 2004 +@@ -13,7 +13,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_PGSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -105,7 +105,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -113,7 +113,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -121,11 +121,11 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + +@@ -148,7 +148,7 @@ + * Initialise the database connection driver. Clears the config directives + * associated with the database so that a user cannot recover them with a + * debugger. */ +-PGconn *pg_conn; ++static PGconn *pg_conn; + + int auth_pgsql_init(void) { + char *username = NULL, *password = NULL, *hostname = NULL, *database = NULL, *localhost = "localhost", *s; +Index: tpop3d/authswitch.c +diff -u tpop3d/authswitch.c:1.42 tpop3d/authswitch.c:1.45 +--- tpop3d/authswitch.c:1.42 Mon Nov 24 19:58:28 2003 ++++ tpop3d/authswitch.c Fri Aug 5 14:48:22 2005 +@@ -6,7 +6,7 @@ + * + */ + +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #ifdef HAVE_CONFIG_H + #include "configuration.h" +@@ -52,6 +52,10 @@ + #include "auth_passwd.h" + #endif /* AUTH_PASSWD */ + ++#ifdef AUTH_GDBM ++#include "auth_gdbm.h" ++#endif /* AUTH_GDBM */ ++ + #ifdef USE_WHOSON + #include + #endif +@@ -122,6 +126,13 @@ + "flatfile", + _X("Uses /etc/passwd-style flat files")}, + #endif /* AUTH_FLATFILE */ ++ ++#ifdef AUTH_GDBM ++ /* Authenticate against GNU dbm files. */ ++ {auth_gdbm_init, auth_gdbm_new_apop, auth_gdbm_new_user_pass, NULL, auth_gdbm_postfork, auth_gdbm_close, ++ "gdbm", ++ _X("Uses GNU dbm files")}, ++#endif /* AUTH_GDBM */ + }; <> From paladine at pld-linux.org Mon Aug 22 22:17:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gnome-panel.spec - updated to 2.11.92 - removed not... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 20:17:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - removed notification_area_applet patch ---- Files affected: SPECS: gnome-panel.spec (1.166.4.12 -> 1.166.4.13) ---- Diffs: ================================================================ Index: SPECS/gnome-panel.spec diff -u SPECS/gnome-panel.spec:1.166.4.12 SPECS/gnome-panel.spec:1.166.4.13 --- SPECS/gnome-panel.spec:1.166.4.12 Wed Aug 17 23:51:38 2005 +++ SPECS/gnome-panel.spec Mon Aug 22 22:17:30 2005 @@ -2,16 +2,15 @@ Summary: The core programs for the GNOME GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME Name: gnome-panel -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 6b44787f4970f10c42e031176aa65da7 +# Source0-md5: 595c10d159deb0ff3126e8b9793d7013 Patch0: %{name}-finalize-memleak.patch -Patch1: %{name}-notification_area_applet.patch -Patch2: %{name}-no_mixer_applet.patch -Patch3: %{name}-no_launchers_on_panel.patch +Patch1: %{name}-no_mixer_applet.patch +Patch2: %{name}-no_launchers_on_panel.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -111,7 +110,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build gnome-doc-prepare --copy --force @@ -244,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166.4.13 2005/08/22 20:17:30 paladine +- updated to 2.11.92 +- removed notification_area_applet patch + Revision 1.166.4.12 2005/08/17 21:51:38 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.166.4.12&r2=1.166.4.13&f=u From paladine at pld-linux.org Mon Aug 22 22:17:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gnome-panel-2.11.92.tar.bz2 Message-ID: <21172.1124741863@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-2.11.92.tar.bz2 595c10d159deb0ff3126e8b9793d7013 gnome-panel-2.11.92.tar.bz2 Size: 2411526 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:22:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): file-roller.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:22:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: file-roller.spec (1.69.2.5 -> 1.69.2.6) ---- Diffs: ================================================================ Index: SPECS/file-roller.spec diff -u SPECS/file-roller.spec:1.69.2.5 SPECS/file-roller.spec:1.69.2.6 --- SPECS/file-roller.spec:1.69.2.5 Thu Aug 18 11:35:22 2005 +++ SPECS/file-roller.spec Mon Aug 22 22:21:59 2005 @@ -3,12 +3,12 @@ Summary(pl): Zarz?dca archiw?w dla GNOME Summary(pt_BR): Gerenciador de arquivos compactados para o GNOME Name: file-roller -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 17a7d83aad34f02bd0528c620b22f633 +# Source0-md5: 7fa299e6c4d4498cc3d00ba76bd17f8b Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.69.2.6 2005/08/22 20:21:59 aflinta +- 2.11.92 + Revision 1.69.2.5 2005/08/18 09:35:22 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file-roller.spec?r1=1.69.2.5&r2=1.69.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:22:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: file-roller-2.11.92.tar.bz2 Message-ID: <26498.1124742132@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/file-roller-2.11.92.tar.bz2 7fa299e6c4d4498cc3d00ba76bd17f8b file-roller-2.11.92.tar.bz2 Size: 1219994 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 22:22:25 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: rlocate.spec - fixed md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:22:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: rlocate.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.28 SPECS/rlocate.spec:1.29 --- SPECS/rlocate.spec:1.28 Mon Aug 22 16:50:29 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:22:20 2005 @@ -25,7 +25,7 @@ License: GPL Group: Base Source0: http://dl.sourceforge.net/rlocate/%{name}-%{version}.tar.gz -# Source0-md5: d65e350fe83480cc1db40912a0dfa87b +# Source0-md5: e3c8371a6659bf1e0d9d1fe02c0efe6d Patch0: %{name}-build.patch URL: http://rlocate.sourceforge.net/ BuildRequires: autoconf @@ -255,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/22 20:22:20 paszczus +- fixed md5 + Revision 1.28 2005/08/22 14:50:29 paszczus - added init script (temporary from redhat) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.28&r2=1.29&f=u From paszczus at pld-linux.org Mon Aug 22 22:22:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <26917.1124742146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz Size: 191217 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:27:23 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gtkhtml.spec - version 3.7.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:27:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 3.7.7 ---- Files affected: SPECS: gtkhtml.spec (1.130.2.5 -> 1.130.2.6) ---- Diffs: ================================================================ Index: SPECS/gtkhtml.spec diff -u SPECS/gtkhtml.spec:1.130.2.5 SPECS/gtkhtml.spec:1.130.2.6 --- SPECS/gtkhtml.spec:1.130.2.5 Sun Aug 21 10:50:25 2005 +++ SPECS/gtkhtml.spec Mon Aug 22 22:27:18 2005 @@ -6,12 +6,12 @@ Summary(uk): GtkHTML - ?? ?????????? ??????????/??????????? HTML Summary(zh_CN): gtkhtml ?? Name: gtkhtml -Version: 3.7.6 -Release: 2 +Version: 3.7.7 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/%{name}-%{version}.tar.bz2 -# Source0-md5: fd9b3d048a5c94a1af0de78fe0bf7d77 +# Source0-md5: acfa34618f43b425b6208c09dffd2386 Patch0: %{name}-pixmap.patch Patch1: %{name}-link.patch Patch2: %{name}-crash.patch @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.130.2.6 2005/08/22 20:27:18 aflinta +- version 3.7.7 + Revision 1.130.2.5 2005/08/21 08:50:25 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtkhtml.spec?r1=1.130.2.5&r2=1.130.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:27:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gtkhtml-3.7.7.tar.bz2 Message-ID: <30410.1124742445@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/gtkhtml-3.7.7.tar.bz2 acfa34618f43b425b6208c09dffd2386 gtkhtml-3.7.7.tar.bz2 Size: 1518722 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: libsoup-2.2.6.tar.bz2 Message-ID: <32053.1124742571@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.tar.bz2 2b16657c52e690933ddb250d351fba3c libsoup-2.2.6.tar.bz2 Size: 430471 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: libsoup.spec - version 2.2.6 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:29:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.2.6 ---- Files affected: SPECS: libsoup.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.43 SPECS/libsoup.spec:1.44 --- SPECS/libsoup.spec:1.43 Thu Aug 4 16:41:42 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:29:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.5 +Version: 2.2.6 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 50ba7189fe1f645b48f4ddc509d4dec4 +# Source0-md5: 2b16657c52e690933ddb250d351fba3c URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/22 20:29:27 aflinta +- version 2.2.6 + Revision 1.43 2005/08/04 14:41:42 aflinta - up to version 2.2.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.43&r2=1.44&f=u From paszczus at pld-linux.org Mon Aug 22 22:30:00 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: rlocate.spec - fixed %post and %postun section - build fail... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:30:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ---- Files affected: SPECS: rlocate.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.29 SPECS/rlocate.spec:1.30 --- SPECS/rlocate.spec:1.29 Mon Aug 22 22:22:20 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:29:54 2005 @@ -194,17 +194,13 @@ if [ ! -f /var/lib/rlocate/rlocate.db ]; then echo 'Run "%{_bindir}/updatedb" if you want to make rlocate database immediately.' fi +/sbin/chkconfig --add %{name} +%service %{name} restart %postun if [ "$1" = "0" ]; then %groupremove rlocate -fi - -%post init -/sbin/chkconfig --add %{name} -%service %{name} restart - -%preun init +else if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} @@ -255,6 +251,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/22 20:29:54 paszczus +- fixed %post and %postun section +- build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d + Revision 1.29 2005/08/22 20:22:20 paszczus - fixed md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.29&r2=1.30&f=u From baggins at pld-linux.org Mon Aug 22 22:32:44 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: pam-pld-0.80.1.tar.gz Message-ID: <1625.1124742764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz df374f625e7178f43a263a32e376dd46 pam-pld-0.80.1.tar.gz Size: 1311375 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gnome-icon-theme-2.11.92.tar.bz2 Message-ID: <2102.1124742794@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/gnome-icon-theme-2.11.92.tar.bz2 a47b8debffc6c8228954fd100e7dc02f gnome-icon-theme-2.11.92.tar.bz2 Size: 3038101 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:13 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gnome-icon-theme.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:33:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-icon-theme.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-icon-theme.spec diff -u SPECS/gnome-icon-theme.spec:1.36.2.4 SPECS/gnome-icon-theme.spec:1.36.2.5 --- SPECS/gnome-icon-theme.spec:1.36.2.4 Tue Aug 9 13:38:03 2005 +++ SPECS/gnome-icon-theme.spec Mon Aug 22 22:33:08 2005 @@ -2,12 +2,12 @@ Summary: Default icon themes for GNOME2 enviroment Summary(pl): Domy?lne motywy ikon dla ?rodowiska GNOME2 Name: gnome-icon-theme -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 4c54d897f6eba91b9b9e12633ff50637 +# Source0-md5: a47b8debffc6c8228954fd100e7dc02f URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/22 20:33:08 aflinta +- 2.11.92 + Revision 1.36.2.4 2005/08/09 11:38:03 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icon-theme.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gcalctool.spec - 5.6.28 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:35:26 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 5.6.28 ---- Files affected: SPECS: gcalctool.spec (1.45.2.3 -> 1.45.2.4) ---- Diffs: ================================================================ Index: SPECS/gcalctool.spec diff -u SPECS/gcalctool.spec:1.45.2.3 SPECS/gcalctool.spec:1.45.2.4 --- SPECS/gcalctool.spec:1.45.2.3 Thu Aug 18 11:39:35 2005 +++ SPECS/gcalctool.spec Mon Aug 22 22:35:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME calculator Summary(pl): Kalkulator dla GNOME Name: gcalctool -Version: 5.6.26 +Version: 5.6.28 Release: 2 License: GPL v2 Group: Applications/Math Source0: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/%{name}-%{version}.tar.bz2 -# Source0-md5: a60f02819f9840e3b0097d3f69f6f4d2 +# Source0-md5: 2e6dfe43c8455fd4aac5976f4e7badfc Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -84,6 +84,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45.2.4 2005/08/22 20:35:21 aflinta +- 5.6.28 + Revision 1.45.2.3 2005/08/18 09:39:35 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcalctool.spec?r1=1.45.2.3&r2=1.45.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gcalctool-5.6.28.tar.bz2 Message-ID: <4734.1124742925@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/gcalctool-5.6.28.tar.bz2 2e6dfe43c8455fd4aac5976f4e7badfc gcalctool-5.6.28.tar.bz2 Size: 1107054 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:37:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): eog.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:37:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eog.spec (1.73.2.4 -> 1.73.2.5) ---- Diffs: ================================================================ Index: SPECS/eog.spec diff -u SPECS/eog.spec:1.73.2.4 SPECS/eog.spec:1.73.2.5 --- SPECS/eog.spec:1.73.2.4 Thu Aug 18 11:26:37 2005 +++ SPECS/eog.spec Mon Aug 22 22:37:49 2005 @@ -3,12 +3,12 @@ Summary(pl): Oko GNOME - przegl?darka obrazk?w Summary(pt_BR): Visualizador de imagem Eye of GNOME Name: eog -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9438a070620fcc0dc17956edc933597d +# Source0-md5: 9992e70d6b59120474ad775e11b60f94 Patch0: %{name}-libtool.patch Patch1: %{name}-desktop.patch URL: http://www.gnome.org/ @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.73.2.5 2005/08/22 20:37:49 aflinta +- 2.11.92 + Revision 1.73.2.4 2005/08/18 09:26:37 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eog.spec?r1=1.73.2.4&r2=1.73.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:37:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: eog-2.11.92.tar.bz2 Message-ID: <5941.1124743076@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/eog-2.11.92.tar.bz2 9992e70d6b59120474ad775e11b60f94 eog-2.11.92.tar.bz2 Size: 988587 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: libsoup-2.2.6.1.tar.bz2 Message-ID: <7551.1124743234@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.1.tar.bz2 e31e178a685aa64dc60f98a89d3d0141 libsoup-2.2.6.1.tar.bz2 Size: 430461 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: libsoup.spec - 2.2.6.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:40:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.2.6.1 ---- Files affected: SPECS: libsoup.spec (1.44 -> 1.45) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.44 SPECS/libsoup.spec:1.45 --- SPECS/libsoup.spec:1.44 Mon Aug 22 22:29:27 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:40:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.6 +Version: 2.2.6.1 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b16657c52e690933ddb250d351fba3c +# Source0-md5: e31e178a685aa64dc60f98a89d3d0141 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45 2005/08/22 20:40:27 aflinta +- 2.2.6.1 + Revision 1.44 2005/08/22 20:29:27 aflinta - version 2.2.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.44&r2=1.45&f=u From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: libgtop-2.11.92.tar.bz2 Message-ID: <11169.1124743566@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/libgtop-2.11.92.tar.bz2 e367a89414910bbc66fae20b312aaf58 libgtop-2.11.92.tar.bz2 Size: 745655 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): libgtop.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:46:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: libgtop.spec (1.107.2.5 -> 1.107.2.6) ---- Diffs: ================================================================ Index: SPECS/libgtop.spec diff -u SPECS/libgtop.spec:1.107.2.5 SPECS/libgtop.spec:1.107.2.6 --- SPECS/libgtop.spec:1.107.2.5 Mon Aug 8 15:44:19 2005 +++ SPECS/libgtop.spec Mon Aug 22 22:46:01 2005 @@ -7,13 +7,13 @@ Summary(ru): ?????????? LibGTop Summary(uk): ?????????? LibGTop Name: libgtop -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: e135594822c0952bb0eb7f496bfb8b40 +# Source0-md5: e367a89414910bbc66fae20b312aaf58 Patch0: %{name}-configure.patch URL: http://www.home-of-linux.org/gnome/libgtop/ BuildRequires: autoconf @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.107.2.6 2005/08/22 20:46:01 aflinta +- 2.11.92 + Revision 1.107.2.5 2005/08/08 13:44:19 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgtop.spec?r1=1.107.2.5&r2=1.107.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gnome-system-monitor.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:50:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-system-monitor.spec (1.27.2.6 -> 1.27.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-system-monitor.spec diff -u SPECS/gnome-system-monitor.spec:1.27.2.6 SPECS/gnome-system-monitor.spec:1.27.2.7 --- SPECS/gnome-system-monitor.spec:1.27.2.6 Thu Aug 18 13:00:03 2005 +++ SPECS/gnome-system-monitor.spec Mon Aug 22 22:50:52 2005 @@ -2,12 +2,12 @@ Summary: Simple process monitor Summary(pl): Prosty monitor proces?w Name: gnome-system-monitor -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a28849a5934d95b7d8370ddd0d1c92f7 +# Source0-md5: 6bb8f6b50f4edfb57dc2d58a26b3fe2c Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -87,6 +87,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27.2.7 2005/08/22 20:50:52 aflinta +- 2.11.92 + Revision 1.27.2.6 2005/08/18 11:00:03 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-monitor.spec?r1=1.27.2.6&r2=1.27.2.7&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gnome-system-monitor-2.11.92.tar.bz2 Message-ID: <14032.1124743858@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/gnome-system-monitor-2.11.92.tar.bz2 6bb8f6b50f4edfb57dc2d58a26b3fe2c gnome-system-monitor-2.11.92.tar.bz2 Size: 779754 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: metacity-2.11.3.tar.bz2 Message-ID: <16315.1124744107@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/metacity-2.11.3.tar.bz2 703f5a27deb9052eaba98ae6ada588c6 metacity-2.11.3.tar.bz2 Size: 1700272 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): metacity.spec - 2.11.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:55:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.3 ---- Files affected: SPECS: metacity.spec (1.96.2.4 -> 1.96.2.5) ---- Diffs: ================================================================ Index: SPECS/metacity.spec diff -u SPECS/metacity.spec:1.96.2.4 SPECS/metacity.spec:1.96.2.5 --- SPECS/metacity.spec:1.96.2.4 Wed Aug 17 22:40:53 2005 +++ SPECS/metacity.spec Mon Aug 22 22:54:57 2005 @@ -9,13 +9,13 @@ Summary: Metacity window manager Summary(pl): Zarz?dca okien Metacity Name: metacity -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 Epoch: 2 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 8cd042855bec2df5e4592d0aabbd5b6d +# Source0-md5: 703f5a27deb9052eaba98ae6ada588c6 Patch0: %{name}-libtool.patch Patch1: %{name}-swap-resize-button.patch BuildRequires: GConf2-devel >= 2.10.0 @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96.2.5 2005/08/22 20:54:57 aflinta +- 2.11.3 + Revision 1.96.2.4 2005/08/17 20:40:53 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/metacity.spec?r1=1.96.2.4&r2=1.96.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 22:56:56 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: rlocate.spec - fixed %files, cron and init In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:56:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %files, cron and init ---- Files affected: SPECS: rlocate.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.30 SPECS/rlocate.spec:1.31 --- SPECS/rlocate.spec:1.30 Mon Aug 22 22:29:54 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:56:51 2005 @@ -160,7 +160,10 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d +install -d $RPM_BUILD_ROOT/etc/cron.daily install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +install rlocate.cron $RPM_BUILD_ROOT/etc/cron.daily/rlocate %if %{with userspace} %{__make} install \ @@ -220,9 +223,6 @@ %endif %endif -%attr(754,root,root) /etc/rc.d/init.d/%{name} -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} - %if %{with userspace} %files %defattr(644,root,root,755) @@ -245,12 +245,17 @@ %dir %attr(750,root,rlocate) /var/lib/rlocate %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/22 20:56:51 paszczus +- fixed %files, cron and init + Revision 1.30 2005/08/22 20:29:54 paszczus - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.30&r2=1.31&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): gnome-utils.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:57:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-utils.spec (1.124.2.4 -> 1.124.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-utils.spec diff -u SPECS/gnome-utils.spec:1.124.2.4 SPECS/gnome-utils.spec:1.124.2.5 --- SPECS/gnome-utils.spec:1.124.2.4 Mon Aug 8 17:38:34 2005 +++ SPECS/gnome-utils.spec Mon Aug 22 22:57:54 2005 @@ -6,13 +6,13 @@ Summary(uk): ??????? GNOME, ???? ?? ????? ?????? ?? ??????????? Summary(zh_CN): GNOME?????????? Name: gnome-utils -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 5a148b44cc9acb0c92f0d8eaae26eb46 +# Source0-md5: c1fe1083a946da6ee6a10798021400e7 Patch0: %{name}-desktop.patch Patch1: %{name}-omf.patch Icon: gnome-utils.xpm @@ -323,6 +323,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124.2.5 2005/08/22 20:57:54 aflinta +- 2.11.92 + Revision 1.124.2.4 2005/08/08 15:38:34 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.124.2.4&r2=1.124.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:05 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: gnome-utils-2.11.92.tar.bz2 Message-ID: <18422.1124744285@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/gnome-utils-2.11.92.tar.bz2 c1fe1083a946da6ee6a10798021400e7 gnome-utils-2.11.92.tar.bz2 Size: 1716708 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 22:58:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: horde-passwd.spec - fix partially configured hook In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 20:58:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix partially configured hook ---- Files affected: SPECS: horde-passwd.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.15 SPECS/horde-passwd.spec:1.16 --- SPECS/horde-passwd.spec:1.15 Mon Aug 22 21:41:41 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 22:58:46 2005 @@ -6,13 +6,14 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.10 +Release: 0.12 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,6 +47,7 @@ %prep %setup -q -n passwd-h3-%{version}-beta +%patch0 -p1 # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -136,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/22 20:58:46 glen +- fix partially configured hook + Revision 1.15 2005/08/22 19:41:41 glen - set default list of usernames where password set is refused based on target machine system users ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.15&r2=1.16&f=u From darekr at pld-linux.org Mon Aug 22 23:03:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: dumb-0.9.3.tar.gz Message-ID: <21957.1124744587@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dumb/dumb-0.9.3.tar.gz f48da5b990aa8aa822d3b6a951baf5c2 dumb-0.9.3.tar.gz Size: 167379 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 23:03:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: dumb.spec - updated to 0.9.3 - added -devel, -static packag... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 21:03:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3 - added -devel, -static packages - cosmetics ---- Files affected: SPECS: dumb.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/dumb.spec diff -u SPECS/dumb.spec:1.7 SPECS/dumb.spec:1.8 --- SPECS/dumb.spec:1.7 Sun Jun 20 23:36:37 2004 +++ SPECS/dumb.spec Mon Aug 22 23:02:57 2005 @@ -2,12 +2,12 @@ Summary: DUMB - Dedicated Universal Music Bastardisation Summary(pl): DUMB - Dedicated Universal Music Bastardisation Name: dumb -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 0.1 License: GPL-like Group: Development/Libraries Source0: http://dl.sourceforge.net/dumb/%{name}-%{version}.tar.gz -# Source0-md5: 0ce45f64934e6d5d7b82a55108596680 +# Source0-md5: f48da5b990aa8aa822d3b6a951baf5c2 URL: http://dumb.sourceforge.net/ BuildRequires: allegro-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -20,8 +20,32 @@ %description -l pl Biblioteka DUMB - Dedicated Universal Music Bastardisation. +%package devel +Summary: Header files for dumb +Summary(pl): Pliki nag??wkowe dla dumb +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +dumb header files. + +%description devel -l pl +Pliki nag??wkowe dla dumb. + +%package static +Summary: Static libraries for dumb +Summary(pl): Statyczne biblioteki dla dumb +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +dumb static libraries. + +%description static -l pl +Biblioteki statyczne dla dumb. + %prep -%setup -q -n %{name} +%setup -q %build cat < make/config.txt @@ -31,14 +55,18 @@ PREFIX := /usr EOF -%{__make} all CC="%{__cc}" OFLAGS="%{rpmcflags}" +%{__make} all \ + CC="%{__cc}" \ + OFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 %clean rm -rf $RPM_BUILD_ROOT @@ -46,8 +74,15 @@ %files %defattr(644,root,root,755) %doc *.txt docs/* +%attr(755,root,root) %{_bindir}/dumb* + +%files devel +%defattr(644,root,root,755) %{_includedir}/* -%{_libdir}/* + +%files static +%defattr(644,root,root,755) +%{_libdir}/lib*.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +90,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:02:57 darekr +- updated to 0.9.3 +- added -devel, -static packages +- cosmetics + Revision 1.7 2004/06/20 21:36:37 arekm - fix specflags (quotation here is buggy) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dumb.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Mon Aug 22 23:23:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): control-center.spec - updated to 2.11.92 - updated ... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated pangoxft_fix patch ---- Files affected: SPECS: control-center.spec (1.170.2.10 -> 1.170.2.11) ---- Diffs: ================================================================ Index: SPECS/control-center.spec diff -u SPECS/control-center.spec:1.170.2.10 SPECS/control-center.spec:1.170.2.11 --- SPECS/control-center.spec:1.170.2.10 Sun Aug 14 23:32:32 2005 +++ SPECS/control-center.spec Mon Aug 22 23:23:23 2005 @@ -6,13 +6,13 @@ Summary(uk): ????? ????????? GNOME Summary(ru): ????? ?????????? GNOME Name: control-center -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a429f605878160e2660725bad2ee1e17 +# Source0-md5: 9572d1033c1103c2ed57e802c24b5a5c Patch0: %{name}-randr.patch Patch1: %{name}-wm_properties-dir.patch Patch2: %{name}-additional-metacity-keybinding.patch @@ -48,6 +48,7 @@ BuildRequires: libtool BuildRequires: metacity-devel >= 2:2.10.0 BuildRequires: nautilus-devel >= 2.11.0 +BuildRequires: pango-devel >= 1:1.9.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper BuildRequires: xft-devel >= 2.1.1 @@ -241,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.170.2.11 2005/08/22 21:23:23 paladine +- updated to 2.11.92 +- updated pangoxft_fix patch + Revision 1.170.2.10 2005/08/14 21:32:32 freetz - pangoxft fix added, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/control-center.spec?r1=1.170.2.10&r2=1.170.2.11&f=u From paladine at pld-linux.org Mon Aug 22 23:23:18 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES (DEVEL): control-center-pangoxft_fix.patch - updated for 2... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: control-center-pangoxft_fix.patch (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: SOURCES/control-center-pangoxft_fix.patch diff -u SOURCES/control-center-pangoxft_fix.patch:1.1 SOURCES/control-center-pangoxft_fix.patch:1.1.2.1 --- SOURCES/control-center-pangoxft_fix.patch:1.1 Sun Aug 14 23:33:05 2005 +++ SOURCES/control-center-pangoxft_fix.patch Mon Aug 22 23:23:11 2005 @@ -1,15 +1,7 @@ -diff -aurN control-center-2.11.91.orig/capplets/keyboard/Makefile.am control-center-2.11.91/capplets/keyboard/Makefile.am ---- control-center-2.11.91.orig/capplets/keyboard/Makefile.am 2004-11-28 09:14:04.000000000 +0100 -+++ control-center-2.11.91/capplets/keyboard/Makefile.am 2005-08-14 23:24:03.000000000 +0200 -@@ -10,6 +10,7 @@ - gnome_keyboard_properties_LDADD = \ - ../accessibility/keyboard/libaccessibility-keyboard.a \ - $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ -+ $(PANGOXFT_LIBS) \ - ../../libgswitchit/libgswitchit.a \ - ../../libkbdraw/libkbdraw.a - -@@ -29,6 +30,6 @@ +diff -urN control-center-2.11.92.orig/capplets/keyboard/Makefile.am control-center-2.11.92/capplets/keyboard/Makefile.am +--- control-center-2.11.92.orig/capplets/keyboard/Makefile.am 2005-08-22 22:44:26.558451264 +0200 ++++ control-center-2.11.92/capplets/keyboard/Makefile.am 2005-08-22 22:46:46.310205768 +0200 +@@ -29,6 +29,6 @@ Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) @@ -17,18 +9,17 @@ +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) $(PANGOXFT_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) -diff -aurN control-center-2.11.91.orig/configure.in control-center-2.11.91/configure.in ---- control-center-2.11.91.orig/configure.in 2005-08-10 11:45:08.000000000 +0200 -+++ control-center-2.11.91/configure.in 2005-08-14 23:18:51.000000000 +0200 -@@ -97,6 +97,11 @@ - libbonobo-2.0 dnl - libbonoboui-2.0 dnl - gnome-desktop-2.0 >= 2.2.0" -+ +diff -urN control-center-2.11.92.orig/configure.in control-center-2.11.92/configure.in +--- control-center-2.11.92.orig/configure.in 2005-08-22 22:44:27.329334072 +0200 ++++ control-center-2.11.92/configure.in 2005-08-22 22:47:35.247766128 +0200 +@@ -126,7 +126,9 @@ + + PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES) + +-PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.8) +PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.9.1) +AC_SUBST(PANGOXFT_CFLAGS) +AC_SUBST(PANGOXFT_LIBS) -+ - PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) - PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1) - PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, + + dnl + dnl Check for XRandR, needed for display capplet ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/control-center-pangoxft_fix.patch?r1=1.1&r2=1.1.2.1&f=u From paladine at pld-linux.org Mon Aug 22 23:23:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: control-center-2.11.92.tar.bz2 Message-ID: <1258.1124745813@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/control-center-2.11.92.tar.bz2 9572d1033c1103c2ed57e802c24b5a5c control-center-2.11.92.tar.bz2 Size: 1906135 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Mon Aug 22 23:34:02 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: luma.spec - fixed my previous commit message in changelog In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 21:34:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed my previous commit message in changelog ---- Files affected: SPECS: luma.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.7 SPECS/luma.spec:1.8 --- SPECS/luma.spec:1.7 Mon Aug 22 18:32:07 2005 +++ SPECS/luma.spec Mon Aug 22 23:33:56 2005 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:33:56 twittner +- fixed my previous commit message in changelog + Revision 1.7 2005/08/22 16:32:07 twittner $ luma QPainter::begin: Cannot paint null pixmap @@ -72,7 +75,8 @@ $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ -- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py +- to avoid this call luma.py not luma.pyc +- don't rm *.py - luma doesn't work without *.py files Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.7&r2=1.8&f=u From paszczus at pld-linux.org Mon Aug 22 23:50:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: test: paszczus (NEW) - test In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:50:09 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: paszczus (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: test/paszczus diff -u /dev/null test/paszczus:1.1 --- /dev/null Mon Aug 22 23:50:09 2005 +++ test/paszczus Mon Aug 22 23:50:04 2005 @@ -0,0 +1 @@ +test ================================================================ From paszczus at pld-linux.org Mon Aug 22 23:51:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: test (DEVEL): paszczus test2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:51:48 2005 GMT Module: test Tag: DEVEL ---- Log message: test2 ---- Files affected: test: paszczus (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1 test/paszczus:1.1.2.1 --- test/paszczus:1.1 Mon Aug 22 23:50:04 2005 +++ test/paszczus Mon Aug 22 23:51:43 2005 @@ -1 +1,2 @@ test +test2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1&r2=1.1.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:07 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): digikam.spec - updated to 0.8.0 (snap 2005-08-22) -... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ---- Files affected: SPECS: digikam.spec (1.42 -> 1.42.2.1) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42 SPECS/digikam.spec:1.42.2.1 --- SPECS/digikam.spec:1.42 Mon Aug 22 21:01:58 2005 +++ SPECS/digikam.spec Mon Aug 22 23:56:01 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 56c8e01718ffc64a0c2a2d412b00986c URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -22,6 +23,7 @@ BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 +BuildRequires: sqlite3-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,7 +49,7 @@ Interfejs KDE do gphoto2 - pliki nag??wkowe. %prep -%setup -q +%setup -q -n digikam %build @@ -89,7 +91,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README +%doc digikam/AUTHORS digikam/ChangeLog digikam/README %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/*.so.*.*.* %attr(755,root,root) %{_libdir}/kde3/*.so @@ -97,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -%{_datadir}/apps/showfoto +#%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -106,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -%{_includedir}/digikam +#%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -114,6 +116,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.1 2005/08/22 21:56:01 paszczus +- updated to 0.8.0 (snap 2005-08-22) +- added BR: sqlite3-devel + Revision 1.42 2005/08/22 19:01:58 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42&r2=1.42.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: digikam-0.8.0-20050822.tar.bz2 Message-ID: <19554.1124747770@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikam-0.8.0-20050822.tar.bz2 56c8e01718ffc64a0c2a2d412b00986c digikam-0.8.0-20050822.tar.bz2 Size: 2415489 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: digikamimageplugins-0.8.0-20050822.tar.bz2 Message-ID: <23032.1124748211@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikamimageplugins-0.8.0-20050822.tar.bz2 9e9f6e8a930fe2a88665a05065163f9f digikamimageplugins-0.8.0-20050822.tar.bz2 Size: 3149640 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): digikamimageplugins.spec - updated to 0.8.0 (snap 2... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:03:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) ---- Files affected: SPECS: digikamimageplugins.spec (1.6 -> 1.6.2.1) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.6 SPECS/digikamimageplugins.spec:1.6.2.1 --- SPECS/digikamimageplugins.spec:1.6 Mon Aug 22 21:13:06 2005 +++ SPECS/digikamimageplugins.spec Tue Aug 23 00:03:25 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 9e9f6e8a930fe2a88665a05065163f9f URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -48,9 +49,13 @@ - adjustcurves %prep -%setup -q +%setup -q -n %{name} %build + +cp -f /usr/share/automake/config.sub admin +%{__make} -f admin/Makefile.common cvs + %configure \ --with-qt-libraries=%{_libdir} %{__make} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.2.1 2005/08/22 22:03:25 paszczus +- updated to 0.8.0 (snap 2005-08-22) + Revision 1.6 2005/08/22 19:13:06 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.6&r2=1.6.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 00:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): digikam.spec - commented files are back In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:04:46 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commented files are back ---- Files affected: SPECS: digikam.spec (1.42.2.1 -> 1.42.2.2) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42.2.1 SPECS/digikam.spec:1.42.2.2 --- SPECS/digikam.spec:1.42.2.1 Mon Aug 22 23:56:01 2005 +++ SPECS/digikam.spec Tue Aug 23 00:04:41 2005 @@ -99,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -#%{_datadir}/apps/showfoto +%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -108,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -#%{_includedir}/digikam +%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -116,6 +116,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.2 2005/08/22 22:04:41 paszczus +- commented files are back + Revision 1.42.2.1 2005/08/22 21:56:01 paszczus - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42.2.1&r2=1.42.2.2&f=u From paszczus at pld-linux.org Tue Aug 23 00:07:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:13 2005 Subject: test (DEVEL): paszczus - dziala In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:07:51 2005 GMT Module: test Tag: DEVEL ---- Log message: - dziala ---- Files affected: test: paszczus (1.1.2.1 -> 1.1.2.2) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1.2.1 test/paszczus:1.1.2.2 --- test/paszczus:1.1.2.1 Mon Aug 22 23:51:43 2005 +++ test/paszczus Tue Aug 23 00:07:46 2005 @@ -1,2 +1,3 @@ -test -test2 +cvs tag -b DEVEL +cvs tag -F -b DEVEL +cvs ci -r DEVEL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1.2.1&r2=1.1.2.2&f=u From charles at pld-linux.org Tue Aug 23 03:36:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES: qemu-nosdlgui.patch - updated to 0.7.1 In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 01:36:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.7.1 ---- Files affected: SOURCES: qemu-nosdlgui.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/qemu-nosdlgui.patch diff -u SOURCES/qemu-nosdlgui.patch:1.1 SOURCES/qemu-nosdlgui.patch:1.2 --- SOURCES/qemu-nosdlgui.patch:1.1 Thu Jul 7 02:37:20 2005 +++ SOURCES/qemu-nosdlgui.patch Tue Aug 23 03:36:40 2005 @@ -10,10 +10,9 @@ cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< -diff -Nur qemu-0.7.0.orig/sdl.c qemu-0.7.0.chng/sdl.c ---- qemu-0.7.0.orig/sdl.c 2005-04-27 20:52:05.000000000 +0000 -+++ qemu-0.7.0.chng/sdl.c 2005-07-06 22:28:55.000000000 +0000 -@@ -1,507 +1,614 @@ +--- qemu-0.7.1/sdl.c.orig 2005-07-24 20:52:08.000000000 +0200 ++++ qemu-0.7.1/sdl.c 2005-08-23 01:47:48.000000000 +0200 +@@ -1,506 +1,614 @@ /* - * QEMU SDL display driver - * @@ -25,11 +24,11 @@ - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: -+ * Xlib interface for QEMU System Emulator - * +- * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. -- * ++ * Xlib interface for QEMU System Emulator + * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -39,16 +38,18 @@ - * THE SOFTWARE. - */ -#include "vl.h" -- --#include + * Copyright (c) 2004 Vladimit Oleynik + * Used ideas from Bochs, SDL, PCEmu. +*/ -+ + +-#include +#include +#include +#include -+ + +-#ifndef _WIN32 +-#include +-#endif +/* hack, special for qemu */ +#define X_display_init sdl_display_init + @@ -88,10 +89,7 @@ + 0x24, 0x15, 0x49, 0x49, 0x09, + 0xc8, 0x36, 0x32, 0x49, 0x0e, +}; - --#ifndef _WIN32 --#include --#endif ++ +#include "vl.h" -static SDL_Surface *screen; @@ -104,27 +102,8 @@ -static int gui_fullscreen_initial_grab; -static int gui_grab_code = KMOD_LALT | KMOD_LCTRL; -static uint8_t modifiers_state[256]; -- --static void sdl_update(DisplayState *ds, int x, int y, int w, int h) --{ -- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); -- SDL_UpdateRect(screen, x, y, w, h); --} -- --static void sdl_resize(DisplayState *ds, int w, int h) --{ -- int flags; -- -- // printf("resizing to %d %d\n", w, h); -- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; -- flags |= SDL_RESIZABLE; -- if (gui_fullscreen) -- flags |= SDL_FULLSCREEN; -- screen = SDL_SetVideoMode(w, h, 0, flags); -- if (!screen) { -- fprintf(stderr, "Could not open SDL display\n"); -- exit(1); +-static void sdl_update(DisplayState *ds, int x, int y, int w, int h) +static Display *qx_display; +static int q_x_screen_num; +static Window win; @@ -135,25 +114,37 @@ +static int width, height; + +static void x_update(DisplayState *ds, int x, int y, int w, int h) -+{ + { +- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); +- SDL_UpdateRect(screen, x, y, w, h); + XPutImage(qx_display, win, gc, ximage, x, y, x, y, w, h); + XFlush(qx_display); -+} -+ + } + +-static void sdl_resize(DisplayState *ds, int w, int h) +static int prev_x, prev_y; +static int current_x, current_y; + +/* Move the cursor to a center window place */ +static void qXWarpPointer(void) -+{ + { +- int flags; + int x = width/2; + int y = height/2; -+ + +- // printf("resizing to %d %d\n", w, h); + prev_x = current_x = x; + prev_y = current_y = y; + XWarpPointer(qx_display, None, win, 0, 0, 0, 0, x, y); +} -+ + +- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; +- if (gui_fullscreen) +- flags |= SDL_FULLSCREEN; +- screen = SDL_SetVideoMode(w, h, 0, flags); +- if (!screen) { +- fprintf(stderr, "Could not open SDL display\n"); +- exit(1); +static void x_resize(DisplayState *ds, int w, int h) +{ + XSizeHints hints; @@ -164,7 +155,12 @@ + hints.max_width = hints.min_width = w; + hints.max_height = hints.min_height = h; + XSetWMNormalHints(qx_display, win, &hints); -+ } + } +- ds->data = screen->pixels; +- ds->linesize = screen->pitch; +- ds->depth = screen->format->BitsPerPixel; +- ds->width = w; +- ds->height = h; + if(ximage) { + XDestroyImage(ximage); +// free(ds->data); @@ -194,15 +190,19 @@ + ximage->data = ds->data; + qXWarpPointer(); + XFlush(qx_display); -+} -+ + } + +-/* generic keyboard conversion */ +static int gui_grab; -+ + +-#include "sdl_keysym.h" +-#include "keymaps.c" +static void x_SetCaption(void) +{ + char *title, *icon; + XTextProperty titleprop, iconprop; -+ + +-static kbd_layout_t *kbd_layout = NULL; + title = icon = "QEMU"; + if (!vm_running && !gui_grab) + title = "QEMU [Stopped]"; @@ -210,7 +210,15 @@ + title = "QEMU - Press Ctrl-Shift to exit grab"; + if (!vm_running && gui_grab) + title = "QEMU [Stopped] - Press Ctrl-Shift to exit grab"; -+ + +-static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) +-{ +- int keysym; +- /* workaround for X11+SDL bug with AltGR */ +- keysym = ev->keysym.sym; +- if (keysym == 0 && ev->keysym.scancode == 113) +- keysym = SDLK_MODE; +- return keysym2scancode(kbd_layout, keysym); + XStringListToTextProperty(&title, 1, &titleprop); + XSetWMName(qx_display, win, &titleprop); + XFree(titleprop.value); @@ -219,8 +227,9 @@ + XSetWMIconName(qx_display, win, &iconprop); + XFree(iconprop.value); + XSync(qx_display, /* no discard */ 0); -+} -+ + } + +-/* specific keyboard conversions from scan codes */ +static void trigger_mouse_grab(void) +{ + gui_grab ^= 1; @@ -228,126 +237,26 @@ + /* disable cursor */ + static Cursor cursor; + static int cursor_created; -+ + +-#if defined(_WIN32) +#define shape_width 16 +#define shape_height 16 +#define mask_width 16 +#define mask_height 16 -+ + +-static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) +-{ +- return ev->keysym.scancode; +-} + static unsigned int shape_bits[(16*16)/32]; + static unsigned int mask_bits[(16*16)/32]; -+ + +-#else + if (!cursor_created) { + Pixmap shape, mask; + XColor white, black; + Colormap default_cmap; -+ -+ default_cmap = DefaultColormap(qx_display, q_x_screen_num); -+ -+ shape = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)shape_bits, -+ shape_width, shape_height, -+ 1, 0, 1); -+ mask = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)mask_bits, -+ mask_width, mask_height, -+ 1, 0, 1); -+ XParseColor(qx_display, default_cmap, "black", &black); -+ XParseColor(qx_display, default_cmap, "white", &white); -+ cursor = XCreatePixmapCursor(qx_display, shape, mask, -+ &white, &black, 1, 1); -+ cursor_created = 1; -+ } -+ XDefineCursor(qx_display, win, cursor); -+ -+ /* grab pointer and keyboard */ -+ -+// if ( flags & FULLSCREEN ) { -+// /* Unbind the mouse from the fullscreen window */ -+// XUngrabPointer(qx_display, CurrentTime); -+// } -+ /* Try to grab the mouse */ -+ while ( 1 ) { -+ int result = XGrabPointer(qx_display, win, True, 0, -+ GrabModeAsync, GrabModeAsync, -+ win, None, CurrentTime); -+ if (result == GrabSuccess) -+ break; -+ } -+ /* Now grab the keyboard */ -+ XGrabKeyboard(qx_display, win, True, -+ GrabModeAsync, GrabModeAsync, CurrentTime); -+ -+ /* Raise the window if we grab the mouse */ -+// if ( !(flags & FULLSCREEN) ) -+ XRaiseWindow(qx_display, win); -+ qXWarpPointer(); -+ } else { -+ /* enable cursor */ -+ XUndefineCursor(qx_display, win); -+ /* ungrab pointer and keyboard */ -+ XUngrabPointer(qx_display, CurrentTime); -+ XUngrabKeyboard(qx_display, CurrentTime); -+ } -+ x_SetCaption(); -+} -+ -+static unsigned mouse_button_state; -+ -+static void send_keyboard_mouse_status(void) -+{ -+ int dx, dy; -+ -+ dx = current_x - prev_x; -+ dy = -(current_y - prev_y); -+ kbd_mouse_event(dx, -dy, 0, mouse_button_state); -+ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { -+ qXWarpPointer(); -+ } else { -+ prev_x = current_x; -+ prev_y = current_y; - } -- ds->data = screen->pixels; -- ds->linesize = screen->pitch; -- ds->depth = screen->format->BitsPerPixel; -- ds->width = w; -- ds->height = h; - } --/* generic keyboard conversion */ -- --#include "sdl_keysym.h" --#include "keymaps.c" -- --static kbd_layout_t *kbd_layout = NULL; -- --static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) -+static const unsigned char scan_table1[] = - { -- int keysym; -- /* workaround for X11+SDL bug with AltGR */ -- keysym = ev->keysym.sym; -- if (keysym == 0 && ev->keysym.scancode == 113) -- keysym = SDLK_MODE; -- return keysym2scancode(kbd_layout, keysym); --} -- --/* specific keyboard conversions from scan codes */ -- --#if defined(_WIN32) -- --static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) --{ -- return ev->keysym.scancode; --} -- -+ 0x39, 0x02, -+#ifdef KBUK /* double quotes, hash symbol */ -+ 0x03, 0x2b, - #else -- -static const uint8_t x_keycode_to_pc_keycode[61] = { - 0xc7, /* 97 Home */ - 0xc8, /* 98 Up */ @@ -411,13 +320,32 @@ - 0x52, /* 156 KP_Ins */ - 0x53, /* 157 KP_Del */ -}; -- ++ default_cmap = DefaultColormap(qx_display, q_x_screen_num); + -static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) -{ - int keycode; -- ++ shape = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)shape_bits, ++ shape_width, shape_height, ++ 1, 0, 1); ++ mask = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)mask_bits, ++ mask_width, mask_height, ++ 1, 0, 1); ++ XParseColor(qx_display, default_cmap, "black", &black); ++ XParseColor(qx_display, default_cmap, "white", &white); ++ cursor = XCreatePixmapCursor(qx_display, shape, mask, ++ &white, &black, 1, 1); ++ cursor_created = 1; ++ } ++ XDefineCursor(qx_display, win, cursor); + - keycode = ev->keysym.scancode; -- ++ /* grab pointer and keyboard */ + - if (keycode < 9) { - keycode = 0; - } else if (keycode < 97) { @@ -429,8 +357,71 @@ - keycode = 0; - } - return keycode; --} -- ++// if ( flags & FULLSCREEN ) { ++// /* Unbind the mouse from the fullscreen window */ ++// XUngrabPointer(qx_display, CurrentTime); ++// } ++ /* Try to grab the mouse */ ++ while ( 1 ) { ++ int result = XGrabPointer(qx_display, win, True, 0, ++ GrabModeAsync, GrabModeAsync, ++ win, None, CurrentTime); ++ if (result == GrabSuccess) ++ break; ++ } ++ /* Now grab the keyboard */ ++ XGrabKeyboard(qx_display, win, True, ++ GrabModeAsync, GrabModeAsync, CurrentTime); ++ ++ /* Raise the window if we grab the mouse */ ++// if ( !(flags & FULLSCREEN) ) ++ XRaiseWindow(qx_display, win); ++ qXWarpPointer(); ++ } else { ++ /* enable cursor */ ++ XUndefineCursor(qx_display, win); ++ /* ungrab pointer and keyboard */ ++ XUngrabPointer(qx_display, CurrentTime); ++ XUngrabKeyboard(qx_display, CurrentTime); ++ } ++ x_SetCaption(); + } + +-#endif ++static unsigned mouse_button_state; + +-static void reset_keys(void) ++static void send_keyboard_mouse_status(void) + { +- int i; +- for(i = 0; i < 256; i++) { +- if (modifiers_state[i]) { +- if (i & 0x80) +- kbd_put_keycode(0xe0); +- kbd_put_keycode(i | 0x80); +- modifiers_state[i] = 0; +- } ++ int dx, dy; ++ ++ dx = current_x - prev_x; ++ dy = -(current_y - prev_y); ++ kbd_mouse_event(dx, -dy, 0, mouse_button_state); ++ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { ++ qXWarpPointer(); ++ } else { ++ prev_x = current_x; ++ prev_y = current_y; + } + } + +-static void sdl_process_key(SDL_KeyboardEvent *ev) ++static const unsigned char scan_table1[] = + { +- int keycode, v; ++ 0x39, 0x02, ++#ifdef KBUK /* double quotes, hash symbol */ ++ 0x03, 0x2b, ++#else + 0x28, 0x04, +#endif + 0x05, 0x06, 0x08, 0x28, @@ -460,25 +451,8 @@ + 0x56, +#else + 0x2b, - #endif ++#endif --static void reset_keys(void) --{ -- int i; -- for(i = 0; i < 256; i++) { -- if (modifiers_state[i]) { -- if (i & 0x80) -- kbd_put_keycode(0xe0); -- kbd_put_keycode(i | 0x80); -- modifiers_state[i] = 0; -- } -- } --} -- --static void sdl_process_key(SDL_KeyboardEvent *ev) --{ -- int keycode, v; -- - if (ev->keysym.sym == SDLK_PAUSE) { - /* specific case */ - v = 0; @@ -489,13 +463,20 @@ - kbd_put_keycode(0x45 | v); - return; - } -- ++ 0x1b, + - if (kbd_layout) { - keycode = sdl_keyevent_to_keycode_generic(ev); - } else { - keycode = sdl_keyevent_to_keycode(ev); - } -- ++#ifdef KBUK /* tilde */ ++ 0x2b, ++#else ++ 0x29, ++#endif ++}; + - switch(keycode) { - case 0x00: - /* sent when leaving window: reset the modifiers state */ @@ -519,7 +500,7 @@ - kbd_put_keycode(keycode | 0x80); - return; - } -- + - /* now send the key code */ - if (keycode & 0x80) - kbd_put_keycode(0xe0); @@ -528,7 +509,16 @@ - else - kbd_put_keycode(keycode & 0x7f); -} -- ++static const struct { ++ KeySym key; ++ unsigned scan_code; ++} scan_table2[] = { ++ { XK_BackSpace, 0x0e }, ++ { XK_Tab, 0x0f }, ++ { XK_Return, 0x1c }, ++ { XK_Escape, 0x01 }, ++ { XK_Delete, 0x53e0 }, + -static void sdl_update_caption(void) -{ - char buf[1024]; @@ -541,7 +531,17 @@ - } - SDL_WM_SetCaption(buf, "QEMU"); -} -- ++ { XK_Home, 0x47e0 }, ++ { XK_Left, 0x4be0 }, ++ { XK_Up, 0x48e0 }, ++ { XK_Right, 0x4de0 }, ++ { XK_Down, 0x50e0 }, ++ { XK_Prior, 0x49e0 }, ++ { XK_Next, 0x51e0 }, ++ { XK_End, 0x4fe0 }, ++ { XK_Insert, 0x52e0 }, ++ { XK_Num_Lock, 0x45 }, + -static void sdl_grab_start(void) -{ - SDL_ShowCursor(0); @@ -551,7 +551,8 @@ - gui_grab = 1; - sdl_update_caption(); -} -- ++/* This block of codes is for Sun Type 4 keyboards... */ + -static void sdl_grab_end(void) -{ - SDL_WM_GrabInput(SDL_GRAB_OFF); @@ -559,7 +560,11 @@ - gui_grab = 0; - sdl_update_caption(); -} -- ++ { XK_F27, 0x47e0 }, /* Home/R7/F27 */ ++ { XK_F29, 0x49e0 }, /* Prior/R9/F29 */ ++ { XK_F35, 0x51e0 }, /* Next/R15/F35 */ ++ { XK_F33, 0x4fe0 }, /* End/R13/F33 */ + -static void sdl_send_mouse_event(int dz) -{ - int dx, dy, state, buttons; @@ -573,7 +578,9 @@ - buttons |= MOUSE_EVENT_MBUTTON; - kbd_mouse_event(dx, dy, dz, buttons); -} -- ++ { XK_F25, 0x36e0 }, /* Keypad divide/R5/F25 */ ++ { XK_F26, 0x37 }, /* Keypad multiply/R6/F26 */ + -static void toggle_full_screen(DisplayState *ds) -{ - gui_fullscreen = !gui_fullscreen; @@ -588,10 +595,64 @@ - vga_invalidate_display(); - vga_update_display(); -} -+ 0x1b, ++ { XK_F23, 0x46 }, /* Scroll lock/R3/F23 */ -static void sdl_refresh(DisplayState *ds) --{ ++ { XK_F31, 0x4c }, /* Keypad 5/R11/F31 */ ++ ++/* End of Sun type 4 codes */ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qemu-nosdlgui.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 08:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: nautilus-cd-burner-2.11.7.tar.bz2 Message-ID: <31858.1124776859@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/nautilus-cd-burner-2.11.7.tar.bz2 3874a54b177cea400bb6c8a089c71e31 nautilus-cd-burner-2.11.7.tar.bz2 Size: 607499 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:00:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): nautilus-cd-burner.spec - version 2.11.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:00:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.7 ---- Files affected: SPECS: nautilus-cd-burner.spec (1.48.2.4 -> 1.48.2.5) ---- Diffs: ================================================================ Index: SPECS/nautilus-cd-burner.spec diff -u SPECS/nautilus-cd-burner.spec:1.48.2.4 SPECS/nautilus-cd-burner.spec:1.48.2.5 --- SPECS/nautilus-cd-burner.spec:1.48.2.4 Thu Aug 18 13:36:10 2005 +++ SPECS/nautilus-cd-burner.spec Tue Aug 23 08:00:52 2005 @@ -2,12 +2,12 @@ Summary: Extension for Nautilus to write CD Summary(pl): Rozszerzenie Nautilusa do zapisu p?yt CD Name: nautilus-cd-burner -Version: 2.11.6 -Release: 2 +Version: 2.11.7 +Release: 1 License: LGPL v2+/GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: ad4c124980d740c709acf631007c01e9 +# Source0-md5: 3874a54b177cea400bb6c8a089c71e31 URL: http://www.gnome.org/ Buildrequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf >= 2.52 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.5 2005/08/23 06:00:52 aflinta +- version 2.11.7 + Revision 1.48.2.4 2005/08/18 11:36:10 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus-cd-burner.spec?r1=1.48.2.4&r2=1.48.2.5&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: dasher.spec - 3.2.16 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:12:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.2.16 ---- Files affected: SPECS: dasher.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/dasher.spec diff -u SPECS/dasher.spec:1.18 SPECS/dasher.spec:1.19 --- SPECS/dasher.spec:1.18 Fri Apr 8 11:45:54 2005 +++ SPECS/dasher.spec Tue Aug 23 08:12:21 2005 @@ -2,14 +2,13 @@ Summary: Predictive text entry application Summary(pl): Przewiduj?ca aplikacja do wprowadzania tekstu Name: dasher -Version: 3.2.15 -Release: 2 +Version: 3.2.16 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/%{name}-%{version}.tar.bz2 -# Source0-md5: a3fa85e32c94c69476e12ecba7d257e7 -Patch0: %{name}-locale-names.patch -Patch1: %{name}-desktop.patch +# Source0-md5: 8e0a06db2a4452ec43c696f85bb9e1dc +Patch0: %{name}-desktop.patch URL: http://www.inference.phy.cam.ac.uk/dasher/ BuildRequires: GConf2-devel BuildRequires: ORBit2-devel @@ -57,9 +56,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 - -rm -f po/no.po %build %{__libtoolize} @@ -78,6 +74,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} --with-gnome --all-name %clean @@ -105,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 06:12:21 aflinta +- 3.2.16 + Revision 1.18 2005/04/08 09:45:54 paladine - new style macros - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dasher.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:38 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: dasher-3.2.16.tar.bz2 Message-ID: <4571.1124777558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/dasher-3.2.16.tar.bz2 8e0a06db2a4452ec43c696f85bb9e1dc dasher-3.2.16.tar.bz2 Size: 4595501 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:18:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): eel.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:18:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eel.spec (1.72.2.5 -> 1.72.2.6) ---- Diffs: ================================================================ Index: SPECS/eel.spec diff -u SPECS/eel.spec:1.72.2.5 SPECS/eel.spec:1.72.2.6 --- SPECS/eel.spec:1.72.2.5 Sun Aug 21 10:36:13 2005 +++ SPECS/eel.spec Tue Aug 23 08:17:57 2005 @@ -3,12 +3,12 @@ Summary(pl): Biblioteka rozszerze? Eazel Summary(ko): Eazel ???? ?????????? Name: eel -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: d3d850c7148ebd6f0fe538faf03f996d +# Source0-md5: 58aec74f3ea93c43fcc69ae67bd1679d URL: http://nautilus.eazel.com/ BuildRequires: autoconf BuildRequires: automake @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72.2.6 2005/08/23 06:17:57 aflinta +- 2.11.92 + Revision 1.72.2.5 2005/08/21 08:36:13 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eel.spec?r1=1.72.2.5&r2=1.72.2.6&f=u From aflinta at pld-linux.org Tue Aug 23 08:18:39 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: eel-2.11.92.tar.bz2 Message-ID: <7758.1124777919@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/eel-2.11.92.tar.bz2 58aec74f3ea93c43fcc69ae67bd1679d eel-2.11.92.tar.bz2 Size: 634956 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 08:51:08 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: tomboy.spec - fixed path to *.service, desktop - cosmetics In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:51:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed path to *.service, desktop - cosmetics ---- Files affected: SPECS: tomboy.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.9 SPECS/tomboy.spec:1.10 --- SPECS/tomboy.spec:1.9 Mon Aug 22 16:51:48 2005 +++ SPECS/tomboy.spec Tue Aug 23 08:51:02 2005 @@ -8,8 +8,7 @@ Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b -Source1: %{name}.desktop -#Patch0: %{name}-desktop.patch +Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ BuildRequires: GConf2-devel BuildRequires: atk-devel >= 1.2.4 @@ -45,7 +44,7 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build %{__libtoolize} @@ -59,12 +58,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_desktopdir} +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp data/tomboy.desktop $RPM_BUILD_ROOT%{_desktopdir} +mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ + $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ %find_lang %{name} @@ -81,16 +82,16 @@ %attr(755,root,root) %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas %dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.exe %{_libdir}/%{name}/*.config +%{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins -%{_libdir}/dbus-1.0/services/*.service -%{_libdir}/%{name}/Plugins/*.dll -%{_libdir}/bonobo/servers/* +%{_datadir}/dbus-1/services/*.service %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop +%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc @@ -101,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 06:51:02 pawcioos +- fixed path to *.service, desktop +- cosmetics + Revision 1.9 2005/08/22 14:51:48 pawcioos - updated to 0.3.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.9&r2=1.10&f=u From pawcioos at pld-linux.org Tue Aug 23 08:52:16 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES: tomboy-desktop.patch - path for desktop 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:52:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - path for desktop 0.3.3 ---- Files affected: SOURCES: tomboy-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.1 SOURCES/tomboy-desktop.patch:1.2 --- SOURCES/tomboy-desktop.patch:1.1 Mon Nov 1 17:40:48 2004 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 08:52:11 2005 @@ -1,11 +1,10 @@ -diff -urN aa/tomboy-0.2.2/configure.in tomboy-0.2.2/configure.in ---- aa/tomboy-0.2.2/configure.in 2004-10-15 00:13:31.000000000 +0200 -+++ tomboy-0.2.2/configure.in 2004-11-01 18:26:22.895964176 +0100 -@@ -87,6 +87,7 @@ - AC_OUTPUT([ - Makefile - tomboy.spec -+tomboy.desktop - Tomboy/Makefile - TrayIcon/Makefile - TrayIcon/libtrayicon/Makefile +--- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +@@ -1,6 +1,5 @@ +- + [Desktop Entry] +-Version=@VERSION@ ++Version=0.3.3 + Encoding=UTF-8 + _Name=Tomboy Notes + _Comment=Quick and handy note-taker ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 09:33:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES: dasher-locale-names.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:33:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsoleted ---- Files affected: SOURCES: dasher-locale-names.patch (1.6 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Tue Aug 23 09:34:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): nautilus.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:34:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: nautilus.spec (1.156.2.7 -> 1.156.2.8) ---- Diffs: ================================================================ Index: SPECS/nautilus.spec diff -u SPECS/nautilus.spec:1.156.2.7 SPECS/nautilus.spec:1.156.2.8 --- SPECS/nautilus.spec:1.156.2.7 Wed Aug 17 23:02:14 2005 +++ SPECS/nautilus.spec Tue Aug 23 09:33:58 2005 @@ -3,12 +3,12 @@ Summary(pl): Nautilus - pow?oka GNOME i zarz?dca plik?w Summary(pt_BR): Nautilus ? um gerenciador de arquivos para o GNOME Name: nautilus -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b3d9551afc4f40fd5c90d2fc4dfd35 +# Source0-md5: 8ee9569339fa79ffa4f61f294d124201 Source1: %{name}.PLD.readme Patch0: %{name}-includes.patch Patch1: %{name}-desktop.patch @@ -20,11 +20,11 @@ BuildRequires: automake BuildRequires: cdparanoia-III-devel BuildRequires: docbook-utils >= 0.6.10 -BuildRequires: eel-devel >= 2.11.91 +BuildRequires: eel-devel >= 2.11.92 BuildRequires: esound-devel >= 1:0.2.30 BuildRequires: freetype-devel >= 2.1.4 BuildRequires: gettext-devel -BuildRequires: gnome-desktop-devel >= 2.11.90-2 +BuildRequires: gnome-desktop-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.11.1 BuildRequires: intltool >= 0.33 BuildRequires: libart_lgpl-devel >= 2.3.17 @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.156.2.8 2005/08/23 07:33:58 aflinta +- 2.11.92 + Revision 1.156.2.7 2005/08/17 21:02:14 aflinta - rebuild with new cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus.spec?r1=1.156.2.7&r2=1.156.2.8&f=u From aflinta at pld-linux.org Tue Aug 23 09:34:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: nautilus-2.11.92.tar.bz2 Message-ID: <16538.1124782454@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/nautilus-2.11.92.tar.bz2 8ee9569339fa79ffa4f61f294d124201 nautilus-2.11.92.tar.bz2 Size: 3994853 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:45:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS (DEVEL): glib2.spec - updated to 2.8.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:45:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.8.1 ---- Files affected: SPECS: glib2.spec (1.108.2.9 -> 1.108.2.10) ---- Diffs: ================================================================ Index: SPECS/glib2.spec diff -u SPECS/glib2.spec:1.108.2.9 SPECS/glib2.spec:1.108.2.10 --- SPECS/glib2.spec:1.108.2.9 Sun Aug 14 02:04:25 2005 +++ SPECS/glib2.spec Tue Aug 23 09:45:11 2005 @@ -16,13 +16,13 @@ Summary(tr): Yararl? ufak yordamlar kitapl??? Summary(zh_CN): ?????????????? Name: glib2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 1 License: LGPL Group: Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-%{version}.tar.bz2 -# Source0-md5: 803305bfd59cf7421d90983bf63e5227 +# Source0-md5: 2229ca9d5490a87d5e027e029520df14 Patch0: %{name}-makefile.patch Patch1: %{name}-SEGV.patch URL: http://www.gtk.org/ @@ -212,6 +212,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108.2.10 2005/08/23 07:45:11 paladine +- updated to 2.8.1 + Revision 1.108.2.9 2005/08/14 00:04:25 freetz - 2.8.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.108.2.9&r2=1.108.2.10&f=u From paladine at pld-linux.org Tue Aug 23 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: DISTFILES: glib-2.8.1.tar.bz2 Message-ID: <23192.1124783125@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.1.tar.bz2 2229ca9d5490a87d5e027e029520df14 glib-2.8.1.tar.bz2 Size: 2561938 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:46:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SOURCES: tomboy-desktop.patch - fixed Categories - removed OnlySho... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:46:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed Categories - removed OnlyShowIn=KDE ---- Files affected: SOURCES: tomboy-desktop.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.2 SOURCES/tomboy-desktop.patch:1.3 --- SOURCES/tomboy-desktop.patch:1.2 Tue Aug 23 08:52:11 2005 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 09:46:45 2005 @@ -1,5 +1,6 @@ ---- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 -+++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +diff -urN tomboy-0.3.3.orig/data/tomboy.desktop.in tomboy-0.3.3/data/tomboy.desktop.in +--- tomboy-0.3.3.orig/data/tomboy.desktop.in 2005-08-23 09:34:25.546703880 +0200 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 09:36:34.600084784 +0200 @@ -1,6 +1,5 @@ - [Desktop Entry] @@ -8,3 +9,13 @@ Encoding=UTF-8 _Name=Tomboy Notes _Comment=Quick and handy note-taker +@@ -10,8 +9,7 @@ + StartupNotify=false + Terminal=false + Type=Application +-Categories=Application;Utility; +-OnlyShowIn=KDE; ++Categories=GTK;GNOME;Utility; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=tomboy + X-GNOME-Bugzilla-Component=General ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Tue Aug 23 09:50:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:13 2005 Subject: SPECS: tomboy.spec - proper license - sorted BRs/Rs - removed no l... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:50:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper license - sorted BRs/Rs - removed no locale - use new GConf schemas macros - removed useless scrollkeeper-update - sorted/fixed %%files - fixed desktop patch - rel. 2 ---- Files affected: SPECS: tomboy.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.10 SPECS/tomboy.spec:1.11 --- SPECS/tomboy.spec:1.10 Tue Aug 23 08:51:02 2005 +++ SPECS/tomboy.spec Tue Aug 23 09:49:57 2005 @@ -3,8 +3,8 @@ Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy Version: 0.3.3 -Release: 1 -License: GPL +Release: 2 +License: LGPL v2.1 Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b @@ -17,17 +17,18 @@ BuildRequires: dotnet-dbus-sharp-devel BuildRequires: dotnet-gtk-sharp-devel BuildRequires: dotnet-gtk-sharp-gnome-devel -BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: gnome-panel-devel +BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: intltool >= 0.25 BuildRequires: libtool BuildRequires: mono-csharp BuildRequires: pkgconfig -Requires(post): GConf2 +BuildRequires: rpmbuild(macros) >= 1.197 +Requires(post,preun): GConf2 Requires: mono +Requires: dotnet-dbus-sharp Requires: dotnet-gtk-sharp Requires: dotnet-gtk-sharp-gnome -Requires: dotnet-dbus-sharp Requires: gnome-panel ExclusiveArch: %{ix86} %{x8664} alpha arm hppa ppc s390 sparc sparcv9 sparc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -53,11 +54,11 @@ %{__automake} %configure \ --disable-schemas-install - %{__make} %install rm -rf $RPM_BUILD_ROOT + install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ @@ -67,34 +68,37 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install -/usr/bin/scrollkeeper-update +%gconf_schema_install tomboy.schemas + +%preun +%gconf_schema_uninstall tomboy.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/dbus-1/services/*.service +%{_datadir}/gnome-2.0/ui/* +%{_desktopdir}/*.desktop %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.config -%{_libdir}/%{name}/*.exe +%attr(755,root,root) %{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la -%dir %{_libdir}/%{name}/Plugins -%{_datadir}/dbus-1/services/*.service -%{_datadir}/gnome-2.0/ui/* -%{_desktopdir}/*.desktop -%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/%{name}/Plugins %{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc +%{_sysconfdir}/gconf/schemas/tomboy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +106,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 07:49:57 paladine +- proper license +- sorted BRs/Rs +- removed no locale +- use new GConf schemas macros +- removed useless scrollkeeper-update +- sorted/fixed %%files +- fixed desktop patch +- rel. 2 + Revision 1.10 2005/08/23 06:51:02 pawcioos - fixed path to *.service, desktop - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.10&r2=1.11&f=u From paszczus at pld-linux.org Tue Aug 23 10:00:54 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: horde-passwd.spec - little clean In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 08:00:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - little clean ---- Files affected: SPECS: horde-passwd.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.16 SPECS/horde-passwd.spec:1.17 --- SPECS/horde-passwd.spec:1.16 Mon Aug 22 22:58:46 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 10:00:47 2005 @@ -31,7 +31,7 @@ %define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org +%define _sysconfdir /etc/horde.org %define _appdir %{hordedir}/%{_hordeapp} %description @@ -138,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 08:00:47 paszczus +- little clean + Revision 1.16 2005/08/22 20:58:46 glen - fix partially configured hook ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.16&r2=1.17&f=u From paladine at pld-linux.org Tue Aug 23 10:09:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: openldev-0.4.2.tar.gz Message-ID: <5464.1124784596@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/openldev/openldev-0.4.2.tar.gz 9883643f1939f00f7c54318030d7b460 openldev-0.4.2.tar.gz Size: 418917 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 10:09:57 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: openldev.spec - updated to 0.4.2 - moved from gtkmm to gtk+... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 08:09:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 - moved from gtkmm to gtk+2 - updated descriptions ---- Files affected: SPECS: openldev.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/openldev.spec diff -u SPECS/openldev.spec:1.10 SPECS/openldev.spec:1.11 --- SPECS/openldev.spec:1.10 Fri Jul 22 23:42:31 2005 +++ SPECS/openldev.spec Tue Aug 23 10:09:51 2005 @@ -2,33 +2,32 @@ Summary: Graphical front-end to gcc/g++ Summary(pl): Graficzna nak?adka na gcc/g++ Name: openldev -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://dl.sourceforge.net/openldev/%{name}-%{version}.tar.gz -# Source0-md5: d22a497e87a6aafdfe663b3cffb1670d +# Source0-md5: 9883643f1939f00f7c54318030d7b460 Patch0: %{name}-desktop.patch Patch1: %{name}-makefile.patch URL: http://www.openldev.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: gnome-vfsmm-devel -BuildRequires: gtkmm-devel >= 2.6.0 +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk+2-devel >= 2.6.0 BuildRequires: gtksourceview-devel >= 1.2.0 -BuildRequires: libglademm-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: vte-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Open Linux Developer is a environment based on the Gtkmm libraries +Open Linux Developer is a environment based on the GTK+2 libraries that provides a graphical front-end to gcc/g++. It includes the basic essentials needed by a C/C++ programmer. %description -l pl -Open Linux Developer jest ?rodowiskiem opartym o bibliotek? Gtkmm, +Open Linux Developer jest ?rodowiskiem opartym o bibliotek? GTK+2, b?d?cym graficzn? nak?adk? na gcc/g++. Zawiera podstawowe sk?adniki porzebne dla programisty C/C++. @@ -75,6 +74,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 08:09:51 paladine +- updated to 0.4.2 +- moved from gtkmm to gtk+2 +- updated descriptions + Revision 1.10 2005/07/22 21:42:31 freetz - 0.4.1, missing libglademm-devel BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldev.spec?r1=1.10&r2=1.11&f=u From paladine at pld-linux.org Tue Aug 23 11:08:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): sound-juicer.spec - updated to 2.11.92 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 09:08:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files ---- Files affected: SPECS: sound-juicer.spec (1.36.2.7 -> 1.36.2.8) ---- Diffs: ================================================================ Index: SPECS/sound-juicer.spec diff -u SPECS/sound-juicer.spec:1.36.2.7 SPECS/sound-juicer.spec:1.36.2.8 --- SPECS/sound-juicer.spec:1.36.2.7 Thu Aug 18 13:50:47 2005 +++ SPECS/sound-juicer.spec Tue Aug 23 11:08:02 2005 @@ -2,17 +2,17 @@ Summary: CD ripper Summary(pl): Ripper p?yt CD Name: sound-juicer -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 226e799fea83a5522ea6d5babefd261e +# Source0-md5: b3e5f8e2dd1c3cf1246ed797903228d7 Patch0: %{name}-desktop.patch URL: http://www.burtonini.com/blog/computers/sound-juicer/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 -BuildRequires: automake >= 1.6 +BuildRequires: automake >= 1.9 BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-media-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.10.0-2 @@ -90,11 +90,11 @@ %defattr(644,root,root,755) %doc AUTHORS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* %{_omf_dest_dir}/%{name} +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.8 2005/08/23 09:08:02 paladine +- updated to 2.11.92 +- sorted %%files + Revision 1.36.2.7 2005/08/18 11:50:47 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sound-juicer.spec?r1=1.36.2.7&r2=1.36.2.8&f=u From paladine at pld-linux.org Tue Aug 23 11:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: sound-juicer-2.11.92.tar.bz2 Message-ID: <10686.1124788089@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/sound-juicer-2.11.92.tar.bz2 b3e5f8e2dd1c3cf1246ed797903228d7 sound-juicer-2.11.92.tar.bz2 Size: 550890 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 11:15:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: ApacheJServ-jre-env.patch (NEW) - set default LANG, jre b... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:15:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - set default LANG, jre behaves strange if it's unset ---- Files affected: SOURCES: ApacheJServ-jre-env.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ-jre-env.patch diff -u /dev/null SOURCES/ApacheJServ-jre-env.patch:1.1 --- /dev/null Tue Aug 23 11:15:37 2005 +++ SOURCES/ApacheJServ-jre-env.patch Tue Aug 23 11:15:31 2005 @@ -0,0 +1,10 @@ +--- ./conf/jserv.properties.in~ 2005-08-22 15:57:00.000000000 +0300 ++++ ./conf/jserv.properties.in 2005-08-23 12:14:27.000000000 +0300 +@@ -60,6 +60,7 @@ + # Syntax: wrapper.env=[name]=[value] (String) + # Default: NONE on Unix Systems + # SystemDrive and SystemRoot with appropriate values on Win32 systems ++wrapper.env=LANG=en_US + + # An environment name with value copied from caller to Java Virtual Machine + # Syntax: wrapper.env.copy=[name] (String) ================================================================ From aflinta at pld-linux.org Tue Aug 23 11:23:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: evolution-data-server-1.3.8.tar.bz2 Message-ID: <20109.1124789004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/evolution-data-server-1.3.8.tar.bz2 c6b2992c9a8f758a4a77511a4c2d5cfd evolution-data-server-1.3.8.tar.bz2 Size: 15019129 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 11:22:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): evolution-data-server.spec - 1.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:22:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.8 ---- Files affected: SPECS: evolution-data-server.spec (1.50.2.11 -> 1.50.2.12) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.50.2.11 SPECS/evolution-data-server.spec:1.50.2.12 --- SPECS/evolution-data-server.spec:1.50.2.11 Sun Aug 21 11:04:10 2005 +++ SPECS/evolution-data-server.spec Tue Aug 23 11:22:49 2005 @@ -12,12 +12,12 @@ Summary: Evolution data server Summary(pl): Serwer danych Evolution Name: evolution-data-server -Version: 1.3.7 -Release: 3 +Version: 1.3.8 +Release: 1 License: GPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: e05fe0e8607ed4403b19a9d3f407e8f9 +# Source0-md5: c6b2992c9a8f758a4a77511a4c2d5cfd Patch0: %{name}-system_db.patch Patch1: %{name}-GG-IM.patch Patch2: %{name}-workaround-cal-backend-leak.patch @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50.2.12 2005/08/23 09:22:49 aflinta +- 1.3.8 + Revision 1.50.2.11 2005/08/21 09:04:10 wiget - rebuild with new cairo, rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.50.2.11&r2=1.50.2.12&f=u From aflinta at pld-linux.org Tue Aug 23 11:26:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES (DEVEL): evolution-data-server-system_db.patch - up for ve... In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:26:03 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for version 1.3.8 ---- Files affected: SOURCES: evolution-data-server-system_db.patch (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ Index: SOURCES/evolution-data-server-system_db.patch diff -u SOURCES/evolution-data-server-system_db.patch:1.7.2.3 SOURCES/evolution-data-server-system_db.patch:1.7.2.4 --- SOURCES/evolution-data-server-system_db.patch:1.7.2.3 Sun Jul 3 18:28:46 2005 +++ SOURCES/evolution-data-server-system_db.patch Tue Aug 23 11:25:58 2005 @@ -1,6 +1,6 @@ -diff -aurN evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am ---- evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am 2005-06-25 12:17:17.000000000 +0200 -+++ evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am 2005-07-03 18:26:24.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am +--- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am 2005-08-23 11:04:40.302083616 +0200 ++++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am 2005-08-23 11:05:46.385037480 +0200 @@ -4,7 +4,6 @@ -I$(top_builddir) \ -I$(top_srcdir)/addressbook \ @@ -20,10 +20,10 @@ libebookbackendfile_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -diff -aurN evolution-data-server-1.3.4.orig/configure.in evolution-data-server-1.3.4/configure.in ---- evolution-data-server-1.3.4.orig/configure.in 2005-07-02 12:09:23.000000000 +0200 -+++ evolution-data-server-1.3.4/configure.in 2005-07-03 18:13:40.000000000 +0200 -@@ -1213,7 +1213,6 @@ +diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in +--- evolution-data-server-1.3.8.orig/configure.in 2005-08-23 11:04:38.291389288 +0200 ++++ evolution-data-server-1.3.8/configure.in 2005-08-23 11:05:46.387037176 +0200 +@@ -1253,7 +1253,6 @@ export privincludedir export privdatadir AC_CONFIG_SUBDIRS(calendar/libical) @@ -31,7 +31,7 @@ AC_OUTPUT([ Makefile -@@ -1268,7 +1267,6 @@ +@@ -1308,7 +1307,6 @@ camel/tests/stream/Makefile camel/camel.pc camel/camel-provider.pc @@ -39,9 +39,9 @@ libedataserver/Makefile libedataserver/libedataserver.pc libedataserverui/Makefile -diff -aurN evolution-data-server-1.3.4.orig/libedataserver/Makefile.am evolution-data-server-1.3.4/libedataserver/Makefile.am ---- evolution-data-server-1.3.4.orig/libedataserver/Makefile.am 2005-04-11 14:21:32.000000000 +0200 -+++ evolution-data-server-1.3.4/libedataserver/Makefile.am 2005-07-03 18:14:15.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am +--- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am 2005-08-23 11:04:40.526049568 +0200 ++++ evolution-data-server-1.3.8/libedataserver/Makefile.am 2005-08-23 11:06:56.983304912 +0200 @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ @@ -50,20 +50,18 @@ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \ $(E_DATA_SERVER_CFLAGS) -@@ -44,8 +43,8 @@ +@@ -44,7 +43,7 @@ libedataserver_1_2_la_LIBADD = \ $(E_DATA_SERVER_LIBS) \ $(ICONV_LIBS) \ -- $(top_builddir)/libdb/dist/libdb-4.1.la -- -+ -ldb -+ - libedataserver_1_2_la_LDFLAGS = \ - -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) +- $(top_builddir)/libdb/dist/libdb-4.1.la \ ++ -ldb \ + $(SOCKET_LIBS) -diff -aurN evolution-data-server-1.3.4.orig/Makefile.am evolution-data-server-1.3.4/Makefile.am ---- evolution-data-server-1.3.4.orig/Makefile.am 2005-04-11 14:21:26.000000000 +0200 -+++ evolution-data-server-1.3.4/Makefile.am 2005-07-03 18:18:54.000000000 +0200 + libedataserver_1_2_la_LDFLAGS = \ +diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am +--- evolution-data-server-1.3.8.orig/Makefile.am 2005-08-23 11:04:40.203098664 +0200 ++++ evolution-data-server-1.3.8/Makefile.am 2005-08-23 11:05:46.390036720 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/evolution-data-server-system_db.patch?r1=1.7.2.3&r2=1.7.2.4&f=u From glen at pld-linux.org Tue Aug 23 11:28:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: ApacheJServ.spec - user/groupadd to init package - secret.k... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - user/groupadd to init package - secret.key fill simplified - cleanups ---- Files affected: SPECS: ApacheJServ.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.38 SPECS/ApacheJServ.spec:1.39 --- SPECS/ApacheJServ.spec:1.38 Fri Aug 19 19:47:15 2005 +++ SPECS/ApacheJServ.spec Tue Aug 23 11:28:28 2005 @@ -1,14 +1,17 @@ # $Revision$, $Date$ +# TODO +# - separate package for jsdk? +# # Conditional build: %bcond_with gcj # use javac instead of GCJ - +# %define apxs /usr/sbin/apxs1 %define jsdkversion 20000924 Summary: Servlet engine with support for the leading web server Summary(pl): Silnik serwlet?w ze wsparciem dla wiod?cego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 0.19 +Release: 0.27 License: freely distributable & usable (JServ), LGPL (JSDK) Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -19,6 +22,7 @@ Source3: %{name}.init Patch0: %{name}-enable-secret.patch Patch1: %{name}-ac.patch +Patch2: %{name}-jre-env.patch URL: http://java.apache.org/ BuildRequires: apache1-devel >= 1.3.9-8 BuildRequires: rpmbuild(macros) >= 1.228 @@ -37,10 +41,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) -%define x_sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define httpdconf %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define _sysconfdir /etc/jserv -%define x_sysconfdir %{httpdconf}/jserv %define logdir /var/log/jserv %define servletdir %{_datadir}/jserv/servlets %define _noautocompressdoc package-list @@ -68,6 +70,11 @@ Summary: ApacheJServ initscript Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} +BuildRequires: rpmbuild(macros) >= 1.202 +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd %description init JServ initscript for standalone mode. @@ -83,6 +90,7 @@ %setup -q -a1 %patch0 -p0 %patch1 -p0 +%patch2 -p1 sed -i -e ' s|@JSDK_CLASSES@|%{_javadir}/servlet-2.0.jar|g @@ -127,7 +135,7 @@ --with-logdir=%{logdir} \ --with-servlets=%{servletdir} \ %{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=`pwd` JAVAC_OPT="-source 1.4"} \ - %{!?with_gcj:--with-javac=%{_bindir}/javac --with-jdk-home=%{_libdir}/java} \ + %{!?with_gcj:--with-javac=%{_bindir}/javac --with-java=%{_bindir}/java --with-jdk-home=%{_libdir}/java} \ %{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \ --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar @@ -165,14 +173,15 @@ find jsdk-doc -name 'Makefile*' | xargs rm -f rm -rf jsdk-doc/{COPYING.LIB,CVS} jsdk-doc/apidoc/CVS +# duplicate +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/jserv.conf + %clean rm -rf $RPM_BUILD_ROOT %post if [ "$1" = 1 ]; then - # use fortune + install-date + process-list to create pseudo-random, hardly - # guessable secret key. Use md5sum to create a hash from this, if available: - (fortune 2>/dev/null; date; ps -eal 2>/dev/null) \ + dd if=/dev/urandom bs=1 count=42 2>/dev/null \ | (md5sum 2>/dev/null || cat) > %{_sysconfdir}/jserv.secret.key fi %service apache restart @@ -182,6 +191,11 @@ %service -q apache restart fi + +%pre init +%groupadd -P %{name}-init -g 154 jserv +%useradd -P %{name}-init -u 154 -g jserv -d /etc/jserv -c "JServ User" jserv + %post init /sbin/chkconfig --add jserv @@ -193,6 +207,12 @@ /sbin/chkconfig --del jserv fi +%postun init +if [ "$1" = "0" ]; then + %userremove jserv + %groupremove jserv +fi + %files %defattr(644,root,root,755) %doc LICENSE README @@ -200,7 +220,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/*_mod_jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key #%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/jserv #%config /etc/profile.d/jserv.sh @@ -235,6 +254,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/23 09:28:28 glen +- user/groupadd to init package +- secret.key fill simplified +- cleanups + Revision 1.38 2005/08/19 17:47:15 glen - created -init subpackage for standalone mode - cruft removed from %post (we are rpm!) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Tue Aug 23 12:01:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: eventum.spec - add missing smarty modifier, rel 2, STBR In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:01:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add missing smarty modifier, rel 2, STBR ---- Files affected: SPECS: eventum.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.112 SPECS/eventum.spec:1.113 --- SPECS/eventum.spec:1.112 Sat Aug 20 13:39:59 2005 +++ SPECS/eventum.spec Tue Aug 23 12:01:01 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 1 +%define _rel 2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -537,7 +537,9 @@ rm -rf $RPM_BUILD_ROOT%{_appdir}/include/Smarty install -d $RPM_BUILD_ROOT%{_smartyplugindir} # These plugins are not in Smarty package (Smarty-2.6.2-3) -cp -a include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ +cp -a \ + include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ + include/Smarty/plugins/modifier.highlight_quoted.php \ $RPM_BUILD_ROOT%{_smartyplugindir} # qmail router @@ -853,6 +855,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/23 10:01:01 glen +- add missing smarty modifier, rel 2, STBR + Revision 1.112 2005/08/20 11:39:59 glen - 1.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.112&r2=1.113&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:40 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): evolution.spec - 2.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 10:27:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.3.8 ---- Files affected: SPECS: evolution.spec (1.171.2.10 -> 1.171.2.11) ---- Diffs: ================================================================ Index: SPECS/evolution.spec diff -u SPECS/evolution.spec:1.171.2.10 SPECS/evolution.spec:1.171.2.11 --- SPECS/evolution.spec:1.171.2.10 Thu Aug 18 17:37:59 2005 +++ SPECS/evolution.spec Tue Aug 23 12:27:35 2005 @@ -16,12 +16,12 @@ Summary(pt_BR): Cliente de email integrado com calend?rio e cat?logo de endere?os Summary(zh_CN): Evolution - GNOME2????????????????????????(??????????????????????????) Name: evolution -Version: 2.3.7 -Release: 3 +Version: 2.3.8 +Release: 1 License: GPL v2 Group: Applications/Mail Source0: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 12d29f28f8ecf302547c63ad137e0b4b +# Source0-md5: d5972fbb96b36cd3420bf1390d63c551 Source1: %{name}-gg16.png Source2: %{name}-gg48.png Patch0: %{name}-nolibs.patch @@ -373,7 +373,7 @@ %{_datadir}/evolution/*/weather %{_datadir}/idl/evolution-*/Evolution-Component.idl %{_datadir}/idl/evolution-*/Evolution-ConfigControl.idl -%{_datadir}/idl/evolution-*/Evolution-Offline.idl +#%{_datadir}/idl/evolution-*/Evolution-Offline.idl %{_datadir}/idl/evolution-*/Evolution-Shell.idl %{_datadir}/idl/evolution-*/Evolution.idl %{_desktopdir}/* @@ -449,6 +449,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171.2.11 2005/08/23 10:27:35 aflinta +- 2.3.8 + Revision 1.171.2.10 2005/08/18 15:37:59 wiget - BR libgnomeui builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.171.2.10&r2=1.171.2.11&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: evolution-2.3.8.tar.bz2 Message-ID: <24010.1124792873@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/evolution-2.3.8.tar.bz2 d5972fbb96b36cd3420bf1390d63c551 evolution-2.3.8.tar.bz2 Size: 11434516 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:28:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: vte-atktextselection.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: vte-atktextselection.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: vte.spec - updated to 0.11.15 - removed atktextselection patch In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.11.15 - removed atktextselection patch ---- Files affected: SPECS: vte.spec (1.78 -> 1.79) ---- Diffs: ================================================================ Index: SPECS/vte.spec diff -u SPECS/vte.spec:1.78 SPECS/vte.spec:1.79 --- SPECS/vte.spec:1.78 Wed Aug 3 18:24:21 2005 +++ SPECS/vte.spec Tue Aug 23 12:28:32 2005 @@ -6,15 +6,14 @@ Summary: VTE terminal widget library Summary(pl): Biblioteka z kontrolk? terminala VTE Name: vte -Version: 0.11.14 +Version: 0.11.15 Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9676e430d951d617aff4672ed1b52fb1 +# Source0-md5: a9dc7b330d52ce384e3e5715d396c72f Patch0: %{name}-keys.patch -Patch1: %{name}-atktextselection.patch -Patch2: %{name}-nozvt.patch +Patch1: %{name}-nozvt.patch %{?with_glx:BuildRequires: OpenGL-devel} BuildRequires: autoconf BuildRequires: automake @@ -97,7 +96,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__glib_gettextize} @@ -165,6 +163,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79 2005/08/23 10:28:32 paladine +- updated to 0.11.15 +- removed atktextselection patch + Revision 1.78 2005/08/03 16:24:21 freetz - back to rel.1 (glib bug http://bugzilla.gnome.org/show_bug.cgi?id=312402) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vte.spec?r1=1.78&r2=1.79&f=u From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: vte-0.11.15.tar.bz2 Message-ID: <24519.1124792917@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/vte-0.11.15.tar.bz2 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 Size: 959449 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 12:30:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: php.spec - revert invalid last commit In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:30:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - revert invalid last commit ---- Files affected: SPECS: php.spec (1.465 -> 1.466) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.465 SPECS/php.spec:1.466 --- SPECS/php.spec:1.465 Mon Aug 22 14:11:35 2005 +++ SPECS/php.spec Tue Aug 23 12:30:30 2005 @@ -77,14 +77,13 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.1.0 -%define _version %{version}RC1 -Release: 0.1%{?with_hardening:hardened} +Version: 5.0.4 +Release: 9.28%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{_version}.tar.bz2 -# Source0-md5: c7aebeb915e6f898559365cf82493ad0 +Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 +# Source0-md5: fb1aac107870f897d26563a9cc5053c0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -1431,7 +1430,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q -n %{name}-%{_version} +%setup -q # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1442,23 +1441,23 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -#%patch9 -p1 +%patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 %patch12 -p1 -#%patch13 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -#%patch20 -p1 -#%patch21 -p1 -#%patch28 -p1 +%patch20 -p1 +%patch21 -p1 +%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1466,8 +1465,8 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -#%patch27 -p1 -#%patch29 -p1 +%patch27 -p1 +%patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -2911,8 +2910,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.465 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.466 2005/08/23 10:30:30 glen +- revert invalid last commit Revision 1.464 2005/08/16 09:38:28 glen - sed >= 4.0 for updated php-module-install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.465&r2=1.466&f=u From glen at pld-linux.org Tue Aug 23 12:31:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: php.spec - rel 10 for finished conf.d support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:31:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for finished conf.d support ---- Files affected: SPECS: php.spec (1.466 -> 1.467) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.466 SPECS/php.spec:1.467 --- SPECS/php.spec:1.466 Tue Aug 23 12:30:30 2005 +++ SPECS/php.spec Tue Aug 23 12:31:11 2005 @@ -78,7 +78,7 @@ Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php Version: 5.0.4 -Release: 9.28%{?with_hardening:hardened} +Release: 10%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -2910,6 +2910,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467 2005/08/23 10:31:11 glen +- rel 10 for finished conf.d support + Revision 1.466 2005/08/23 10:30:30 glen - revert invalid last commit ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.466&r2=1.467&f=u From pluto at pld-linux.org Tue Aug 23 12:33:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: qt4.spec - build/install fixes, release 1. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:33:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - build/install fixes, release 1. ---- Files affected: SPECS: qt4.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.36 SPECS/qt4.spec:1.37 --- SPECS/qt4.spec:1.36 Mon Aug 22 15:01:45 2005 +++ SPECS/qt4.spec Tue Aug 23 12:33:10 2005 @@ -35,7 +35,7 @@ Name: qt4 Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.1 +Release: 1 License: GPL/QPL Group: X11/Libraries Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz @@ -752,19 +752,12 @@ sub-demos-all-ordered \ sub-examples-all-ordered -# -# TODO: -# Check for "with" conditions befor build -# OR -# Find out why and fix the reason of building only mysql sqldriver -# (it is not installed either) -# -for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2} -do - cd $dir - %{__make} - cd - -done +%{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} +#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} +%{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} +%{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} +%{?with_sqlite3: %{__make} -C src/plugins/sqldrivers/sqlite} %if %{with dont_enable} %if %{with designer} @@ -783,6 +776,7 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} QTDIR=`/bin/pwd` export QTDIR @@ -855,6 +849,7 @@ ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h cd - +mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir} for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do HAVEDEBUG=`echo $f | grep _debug | wc -l` MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1` @@ -1135,6 +1130,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/23 10:33:10 pluto +- build/install fixes, release 1. + Revision 1.36 2005/08/22 13:01:45 pluto - updated to 4.0.1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.36&r2=1.37&f=u From glen at pld-linux.org Tue Aug 23 12:33:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: php4.spec - organization In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - organization ---- Files affected: SPECS: php4.spec (1.471 -> 1.472) ---- Diffs: ================================================================ Index: SPECS/php4.spec diff -u SPECS/php4.spec:1.471 SPECS/php4.spec:1.472 --- SPECS/php4.spec:1.471 Tue Aug 16 01:31:40 2005 +++ SPECS/php4.spec Tue Aug 23 12:33:21 2005 @@ -1876,16 +1876,21 @@ install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini +install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} +install %{SOURCE1} . -install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons +%if %{with apache1} install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons -install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE4} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php4.conf +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini +%endif + +%if %{with apache2} +install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons install %{SOURCE4} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php4.conf -install %{SOURCE1} . +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini +%endif cp -f Zend/LICENSE{,.Zend} @@ -3090,6 +3095,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.472 2005/08/23 10:33:21 glen +- organization + Revision 1.471 2005/08/15 23:31:40 glen - BR: rpm-build >= 4.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.471&r2=1.472&f=u From pluto at pld-linux.org Tue Aug 23 12:46:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: qt4.spec - missed %dir %{_libdir}/qt4 added. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:46:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missed %dir %{_libdir}/qt4 added. ---- Files affected: SPECS: qt4.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.37 SPECS/qt4.spec:1.38 --- SPECS/qt4.spec:1.37 Tue Aug 23 12:33:10 2005 +++ SPECS/qt4.spec Tue Aug 23 12:46:45 2005 @@ -972,6 +972,7 @@ %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_libdir}/libQtCore*.so.* +%dir %{_libdir}/qt4 %dir %{_libdir}/qt4/plugins %dir %{_libdir}/qt4/plugins/codecs %dir %{_libdir}/qt4/plugins/crypto @@ -1130,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/23 10:46:45 pluto +- missed %dir %{_libdir}/qt4 added. + Revision 1.37 2005/08/23 10:33:10 pluto - build/install fixes, release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.37&r2=1.38&f=u From paladine at pld-linux.org Tue Aug 23 12:55:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): gnome-terminal.spec - updated to 2.11.3 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:55:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 ---- Files affected: SPECS: gnome-terminal.spec (1.71.2.4 -> 1.71.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-terminal.spec diff -u SPECS/gnome-terminal.spec:1.71.2.4 SPECS/gnome-terminal.spec:1.71.2.5 --- SPECS/gnome-terminal.spec:1.71.2.4 Thu Aug 18 13:07:00 2005 +++ SPECS/gnome-terminal.spec Tue Aug 23 12:55:34 2005 @@ -8,12 +8,12 @@ Summary: GNOME Terminal Summary(pl): Terminal dla GNOME Name: gnome-terminal -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 61cb4c49ea465584e0fd35a7209a37f2 +# Source0-md5: 334eb33c416c39f14b390f91d44ccb98 Patch0: %{name}-TERM.patch Patch1: %{name}-disable-prev_next-tab-sensitivity-changes.patch Patch2: %{name}-desktop.patch @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71.2.5 2005/08/23 10:55:34 paladine +- updated to 2.11.3 + Revision 1.71.2.4 2005/08/18 11:07:00 aflinta - rebuild with cairo rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-terminal.spec?r1=1.71.2.4&r2=1.71.2.5&f=u From paladine at pld-linux.org Tue Aug 23 12:55:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: gnome-terminal-2.11.3.tar.bz2 Message-ID: <9593.1124794543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/gnome-terminal-2.11.3.tar.bz2 334eb33c416c39f14b390f91d44ccb98 gnome-terminal-2.11.3.tar.bz2 Size: 1682922 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Tue Aug 23 12:57:25 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: esmtp.spec - missing br's In-Reply-To: References: Message-ID: Author: spider Date: Tue Aug 23 10:57:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br's ---- Files affected: SPECS: esmtp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmtp.spec diff -u SPECS/esmtp.spec:1.4 SPECS/esmtp.spec:1.5 --- SPECS/esmtp.spec:1.4 Tue Jul 5 15:18:45 2005 +++ SPECS/esmtp.spec Tue Aug 23 12:57:20 2005 @@ -3,7 +3,7 @@ Summary(pl): esmtp - MTA obs?uguj?cy tylko przekazywanie poczty do serwera (E)SMTP Name: esmtp Version: 0.5.1 -Release: 0.2 +Release: 0.3 Epoch: 0 License: GPL v2 Group: Applications @@ -11,6 +11,7 @@ # Source0-md5: 9f0b809e891a548910f099efc4315b02 URL: http://esmtp.sourceforge.net/ BuildRequires: libesmtp-devel +Requires: libesmtp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 10:57:20 spider +- missing br's + Revision 1.4 2005/07/05 13:18:45 darekr - cosmetics, added %doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmtp.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Tue Aug 23 12:57:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: libgnome-2.11.3.tar.bz2 Message-ID: <10798.1124794656@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/libgnome-2.11.3.tar.bz2 26f795d586082417cb5cdcaf7e80563e libgnome-2.11.3.tar.bz2 Size: 946132 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:57:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): libgnome.spec - updated to 2.11.3 - itemize schemas... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:57:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - itemize schemas - sorted %%files ---- Files affected: SPECS: libgnome.spec (1.86.2.2 -> 1.86.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.2 SPECS/libgnome.spec:1.86.2.3 --- SPECS/libgnome.spec:1.86.2.2 Fri Aug 5 09:41:56 2005 +++ SPECS/libgnome.spec Tue Aug 23 12:57:31 2005 @@ -2,12 +2,12 @@ Summary: GNOME base library Summary(pl): Podstawowa biblioteka GNOME Name: libgnome -Version: 2.11.2 +Version: 2.11.3 Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9d8c2c3937516d6e6945da884f4b7f39 +# Source0-md5: 26f795d586082417cb5cdcaf7e80563e URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90 BuildRequires: audiofile-devel >= 1:0.2.3 @@ -154,20 +154,34 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%{_sysconfdir}/gconf/schemas/* -%{_sysconfdir}/sound %attr(755,root,root) %{_bindir}/gnome-open %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_help_viewer.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_terminal.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_window_manager.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_background.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_file_views.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_interface.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_lockdown.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_mouse.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_sound.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas +%{_sysconfdir}/sound %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnome-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnome-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -179,6 +193,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.3 2005/08/23 10:57:31 paladine +- updated to 2.11.3 +- itemize schemas +- sorted %%files + Revision 1.86.2.2 2005/08/05 07:41:56 aflinta - up to version 2.11.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.2&r2=1.86.2.3&f=u From kosmo at pld-linux.org Tue Aug 23 13:19:11 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: pam_mysql-0.6.0.tar.gz Message-ID: <25122.1124795951@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pam-mysql/pam_mysql-0.6.0.tar.gz b7f59c5450d89126b7f25fa2645b1b71 pam_mysql-0.6.0.tar.gz Size: 312187 bytes -- Virtually Yours: distfiles. From kosmo at pld-linux.org Tue Aug 23 13:19:07 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: pam-pam_mysql.spec - updated to 0.6.0 In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 11:19:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.6.0 ---- Files affected: SPECS: pam-pam_mysql.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/pam-pam_mysql.spec diff -u SPECS/pam-pam_mysql.spec:1.9 SPECS/pam-pam_mysql.spec:1.10 --- SPECS/pam-pam_mysql.spec:1.9 Sat Feb 19 09:07:11 2005 +++ SPECS/pam-pam_mysql.spec Tue Aug 23 13:19:01 2005 @@ -3,16 +3,19 @@ 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-%{modulename} -Version: 0.5 -Release: 4 +Version: 0.6.0 +Release: 1 Epoch: 0 License: GPL Group: Base -# Source0-md5: 8cf002392292ae2a5774545324739a94 -Source0: http://dl.sourceforge.net/pam-mysql/pam_mysql-%{version}.tar.gz +Source0: http://dl.sourceforge.net/pam-mysql/%{modulename}-%{version}.tar.gz +# Source0-md5: b7f59c5450d89126b7f25fa2645b1b71 URL: http://sourceforge.net/projects/pam-mysql/ +BuildRequires: autoconf +BuildRequires: automake BuildRequires: mysql-devel BuildRequires: pam-devel +BuildRequires: pkgconfig Obsoletes: pam_mysql BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -25,25 +28,29 @@ baz? danych MySQL. %prep -%setup -q -n %{modulename} +%setup -q -n %{modulename}-%{version} +sed -i 's/sinclude(.*)//' configure.in %build -%{__make} \ - CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -DLINUX_PAM -ansi -pedantic -D_POSIX_SOURCE -Wall -fPIC" \ - LD_D="%{__cc} -shared -Xlinker -x" +%{__aclocal} +%{__autoconf} +%{__automake} +%configure +%{__make} %install rm -rf $RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so +# install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Readme Changelog +%doc CREDITS ChangeLog INSTALL NEWS README %attr(755,root,root) /%{_lib}/security/pam_mysql.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -52,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 11:19:01 kosmo +- updated to 0.6.0 + Revision 1.9 2005/02/19 08:07:11 ankry - rel. 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam-pam_mysql.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Tue Aug 23 13:26:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): libgnomeui.spec - updated to 2.11.3 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:26:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - sorted %%files ---- Files affected: SPECS: libgnomeui.spec (1.79.2.6 -> 1.79.2.7) ---- Diffs: ================================================================ Index: SPECS/libgnomeui.spec diff -u SPECS/libgnomeui.spec:1.79.2.6 SPECS/libgnomeui.spec:1.79.2.7 --- SPECS/libgnomeui.spec:1.79.2.6 Thu Aug 18 17:44:40 2005 +++ SPECS/libgnomeui.spec Tue Aug 23 13:26:52 2005 @@ -2,12 +2,12 @@ Summary: GNOME base GUI library Summary(pl): Podstawowa biblioteka GUI GNOME Name: libgnomeui -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 029928502654b82aca140a608422ffed +# Source0-md5: aa772258869f8a5010cbf5e9bdb075fe Patch0: %{name}-threads.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -129,23 +129,23 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/gnome_segv2 -%attr(755,root,root) %{_libdir}/lib*.so.*.* -%attr(755,root,root) %{_libdir}/libglade/2.0/*.so -%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so -%{_pixmapsdir}/* # it seems that every package that uses %{_datadir}/gnome tree requires # libgnomeui - so added these directories to this package %dir %{_datadir}/gnome %dir %{_datadir}/gnome/help +%attr(755,root,root) %{_libdir}/gnome_segv2 +%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so +%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/libglade/2.0/*.so +%{_pixmapsdir}/* %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnomeui-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomeui-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -157,6 +157,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79.2.7 2005/08/23 11:26:52 paladine +- updated to 2.11.3 +- sorted %%files + Revision 1.79.2.6 2005/08/18 15:44:40 wiget - BR libgnomecanvas builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomeui.spec?r1=1.79.2.6&r2=1.79.2.7&f=u From paladine at pld-linux.org Tue Aug 23 13:27:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: libgnomeui-2.11.3.tar.bz2 Message-ID: <30210.1124796421@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/libgnomeui-2.11.3.tar.bz2 aa772258869f8a5010cbf5e9bdb075fe libgnomeui-2.11.3.tar.bz2 Size: 1822781 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 13:33:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): libgnome.spec - added missing manpage In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 11:33:01 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing manpage ---- Files affected: SPECS: libgnome.spec (1.86.2.3 -> 1.86.2.4) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.3 SPECS/libgnome.spec:1.86.2.4 --- SPECS/libgnome.spec:1.86.2.3 Tue Aug 23 12:57:31 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:32:55 2005 @@ -174,6 +174,7 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound +%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.4 2005/08/23 11:32:55 aflinta +- added missing manpage + Revision 1.86.2.3 2005/08/23 10:57:31 paladine - updated to 2.11.3 - itemize schemas ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.3&r2=1.86.2.4&f=u From paladine at pld-linux.org Tue Aug 23 13:43:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): libgnome.spec - sorted %%files again In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:43:28 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - sorted %%files again ---- Files affected: SPECS: libgnome.spec (1.86.2.4 -> 1.86.2.5) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.4 SPECS/libgnome.spec:1.86.2.5 --- SPECS/libgnome.spec:1.86.2.4 Tue Aug 23 13:32:55 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:43:23 2005 @@ -158,6 +158,7 @@ %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_mandir}/man7/gnome-options* %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas @@ -174,7 +175,6 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound -%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.5 2005/08/23 11:43:23 paladine +- sorted %%files again + Revision 1.86.2.4 2005/08/23 11:32:55 aflinta - added missing manpage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.4&r2=1.86.2.5&f=u From paladine at pld-linux.org Tue Aug 23 13:45:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: libgnomecanvas-2.11.2.tar.bz2 Message-ID: <16091.1124797558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/libgnomecanvas-2.11.2.tar.bz2 bd58220b0e5b3e71c46f36da72978064 libgnomecanvas-2.11.2.tar.bz2 Size: 588292 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 13:46:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): libgnomecanvas.spec - updated to 2.11.2 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:45:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.2 - sorted %%files ---- Files affected: SPECS: libgnomecanvas.spec (1.66.2.2 -> 1.66.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnomecanvas.spec diff -u SPECS/libgnomecanvas.spec:1.66.2.2 SPECS/libgnomecanvas.spec:1.66.2.3 --- SPECS/libgnomecanvas.spec:1.66.2.2 Thu Aug 18 17:43:41 2005 +++ SPECS/libgnomecanvas.spec Tue Aug 23 13:45:54 2005 @@ -2,12 +2,12 @@ Summary: GnomeCanvas widget Summary(pl): Widget GnomeCanvas Name: libgnomecanvas -Version: 2.11.1 -Release: 2 +Version: 2.11.2 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 06d900efedb6f3ea011b43053dab3c0b +# Source0-md5: bd58220b0e5b3e71c46f36da72978064 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -101,11 +101,11 @@ %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/* +%{_includedir}/libgnomecanvas-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomecanvas-2.0 -%{_gtkdocdir}/* %files static %defattr(644,root,root,755) @@ -117,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.3 2005/08/23 11:45:54 paladine +- updated to 2.11.2 +- sorted %%files + Revision 1.66.2.2 2005/08/18 15:43:41 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomecanvas.spec?r1=1.66.2.2&r2=1.66.2.3&f=u From aflinta at pld-linux.org Tue Aug 23 14:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: gedit-2.11.92.tar.bz2 Message-ID: <25517.1124798459@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-2.11.92.tar.bz2 f8cb7042d7d60694cc64553675ff8874 gedit-2.11.92.tar.bz2 Size: 2103799 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 14:00:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): gedit2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 12:00:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gedit2.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/gedit2.spec diff -u SPECS/gedit2.spec:1.81.2.2 SPECS/gedit2.spec:1.81.2.3 --- SPECS/gedit2.spec:1.81.2.2 Thu Aug 18 23:12:39 2005 +++ SPECS/gedit2.spec Tue Aug 23 14:00:48 2005 @@ -2,12 +2,12 @@ Summary: gEdit - small but powerful text editor for X Window Summary(pl): gEdit - ma?y ale pot??ny edytor tekstu dla X Window Name: gedit2 -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications/Editors Source0: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-%{version}.tar.bz2 -# Source0-md5: 1401595bdfe004fee3f3a567b6c356e0 +# Source0-md5: f8cb7042d7d60694cc64553675ff8874 Patch0: %{name}-use_default_font.patch Patch1: %{name}-desktop.patch URL: http://gedit.sourceforge.net/ @@ -148,6 +148,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/23 12:00:48 aflinta +- 2.11.92 + Revision 1.81.2.2 2005/08/18 21:12:39 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From baggins at pld-linux.org Tue Aug 23 14:01:32 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: grub.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 12:01:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: grub.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/grub.spec diff -u SPECS/grub.spec:1.101 SPECS/grub.spec:1.102 --- SPECS/grub.spec:1.101 Sun Jul 31 22:37:17 2005 +++ SPECS/grub.spec Tue Aug 23 14:01:26 2005 @@ -18,7 +18,7 @@ Summary(de): GRUB - ein Bootloader f?r x86 Name: grub Version: 0.97 -Release: 0.4 +Release: 1 License: GPL Group: Base Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/23 12:01:26 baggins +- release 1 + Revision 1.101 2005/07/31 20:37:17 saq - rmf unpackaged file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grub.spec?r1=1.101&r2=1.102&f=u From paladine at pld-linux.org Tue Aug 23 14:04:15 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: gnome-applets-2.11.92.tar.bz2 Message-ID: <468.1124798655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.tar.bz2 2b78a6c5d59aa889979dbb54a301bf4e gnome-applets-2.11.92.tar.bz2 Size: 3786655 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 14:04:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92 - updated %... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 12:04:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated %%files ---- Files affected: SPECS: gnome-applets.spec (1.152.2.6 -> 1.152.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.6 SPECS/gnome-applets.spec:1.152.2.7 --- SPECS/gnome-applets.spec:1.152.2.6 Sun Aug 14 23:31:38 2005 +++ SPECS/gnome-applets.spec Tue Aug 23 14:04:08 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 011374d970db4018e1237d395ef45241 +# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -556,6 +556,7 @@ %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas %{_omf_dest_dir}/char-palette/char-palette-C.omf +%lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf %files cpufreq -f cpufreq-applet.lang @@ -570,6 +571,7 @@ %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf +%lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf %files drivemount -f drivemount.lang %defattr(644,root,root,755) @@ -579,6 +581,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas %{_omf_dest_dir}/drivemount/drivemount-C.omf +%lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf %files geyes -f geyes.lang %defattr(644,root,root,755) @@ -590,6 +593,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas %{_omf_dest_dir}/geyes/geyes-C.omf +%lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf %files gtik -f gtik2_applet2.lang %defattr(644,root,root,755) @@ -600,6 +604,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf +%lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf %files gweather -f gweather.lang %defattr(644,root,root,755) @@ -669,6 +674,7 @@ %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas %{_omf_dest_dir}/gswitchit/gswitchit-C.omf +%lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf %files minicommander -f command-line.lang %defattr(644,root,root,755) @@ -682,6 +688,7 @@ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas %{_omf_dest_dir}/command-line/command-line-C.omf +%lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf %files mixer %defattr(644,root,root,755) @@ -691,6 +698,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf +%lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf %files modemlights %defattr(644,root,root,755) @@ -709,6 +717,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas %{_omf_dest_dir}/multiload/multiload-C.omf +%lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf %files stickynotes -f stickynotes_applet.lang %defattr(644,root,root,755) @@ -720,6 +729,7 @@ %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf +%lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf %files trash -f trashapplet.lang %defattr(644,root,root,755) @@ -729,6 +739,8 @@ %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml %{_omf_dest_dir}/trashapplet/trashapplet-C.omf +%lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf +%lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -736,6 +748,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.7 2005/08/23 12:04:08 paladine +- updated to 2.11.92 +- updated %%files + Revision 1.152.2.6 2005/08/14 21:31:38 freetz - calling BR gtk+2-devel >= 2:2.8.0 instead of pango-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.6&r2=1.152.2.7&f=u From glen at pld-linux.org Tue Aug 23 14:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: libmemcache.spec - updated to 1.4.0, API is preserved but a... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling ---- Files affected: SPECS: libmemcache.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/libmemcache.spec diff -u SPECS/libmemcache.spec:1.4 SPECS/libmemcache.spec:1.5 --- SPECS/libmemcache.spec:1.4 Sat Jun 25 23:59:31 2005 +++ SPECS/libmemcache.spec Tue Aug 23 14:23:30 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define _beta 9 Summary: libmemcache - the C API for memcached Summary(pl): libmemcache - API C do memcached Name: libmemcache -Version: 1.3.0 +Version: 1.4.0 +%define _beta 4 Release: 0.beta%{_beta}.1 Epoch: 0 License: MIT Group: Libraries -Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.beta%{_beta}.tar.bz2 -# Source0-md5: 7b2579095cd758e575f0e4ce5f686305 +Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.b%{_beta}.tar.bz2 +# Source0-md5: 74b6c17686a852a3f20d8e621fd0ab69 Patch0: %{name}-make.patch URL: http://people.freebsd.org/~seanc/libmemcache/ BuildRequires: autoconf @@ -74,7 +74,7 @@ Statyczna biblioteka libmemcache. %prep -%setup -q -n %{name}-%{version}.beta%{_beta} +%setup -q -n %{name}-%{version}.b%{_beta} %patch0 -p1 cp -a test tests rm -f tests{,/*}/Makefile* @@ -110,6 +110,8 @@ %attr(755,root,root) %{_libdir}/libmemcache.so %{_libdir}/libmemcache.la %{_includedir}/memcache.h +%{_includedir}/buffer.h +%{_includedir}/_buffer.h %files static %defattr(644,root,root,755) @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 12:23:30 glen +- updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling + Revision 1.4 2005/06/25 21:59:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libmemcache.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 14:23:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: libmemcache-1.4.0.b4.tar.bz2 Message-ID: <12899.1124799820@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.b4.tar.bz2 74b6c17686a852a3f20d8e621fd0ab69 libmemcache-1.4.0.b4.tar.bz2 Size: 267487 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: php-mcache-ext-1.2.0-beta7.tar.gz Message-ID: <27277.1124800953@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-1.2.0-beta7.tar.gz bbe636154f8dc8ab3889054cf4ace2bd php-mcache-ext-1.2.0-beta7.tar.gz Size: 15415 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: php4-mcache.spec - up to 1.2.0-beta7 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:42:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.0-beta7 ---- Files affected: SPECS: php4-mcache.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.6 SPECS/php4-mcache.spec:1.7 --- SPECS/php4-mcache.spec:1.6 Mon Jul 18 16:26:39 2005 +++ SPECS/php4-mcache.spec Tue Aug 23 14:42:29 2005 @@ -6,13 +6,13 @@ Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 -%define _beta 6 -Release: 0.beta%{_beta}.2 +%define _beta 7 +Release: 0.beta%{_beta}.1 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-%{version}-beta%{_beta}.tar.gz -# Source0-md5: 914b0272fe68d808ffa11edd741f2eae +# Source0-md5: bbe636154f8dc8ab3889054cf4ace2bd URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 12:42:29 glen +- up to 1.2.0-beta7 + Revision 1.6 2005/07/18 14:26:39 glen - fix epoch for php-common ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.6&r2=1.7&f=u From troll at pld-linux.org Tue Aug 23 14:42:52 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: bochs.spec - don't put VGABIOS-lgpl image to docs, but to %... In-Reply-To: References: Message-ID: Author: troll Date: Tue Aug 23 12:42:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs ---- Files affected: SPECS: bochs.spec (1.50 -> 1.51) ---- Diffs: ================================================================ Index: SPECS/bochs.spec diff -u SPECS/bochs.spec:1.50 SPECS/bochs.spec:1.51 --- SPECS/bochs.spec:1.50 Sun Jul 10 15:39:10 2005 +++ SPECS/bochs.spec Tue Aug 23 14:42:47 2005 @@ -112,7 +112,7 @@ DESTDIR=$RPM_BUILD_ROOT \ docdir=%{_docdir}/%{name}-%{version} -mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \ +mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51 2005/08/23 12:42:47 troll +- don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs + Revision 1.50 2005/07/10 13:39:10 saq - patch0 made its way to the sources ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bochs.spec?r1=1.50&r2=1.51&f=u From baggins at pld-linux.org Tue Aug 23 15:06:42 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (LINUX_2_6): kernel.spec - added bind mount extensions for v... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:06:42 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ---- Files affected: SPECS: kernel.spec (1.441.2.1160 -> 1.441.2.1161) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1160 SPECS/kernel.spec:1.441.2.1161 --- SPECS/kernel.spec:1.441.2.1160 Mon Aug 22 18:21:58 2005 +++ SPECS/kernel.spec Tue Aug 23 15:06:36 2005 @@ -262,8 +262,6 @@ # http://openmosix.snarc.org/files/releases/2.6/ # derived from openMosix-r570.patch Patch201: linux-2.6-omosix.patch -# vserver-2.0-pre4 -Patch202: linux-2.6-vs2.patch # xen http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html Patch203: linux-xen-2.0.6.patch Patch204: linux-2.6.12-smp-alts.patch @@ -271,6 +269,17 @@ Patch206: linux-2.6.12.3-xenbus.patch Patch207: linux-2.6.12.3-xen-fixes.patch +# vserver-2.0 +Patch300: linux-2.6-vs2.patch +# Bind Mount Extensions +Patch301: linux-2.6-vs2-BME.patch +# http://vserver.13thfloor.at/Experimental/FOR-2.0.1/ +Patch310: delta-vroot-fix01.diff +Patch311: delta-dlimit-feat01.diff +Patch312: delta-dlimit-fix01.diff +Patch313: delta-loopback-fix01.diff +Patch314: delta-dlimit-fix02.diff + Patch400: kernel-gcc4.patch Patch401: kernel-hotfixes.patch Patch402: linux-em8300-2.6.11.2.patch @@ -694,7 +703,13 @@ %{__patch} -p1 -F3 < %{PATCH201} %endif %if %{with vserver} -%patch202 -p1 +%patch300 -p1 +%patch301 -p1 +%patch310 -p1 +%patch311 -p1 +%patch312 -p1 +%patch313 -p1 +%patch314 -p1 %endif %if %{with xen} %if %{with xendev} @@ -1466,6 +1481,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1161 2005/08/23 13:06:36 baggins +- added bind mount extensions for vservers +- added fixes for vserver 2.0.1 + Revision 1.441.2.1160 2005/08/22 16:21:58 pluto - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1160&r2=1.441.2.1161&f=u From pluto at pld-linux.org Tue Aug 23 15:22:08 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: gcc.spec - updated to 4.1.0-20050823T1409UTC. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 13:22:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.0-20050823T1409UTC. ---- Files affected: SPECS: gcc.spec (1.357 -> 1.358) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.357 SPECS/gcc.spec:1.358 --- SPECS/gcc.spec:1.357 Fri Aug 19 01:15:01 2005 +++ SPECS/gcc.spec Tue Aug 23 15:21:59 2005 @@ -40,7 +40,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.1.0 -%define _snap 20050818T2314UTC +%define _snap 20050823T1409UTC Release: 0.%{_snap}.1 Epoch: 5 License: GPL v2+ @@ -48,7 +48,7 @@ #Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 #Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2 Source0: gcc-4.1-%{_snap}.tar.bz2 -# Source0-md5: 6579390fb1ef8b02e9667c7db1c52327 +# Source0-md5: f268cc87697cacde32240036d54cf209 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -1280,6 +1280,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.358 2005/08/23 13:21:59 pluto +- updated to 4.1.0-20050823T1409UTC. + Revision 1.357 2005/08/18 23:15:01 pluto - x87/mmx patchest. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.357&r2=1.358&f=u From pluto at pld-linux.org Tue Aug 23 15:22:16 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: gcc-4.1-20050823T1409UTC.tar.bz2 Message-ID: <20414.1124803336@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gcc-4.1-20050823T1409UTC.tar.bz2 f268cc87697cacde32240036d54cf209 gcc-4.1-20050823T1409UTC.tar.bz2 Size: 33406105 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 15:33:29 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: delta-dlimit-feat01.diff (NEW), delta-dlimit-fix01.diff (... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:33:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes for vserver 2.0.1 ---- Files affected: SOURCES: delta-dlimit-feat01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix02.diff (NONE -> 1.1) (NEW), delta-loopback-fix01.diff (NONE -> 1.1) (NEW), delta-vroot-fix01.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/delta-dlimit-feat01.diff diff -u /dev/null SOURCES/delta-dlimit-feat01.diff:1.1 --- /dev/null Tue Aug 23 15:33:29 2005 +++ SOURCES/delta-dlimit-feat01.diff Tue Aug 23 15:33:23 2005 @@ -0,0 +1,880 @@ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c 2005-08-17 23:13:13 +0200 +@@ -261,7 +261,7 @@ do_more: + } + error_return: + brelse(bitmap_bh); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, freed); ++ DLIMIT_FREE_BLOCK(inode, freed); + release_blocks(sb, freed); + DQUOT_FREE_BLOCK(inode, freed); + } +@@ -365,7 +365,7 @@ int ext2_new_block(struct inode *inode, + *err = -ENOSPC; + goto out_dquot; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, es_alloc)) { ++ if (DLIMIT_ALLOC_BLOCK(inode, es_alloc)) { + *err = -ENOSPC; + goto out_dlimit; + } +@@ -516,7 +516,7 @@ got_block: + *err = 0; + out_release: + group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, es_alloc); ++ DLIMIT_FREE_BLOCK(inode, es_alloc); + out_dlimit: + release_blocks(sb, es_alloc); + out_dquot: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c 2005-08-17 23:29:16 +0200 +@@ -126,7 +126,7 @@ void ext2_free_inode (struct inode * ino + if (!is_bad_inode(inode)) { + /* Quota is already initialized in iput() */ + ext2_xattr_delete_inode(inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + } +@@ -469,7 +469,7 @@ struct inode *ext2_new_inode(struct inod + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto fail_dlim; + } +@@ -615,28 +615,29 @@ got: + + if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); +- err = -ENOSPC; ++ err = -EDQUOT; + goto fail2; + } + err = ext2_init_acl(inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; ++ + mark_inode_dirty(inode); + ext2_debug("allocating inode %lu\n", inode->i_ino); + ext2_preread_inode(inode); + return inode; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); + return ERR_PTR(err); + + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + fail_dlim: + make_bad_inode(inode); + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext2/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c 2005-08-17 23:21:26 +0200 +@@ -651,11 +651,11 @@ ext2_xattr_set2(struct inode *inode, str + ea_bdebug(new_bh, "reusing block"); + + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + error = -EDQUOT; + if (DQUOT_ALLOC_BLOCK(inode, 1)) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + unlock_buffer(new_bh); + goto cleanup; + } +@@ -749,7 +749,7 @@ ext2_xattr_set2(struct inode *inode, str + le32_to_cpu(HDR(old_bh)->h_refcount) - 1); + if (ce) + mb_cache_entry_release(ce); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + mark_buffer_dirty(old_bh); + ea_bdebug(old_bh, "refcount now=%d", +@@ -810,7 +810,7 @@ ext2_xattr_delete_inode(struct inode *in + mark_buffer_dirty(bh); + if (IS_SYNC(inode)) + sync_dirty_buffer(bh); +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + } + ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1); +Files linux-2.6.12.3-vs2.0/fs/ext3/.ialloc.c.swp and linux-2.6.12.3-vs2.0.0.1/fs/ext3/.ialloc.c.swp differ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c 2005-08-17 23:22:11 +0200 +@@ -505,7 +505,7 @@ void ext3_free_blocks(handle_t *handle, + } + ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks); + if (dquot_freed_blocks) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, dquot_freed_blocks); ++ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks); + DQUOT_FREE_BLOCK(inode, dquot_freed_blocks); + } + return; +@@ -1218,7 +1218,7 @@ int ext3_new_block(handle_t *handle, str + *errp = -EDQUOT; + return 0; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto out_dlimit; + + sbi = EXT3_SB(sb); +@@ -1421,7 +1421,7 @@ io_error: + *errp = -EIO; + out: + if (!performed_allocation) +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + out_dlimit: + if (fatal) { + *errp = fatal; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c 2005-08-17 23:26:01 +0200 +@@ -127,7 +127,7 @@ void ext3_free_inode (handle_t *handle, + */ + DQUOT_INIT(inode); + ext3_xattr_delete_inode(handle, inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + +@@ -448,7 +448,7 @@ struct inode *ext3_new_inode(handle_t *h + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto out; + } +@@ -606,27 +606,24 @@ got: + sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0; + + ret = inode; +- if(DQUOT_ALLOC_INODE(inode)) { ++ if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); + err = -EDQUOT; + goto fail2; + } + err = ext3_init_acl(handle, inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; + err = ext3_mark_inode_dirty(handle, inode); + if (err) { + ext3_std_error(sb, err); +- DQUOT_FREE_INODE(inode); +- goto fail2; ++ goto fail2_free; + } + + ext3_debug("allocating inode %lu\n", inode->i_ino); + goto really_out; + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + ext3_std_error(sb, err); + out: + iput(inode); +@@ -635,8 +632,10 @@ really_out: + brelse(bitmap_bh); + return ret; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext3/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c 2005-08-17 23:30:04 +0200 +@@ -496,7 +496,7 @@ ext3_xattr_release_block(handle_t *handl + ext3_journal_dirty_metadata(handle, bh); + if (IS_SYNC(inode)) + handle->h_sync = 1; +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + unlock_buffer(bh); + ea_bdebug(bh, "refcount now=%d; releasing", +@@ -766,7 +766,7 @@ inserted: + ea_bdebug(new_bh, "keeping"); + else { + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + /* The old block is released after updating + the inode. */ +@@ -849,7 +849,7 @@ cleanup: + cleanup_dquot: + DQUOT_FREE_BLOCK(inode, 1); + cleanup_dlimit: +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + goto cleanup; + + bad_block: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c 2005-08-17 23:45:37 +0200 +@@ -102,6 +102,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_filsys.h" +@@ -381,9 +382,11 @@ static u32 add_index(tid_t tid, struct i + * It's time to move the inline table to an external + * page and begin to build the xtree + */ +- if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage) || ++ if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage)) ++ goto clean_up; ++ if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage) || + dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) +- goto clean_up; /* No space */ ++ goto clean_up_dlim; /* No space */ + + /* + * Save the table, we're going to overwrite it with the +@@ -474,6 +477,9 @@ static u32 add_index(tid_t tid, struct i + + return index; + ++ clean_up_dlim: ++ DQUOT_FREE_BLOCK(ip, sbi->nbperpage); ++ + clean_up: + + jfs_ip->next_index--; +@@ -925,7 +931,8 @@ int dtInsert(tid_t tid, struct inode *ip + static int dtSplitUp(tid_t tid, + struct inode *ip, struct dtsplit * split, struct btstack * btstack) + { +- struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); ++ struct super_block *sb = ip->i_sb; ++ struct jfs_sb_info *sbi = JFS_SBI(sb); + int rc = 0; + struct metapage *smp; + dtpage_t *sp; /* split page */ +@@ -947,6 +954,7 @@ static int dtSplitUp(tid_t tid, + struct tlock *tlck; + struct lv *lv; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + /* get split page */ + smp = split->mp; +@@ -1028,6 +1036,12 @@ static int dtSplitUp(tid_t tid, + } + quota_allocation += n; + ++ if (DLIMIT_ALLOC_BLOCK(ip, n)) { ++ rc = -ENOSPC; ++ goto extendOut; ++ } ++ dlimit_allocation += n; ++ + if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen, + (s64) n, &nxaddr))) + goto extendOut; +@@ -1296,6 +1310,9 @@ static int dtSplitUp(tid_t tid, + freeKeyName: + kfree(key.name); + ++ /* Rollback dlimit allocation */ ++ if (rc && dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation */ + if (rc && quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1363,6 +1380,12 @@ static int dtSplitPage(tid_t tid, struct + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp); + +@@ -1913,6 +1936,12 @@ static int dtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + BT_MARK_DIRTY(rmp, ip); + /* +@@ -2279,6 +2308,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&fp->header.self); + ++ /* Free dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation. */ + DQUOT_FREE_BLOCK(ip, xlen); + +@@ -2355,6 +2386,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&p->header.self); + ++ /* Free dlimit allocation */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation */ + DQUOT_FREE_BLOCK(ip, xlen); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c 2004-10-23 05:06:16 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c 2005-08-17 23:46:44 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -151,6 +152,13 @@ extAlloc(struct inode *ip, s64 xlen, s64 + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + /* determine the value of the extent flag */ + xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0; +@@ -169,6 +177,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 + */ + if (rc) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + up(&JFS_IP(ip)->commit_sem); + return (rc); +@@ -266,6 +275,13 @@ int extRealloc(struct inode *ip, s64 nxl + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + delta = nxlen - xlen; + +@@ -302,6 +318,7 @@ int extRealloc(struct inode *ip, s64 nxl + /* extend the extent */ + if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) { + dbFree(ip, xaddr + xlen, delta); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +@@ -313,6 +330,7 @@ int extRealloc(struct inode *ip, s64 nxl + */ + if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c 2005-08-01 10:32:42 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c 2005-08-17 23:46:24 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include "jfs_incore.h" + #include "jfs_filsys.h" +@@ -61,12 +62,18 @@ struct inode *ialloc(struct inode *paren + mode |= S_ISGID; + } else + inode->i_gid = current->fsgid; ++ + inode->i_xid = vx_current_fsxid(sb); ++ if (DLIMIT_ALLOC_INODE(inode)) { ++ iput(inode); ++ return NULL; ++ } + + /* + * Allocate inode to quota. + */ + if (DQUOT_ALLOC_INODE(inode)) { ++ DLIMIT_FREE_INODE(inode); + DQUOT_DROP(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c 2005-08-17 23:45:13 +0200 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_filsys.h" + #include "jfs_metapage.h" +@@ -849,7 +850,12 @@ int xtInsert(tid_t tid, /* transaction + hint = 0; + if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen))) + goto out; ++ if ((rc = DLIMIT_ALLOC_BLOCK(ip, xlen))) { ++ DQUOT_FREE_BLOCK(ip, xlen); ++ goto out; ++ } + if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) { ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + goto out; + } +@@ -879,6 +885,7 @@ int xtInsert(tid_t tid, /* transaction + /* undo data extent allocation */ + if (*xaddrp == 0) { + dbFree(ip, xaddr, (s64) xlen); ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + } + return rc; +@@ -927,7 +934,6 @@ int xtInsert(tid_t tid, /* transaction + out: + /* unpin the leaf page */ + XT_PUTPAGE(mp); +- + return rc; + } + +@@ -1239,6 +1245,7 @@ xtSplitPage(tid_t tid, struct inode *ip, + struct tlock *tlck; + struct xtlock *sxtlck = NULL, *rxtlck = NULL; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + smp = split->mp; + sp = XT_PAGE(ip, smp); +@@ -1251,13 +1258,19 @@ xtSplitPage(tid_t tid, struct inode *ip, + rbn = addressPXD(pxd); + + /* Allocate blocks to quota. */ +- if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { + rc = -EDQUOT; + goto clean_up; + } +- + quota_allocation += lengthPXD(pxd); + ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ rc = -ENOSPC; ++ goto clean_up; ++ } ++ dlimit_allocation += lengthPXD(pxd); ++ + /* + * allocate the new right page for the split + */ +@@ -1459,6 +1472,9 @@ xtSplitPage(tid_t tid, struct inode *ip, + + clean_up: + ++ /* Rollback dlimit allocation. */ ++ if (dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation. */ + if (quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1523,6 +1539,12 @@ xtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp); + +@@ -3949,6 +3971,8 @@ s64 xtTruncate(tid_t tid, struct inode * + else + ip->i_size = newsize; + ++ /* update dlimit allocation to reflect freed blocks */ ++ DLIMIT_FREE_BLOCK(ip, nfreed); + /* update quota allocation to reflect freed blocks */ + DQUOT_FREE_BLOCK(ip, nfreed); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c +--- linux-2.6.12.3-vs2.0/fs/jfs/xattr.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c 2005-08-17 23:47:01 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -275,9 +276,16 @@ static int ea_write(struct inode *ip, st + if (DQUOT_ALLOC_BLOCK(ip, nblocks)) { + return -EDQUOT; + } ++ /* Allocate new blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) { ++ DQUOT_FREE_BLOCK(ip, nblocks); ++ return -ENOSPC; ++ } + + rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno); + if (rc) { ++ /*Rollback dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, nblocks); + /*Rollback quota allocation. */ <> From baggins at pld-linux.org Tue Aug 23 15:34:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: linux-2.6-vs2-BME.patch (NEW) - vserver bind mount extens... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:34:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - vserver bind mount extensions ---- Files affected: SOURCES: linux-2.6-vs2-BME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2-BME.patch diff -u /dev/null SOURCES/linux-2.6-vs2-BME.patch:1.1 --- /dev/null Tue Aug 23 15:34:03 2005 +++ SOURCES/linux-2.6-vs2-BME.patch Tue Aug 23 15:33:58 2005 @@ -0,0 +1,911 @@ +; +; http://vserver.13thfloor.at/Experimental/BME/delta-2.6.11.5-vs1.9.5.3-bme0.06.1.diff +; +; Bind Mount Extensions +; +; this patch adds some functionality to the --bind +; type of vfs mounts. +; +; (C) 2003-2004 Herbert P?tzl +; +; Changelog: +; +; 0.01 - readonly bind mounts +; 0.02 - added ro truncate handling +; - added ro (f)chown, (f)chmod handling +; 0.03 - added ro utime(s) handling +; - added ro access and *_ioctl +; 0.04 - added noatime and nodiratime +; - made autofs4 update_atime uncond +; 0.05 - rewrite regarding (a)time +; - adapted to new 2.6 vfs +; 0.05.1 check for *->mnt added +; +; this patch 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 patch 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. + +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c +--- linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c 2004-12-25 01:54:50 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c 2005-03-26 00:25:23 +0100 +@@ -362,7 +362,7 @@ static int report_statvfs(struct vfsmoun + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +@@ -398,7 +398,7 @@ static int report_statvfs64(struct vfsmo + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c 2005-03-23 21:34:31 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -29,7 +29,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETFLAGS: { + unsigned int oldflags; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -70,7 +71,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETVERSION: + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(inode->i_generation, (int __user *) arg)) + return -EFAULT; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c 2005-03-23 21:34:33 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -36,7 +36,8 @@ int ext3_ioctl (struct inode * inode, st + unsigned int oldflags; + unsigned int jflag; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -114,7 +115,8 @@ flags_err: + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(generation, (int __user *) arg)) + return -EFAULT; +@@ -165,7 +167,8 @@ flags_err: + if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode)) + return -ENOTTY; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -186,7 +189,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (get_user(n_blocks_count, (__u32 __user *)arg)) +@@ -207,7 +211,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg, +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -34,7 +34,8 @@ int hfsplus_ioctl(struct inode *inode, s + flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */ + return put_user(flags, (int __user *)arg); + case HFSPLUS_IOC_EXT2_SETFLAGS: { +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namei.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namei.c 2005-03-25 23:52:18 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c 2005-03-26 00:25:23 +0100 +@@ -242,7 +242,7 @@ int permission(struct inode *inode, int + /* + * Nobody gets write access to a read-only fs. + */ +- if (IS_RDONLY(inode) && ++ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) && + (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) + return -EROFS; + +@@ -1162,7 +1162,8 @@ static inline int check_sticky(struct in + * 10. We don't allow removal of NFS sillyrenamed files; it's handled by + * nfs_async_unlink(). + */ +-static inline int may_delete(struct inode *dir,struct dentry *victim,int isdir) ++static inline int may_delete(struct inode *dir, struct dentry *victim, ++ int isdir, struct nameidata *nd) + { + int error; + +@@ -1171,7 +1172,7 @@ static inline int may_delete(struct inod + + BUG_ON(victim->d_parent->d_inode != dir); + +- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); ++ error = permission(dir,MAY_WRITE | MAY_EXEC, nd); + if (error) + return error; + if (IS_APPEND(dir)) +@@ -1332,7 +1333,8 @@ int may_open(struct nameidata *nd, int a + return -EACCES; + + flag &= ~O_TRUNC; +- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE)) ++ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt)) ++ && (flag & FMODE_WRITE)) + return -EROFS; + /* + * An append-only file must be opened in append mode for writing. +@@ -1580,9 +1582,10 @@ fail: + } + EXPORT_SYMBOL_GPL(lookup_create); + +-int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) ++int vfs_mknod(struct inode *dir, struct dentry *dentry, ++ int mode, dev_t dev, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1624,7 +1627,6 @@ asmlinkage long sys_mknod(const char __u + goto out; + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); +- + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; + if (!IS_ERR(dentry)) { +@@ -1633,11 +1635,12 @@ asmlinkage long sys_mknod(const char __u + error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); + break; + case S_IFCHR: case S_IFBLK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode, +- new_decode_dev(dev)); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ new_decode_dev(dev), &nd); + break; + case S_IFIFO: case S_IFSOCK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ 0, &nd); + break; + case S_IFDIR: + error = -EPERM; +@@ -1655,9 +1658,10 @@ out: + return error; + } + +-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ++int vfs_mkdir(struct inode *dir, struct dentry *dentry, ++ int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1698,7 +1702,8 @@ asmlinkage long sys_mkdir(const char __u + if (!IS_ERR(dentry)) { + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; +- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); ++ error = vfs_mkdir(nd.dentry->d_inode, dentry, ++ mode, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1742,9 +1747,10 @@ void dentry_unhash(struct dentry *dentry + spin_unlock(&dcache_lock); + } + +-int vfs_rmdir(struct inode *dir, struct dentry *dentry) ++int vfs_rmdir(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 1); ++ int error = may_delete(dir, dentry, 1, nd); + + if (error) + return error; +@@ -1806,7 +1812,7 @@ asmlinkage long sys_rmdir(const char __u + dentry = lookup_hash(&nd.last, nd.dentry); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_rmdir(nd.dentry->d_inode, dentry); ++ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1817,9 +1823,10 @@ exit: + return error; + } + +-int vfs_unlink(struct inode *dir, struct dentry *dentry) ++int vfs_unlink(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 0); ++ int error = may_delete(dir, dentry, 0, nd); + + if (error) + return error; +@@ -1881,7 +1888,7 @@ asmlinkage long sys_unlink(const char __ + inode = dentry->d_inode; + if (inode) + atomic_inc(&inode->i_count); +- error = vfs_unlink(nd.dentry->d_inode, dentry); ++ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd); + exit2: + dput(dentry); + } +@@ -1900,9 +1907,10 @@ slashes: + goto exit2; + } + +-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode) ++int vfs_symlink(struct inode *dir, struct dentry *dentry, ++ const char *oldname, int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1944,7 +1952,8 @@ asmlinkage long sys_symlink(const char _ + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); ++ error = vfs_symlink(nd.dentry->d_inode, dentry, ++ from, S_IALLUGO, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1956,7 +1965,8 @@ out: + return error; + } + +-int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry) ++int vfs_link(struct dentry *old_dentry, struct inode *dir, ++ struct dentry *new_dentry, struct nameidata *nd) + { + struct inode *inode = old_dentry->d_inode; + int error; +@@ -1964,7 +1974,7 @@ int vfs_link(struct dentry *old_dentry, + if (!inode) + return -ENOENT; + +- error = may_create(dir, new_dentry, NULL); ++ error = may_create(dir, new_dentry, nd); + if (error) + return error; + +@@ -2028,7 +2038,8 @@ asmlinkage long sys_link(const char __us + new_dentry = lookup_create(&nd, 0); + error = PTR_ERR(new_dentry); + if (!IS_ERR(new_dentry)) { +- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); ++ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, ++ new_dentry, &nd); + dput(new_dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -2158,14 +2169,14 @@ int vfs_rename(struct inode *old_dir, st + if (old_dentry->d_inode == new_dentry->d_inode) + return 0; + +- error = may_delete(old_dir, old_dentry, is_dir); ++ error = may_delete(old_dir, old_dentry, is_dir, NULL); + if (error) + return error; + + if (!new_dentry->d_inode) + error = may_create(new_dir, new_dentry, NULL); + else +- error = may_delete(new_dir, new_dentry, is_dir); ++ error = may_delete(new_dir, new_dentry, is_dir, NULL); + if (error) + return error; + +@@ -2241,6 +2252,9 @@ static inline int do_rename(const char * + error = -EINVAL; + if (old_dentry == trap) + goto exit4; ++ error = -EROFS; ++ if (MNT_IS_RDONLY(newnd.mnt)) ++ goto exit4; + new_dentry = lookup_hash(&newnd.last, new_dir); + error = PTR_ERR(new_dentry); + if (IS_ERR(new_dentry)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namespace.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namespace.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c 2005-03-26 00:20:19 +0100 +@@ -252,24 +252,26 @@ static int show_vfsmnt(struct seq_file * + struct vfsmount *mnt = v; + int err = 0; + static struct proc_fs_info { +- int flag; +- char *str; ++ int s_flag; ++ int mnt_flag; ++ char *set_str; ++ char *unset_str; + } fs_info[] = { +- { MS_SYNCHRONOUS, ",sync" }, +- { MS_DIRSYNC, ",dirsync" }, +- { MS_MANDLOCK, ",mand" }, +- { MS_NOATIME, ",noatime" }, +- { MS_NODIRATIME, ",nodiratime" }, +- { MS_TAGXID, ",tagxid" }, +- { 0, NULL } +- }; +- static struct proc_fs_info mnt_info[] = { +- { MNT_NOSUID, ",nosuid" }, +- { MNT_NODEV, ",nodev" }, +- { MNT_NOEXEC, ",noexec" }, +- { 0, NULL } ++ { MS_RDONLY, MNT_RDONLY, "ro", "rw" }, ++ { MS_SYNCHRONOUS, 0, ",sync", NULL }, ++ { MS_DIRSYNC, 0, ",dirsync", NULL }, ++ { MS_MANDLOCK, 0, ",mand", NULL }, ++ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL }, ++ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL }, ++ { 0, MNT_NOSUID, ",nosuid", NULL }, ++ { 0, MNT_NODEV, ",nodev", NULL }, ++ { 0, MNT_NOEXEC, ",noexec", NULL }, ++ { MS_TAGXID, 0, ",tagxid", NULL }, ++ { 0, 0, NULL, NULL } + }; +- struct proc_fs_info *fs_infop; ++ struct proc_fs_info *p; ++ unsigned long s_flags = mnt->mnt_sb->s_flags; ++ int mnt_flags = mnt->mnt_flags; + + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return 0; +@@ -285,14 +287,15 @@ static int show_vfsmnt(struct seq_file * + seq_putc(m, ' '); + } + mangle(m, mnt->mnt_sb->s_type->name); +- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw"); +- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_sb->s_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); +- } +- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); ++ seq_putc(m, ' '); ++ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) { ++ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) { ++ if (p->set_str) ++ seq_puts(m, p->set_str); ++ } else { ++ if (p->unset_str) ++ seq_puts(m, p->unset_str); ++ } + } + if (mnt->mnt_flags & MNT_XID) + seq_printf(m, ",xid=%d", mnt->mnt_xid); +@@ -684,7 +687,8 @@ out_unlock: + /* + * do loopback mount. + */ +-static int do_loopback(struct nameidata *nd, char *old_name, xid_t xid, int flags) ++static int do_loopback(struct nameidata *nd, char *old_name, ++ xid_t xid, int flags, int mnt_flags) + { + struct nameidata old_nd; + struct vfsmount *mnt = NULL; +@@ -725,6 +729,7 @@ static int do_loopback(struct nameidata + spin_unlock(&vfsmount_lock); + } else + mntput(mnt); ++ mnt->mnt_flags = mnt_flags; + } + + up_write(¤t->namespace->sem); +@@ -1112,12 +1117,18 @@ long do_mount(char * dev_name, char * di + } + + /* Separate the per-mountpoint flags */ ++ if (flags & MS_RDONLY) ++ mnt_flags |= MNT_RDONLY; + if (flags & MS_NOSUID) + mnt_flags |= MNT_NOSUID; + if (flags & MS_NODEV) + mnt_flags |= MNT_NODEV; + if (flags & MS_NOEXEC) + mnt_flags |= MNT_NOEXEC; ++ if (flags & MS_NOATIME) ++ mnt_flags |= MNT_NOATIME; ++ if (flags & MS_NODIRATIME) ++ mnt_flags |= MNT_NODIRATIME; + flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE); + + if (vx_ccaps(VXC_SECURE_MOUNT)) +@@ -1136,7 +1147,7 @@ long do_mount(char * dev_name, char * di + retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, + data_page, xid); + else if (flags & MS_BIND) +- retval = do_loopback(&nd, dev_name, xid, flags); ++ retval = do_loopback(&nd, dev_name, xid, flags, mnt_flags); + else if (flags & MS_MOVE) + retval = do_move_mount(&nd, dev_name); + else +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c 2005-03-26 00:25:23 +0100 +@@ -773,7 +773,8 @@ static int is_atomic_open(struct inode * + if (nd->flags & LOOKUP_DIRECTORY) + return 0; + /* Are we trying to write to a read only partition? */ +- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) ++ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) && ++ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) + return 0; + return 1; + } +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c 2005-03-02 12:38:45 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c 2005-03-26 00:25:23 +0100 +@@ -1115,13 +1115,13 @@ nfsd_create(struct svc_rqst *rqstp, stru + err = vfs_create(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFDIR: +- err = vfs_mkdir(dirp, dchild, iap->ia_mode); ++ err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: +- err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); ++ err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL); + break; + default: + printk("nfsd: bad file type %o in nfsd_create\n", type); +@@ -1397,11 +1397,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str + else { + strncpy(path_alloced, path, plen); + path_alloced[plen] = 0; +- err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path_alloced, mode, NULL); + kfree(path_alloced); + } + } else +- err = vfs_symlink(dentry->d_inode, dnew, path, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path, mode, NULL); + + if (!err) { + if (EX_ISSYNC(fhp->fh_export)) +@@ -1459,7 +1461,7 @@ nfsd_link(struct svc_rqst *rqstp, struct + dold = tfhp->fh_dentry; + dest = dold->d_inode; + +- err = vfs_link(dold, dirp, dnew); ++ err = vfs_link(dold, dirp, dnew, NULL); + if (!err) { + if (EX_ISSYNC(ffhp->fh_export)) { + nfsd_sync_dir(ddir); +@@ -1620,9 +1622,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru + err = nfserr_perm; + } else + #endif +- err = vfs_unlink(dirp, rdentry); ++ err = vfs_unlink(dirp, rdentry, NULL); + } else { /* It's RMDIR */ +- err = vfs_rmdir(dirp, rdentry); ++ err = vfs_rmdir(dirp, rdentry, NULL); + } + + dput(rdentry); +@@ -1734,7 +1736,8 @@ nfsd_permission(struct svc_export *exp, + */ + if (!(acc & MAY_LOCAL_ACCESS)) + if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) { +- if (EX_RDONLY(exp) || IS_RDONLY(inode)) ++ if (EX_RDONLY(exp) || IS_RDONLY(inode) ++ || MNT_IS_RDONLY(exp->ex_mnt)) + return nfserr_rofs; + if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode)) + return nfserr_perm; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/open.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c +--- linux-2.6.11.5-vs1.9.5.3/fs/open.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c 2005-03-26 00:25:24 +0100 +@@ -244,7 +244,7 @@ static inline long do_sys_truncate(const + goto dput_and_out; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + error = -EPERM; +@@ -368,7 +368,7 @@ asmlinkage long sys_utime(char __user * + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + /* Don't worry, the checks are done in inode_change_ok() */ +@@ -425,7 +425,7 @@ long do_utimes(char __user * filename, s + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + <> From baggins at pld-linux.org Tue Aug 23 15:35:46 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: pam-allow_root_ttyS0.patch (REMOVED), pam-fPIC.patch (REM... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:35:46 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: pam-allow_root_ttyS0.patch (1.1 -> NONE) (REMOVED), pam-fPIC.patch (1.4 -> NONE) (REMOVED), pam-gcc4.patch (1.1 -> NONE) (REMOVED), pam-mail.patch (1.3 -> NONE) (REMOVED), pam-noinstalled.patch (1.1 -> NONE) (REMOVED), pam-selinux-1.patch (1.17 -> NONE) (REMOVED), pam-selinux.patch (1.1 -> NONE) (REMOVED), pam-tcpd-severity.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 15:42:37 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: lvm2.spec - no spaces in bconds In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:42:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - no spaces in bconds ---- Files affected: SPECS: lvm2.spec (1.59 -> 1.60) ---- Diffs: ================================================================ Index: SPECS/lvm2.spec diff -u SPECS/lvm2.spec:1.59 SPECS/lvm2.spec:1.60 --- SPECS/lvm2.spec:1.59 Wed Aug 10 00:06:29 2005 +++ SPECS/lvm2.spec Tue Aug 23 15:42:32 2005 @@ -39,7 +39,7 @@ BuildRequires: readline-devel Requires: device-mapper Requires: dlm >= 1.0-0.pre21.2 -%{?with_clvmd: Requires: gulm >= 1.0-0.pre26.2} +%{?with_clvmd:Requires: gulm >= 1.0-0.pre26.2} %{?with_selinux:Requires: libselinux >= 1.10} Obsoletes: lvm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -160,6 +160,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.60 2005/08/23 13:42:32 baggins +- no spaces in bconds + Revision 1.59 2005/08/09 22:06:29 areq - fix Requires without clvmd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lvm2.spec?r1=1.59&r2=1.60&f=u From romke at pld-linux.org Tue Aug 23 15:48:43 2005 From: romke at pld-linux.org (romke) Date: Tue Dec 20 09:39:14 2005 Subject: PLDWWW: FrontPage Message-ID: <20050823134843.3441.32436@korupcja.pld-linux.org> Author: romke Date: Tue Aug 23 13:48:43 2005 GMT Module: PLDWWW URL: http://www.pld-linux.org/FrontPage ---- Log message: News PLD Mugs ---- Page affected: FrontPage ---- Diffs: ================================================================ PLD is a free, RPM-based Linux distribution, aimed at the more advanced users and administrators, who accept the tradeoffs of using a system, that might require manual tweaking in exchange for much flexibility. Simultaneous support for a wide variety of architectures and non-conservative approach to RPM usage provides our users with a consistent environment on almost all available architectures. More details are available in the [:About:about] section. == News == + + === 23 August 2005 PLD Mugs === + We are preparing 360ml (12 1/4 oz) frosted glass mugs with PLD logo - [http://wojtaszek.name/kubki/ sign up for one]! === 6 July 2005 Forum back up === After a (too) long period of downtime, our [http://forum.pld-linux.org/ web forum] is again available. Unfortunately we're starting from zero, since the old data got definitively lost, so users need to reregister. We're sorry for the inconvenience and hope that everyone will find the new functionality useful. The forum currently looks raw, but that should change in the near future. From kosmo at pld-linux.org Tue Aug 23 16:01:51 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:14 2005 Subject: SOURCES: web-cyradm-locale.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:01:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-locale.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u /dev/null SOURCES/web-cyradm-locale.patch:1.1 --- /dev/null Tue Aug 23 16:01:50 2005 +++ SOURCES/web-cyradm-locale.patch Tue Aug 23 16:01:43 2005 @@ -0,0 +1,13 @@ +diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php +--- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 ++++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 +@@ -70,9 +70,6 @@ + putenv("LANG=" . $LANG); + putenv("LANGUAGE=" . $LANG); + +- // Specify location of translation tables +- bindtextdomain("web-cyradm", "./locale"); +- + // Choose domain + textdomain("web-cyradm"); + require_once WC_BASE . "/session.php"; ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:20 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: web-cyradm.spec (NEW) - initial release. In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:02:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial release. ---- Files affected: SPECS: web-cyradm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u /dev/null SPECS/web-cyradm.spec:1.1 --- /dev/null Tue Aug 23 16:02:20 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 16:02:14 2005 @@ -0,0 +1,136 @@ +# $Revision$, $Date$ +# +# TODO: +# - R: & BR: +# - better /etc/httpd/web-cyradm.conf +# - many more +# +%define version_major 0.5.4 +%define version_minor 1 +# +Summary: Cyrus-IMAP based mail accounts managment system. +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Name: web-cyradm +Version: %{version_major}.%{version_minor} +Release: 0.1 +Epoch: 0 +License: GPL +Group: Applications +Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Patch0: %{name}-locale.patch +# Source0-md5: d06dc16899680c29b94a5460709b5fe0 +URL: http://www.web-cyradm.org/ +Requires: mysql +Requires: webserver +Requires: php +Requires: php-gettext +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Web-cyradm is a software that glues topnotch mailing technologies +together. The software on which web-cyradm relies on is completely +free and opensource software. Web-cyradm is continously developed +further to expand its functionality and usability. + +Features: + - Administer multiple virtual domains + - Manage user-accounts + - Map useraccounts to emailadresses + - Create, delete and rename cyrus-imap mailboxes + - Setting of quotas for users and domains + - Delegation of some tasks to domain adminstrators + - Resetting password for accountusers by its domainadmins + and superusers + - Sieve functions like forwarding single e-mail adresses + and out-of-office replies + - Enable/Disable different services like imap, pop, sieve and stmp + for particular users + - Support for MySQL and PostgreSQL databases + - Storing passwords in crypt, md5 or MySQL passwd compatible format + +%description -l pl +Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Source w jeden du?y system pocztowy. + +Mo?liwo?ci: + - Administracja wieloma wirtualnymu domenami + - Zarz?dzanie kontami urzytkownik?w + - Mapowanie kont urzytkownik?w na adresy e-mail + - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Delegacja zada? do administrator?w domen + - Resetowanie hase? u?ytkownikom przez administrator?w domen + - Filtry poczty Sieve + - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w + - Wsparcie dla MySQL'a i PostgreSQL'a + - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() + +%prep +%setup -q -n %{name}-%{version_major}-%{version_minor} +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},httpd} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} +install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} + +install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf + +install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} +install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css +install images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images +install lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lib + +ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/config + +for i in locale/?? locale/??_??; do + install -d $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES + install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES +done + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi +fi + +%preun +if [ "$1" = "0" ]; then + umask 027 + if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi + fi +fi + +%files -f %{name}.lang +%defattr(644,root,root,755) +%doc ChangeLog COPYRIGHT INSTALL README README.translations TO-BE-DONE migrate.php-dist doc/* scripts +%dir %{_sysconfdir}/%{name} +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%{_datadir}/%{name} + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/23 14:02:14 kosmo +- initial release. + ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:18 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: web-cyradm-0.5.4-1.tar.gz Message-ID: <15611.1124805738@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.web-cyradm.org/web-cyradm-0.5.4-1.tar.gz d06dc16899680c29b94a5460709b5fe0 web-cyradm-0.5.4-1.tar.gz Size: 455900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:35:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): dbus.spec, gnome-system-tools.spec, gnome-vfs2.spec... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:35:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: ---- Files affected: SPECS: dbus.spec (1.90 -> 1.91) , gnome-system-tools.spec (1.46.2.3 -> 1.46.2.4) , gnome-vfs2.spec (1.157.2.10 -> 1.157.2.11) , gnome-volume-manager.spec (1.28 -> 1.29) , hal.spec (1.79 -> 1.80) , mlview.spec (1.34 -> 1.35) , streamtuner.spec (1.11 -> 1.12) , sylpheed.spec (1.167.2.1 -> 1.167.2.2) , system-tools-backends.spec (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.90&r2=1.91&f=u http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.3&r2=1.46.2.4&f=u http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.10&r2=1.157.2.11&f=u http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.79&r2=1.80&f=u http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.34&r2=1.35&f=u http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.1&r2=1.167.2.2&f=u http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.3&r2=1.7.2.4&f=u From paladine at pld-linux.org Tue Aug 23 16:35:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: gnome-system-tools-1.3.92.tar.bz2 Message-ID: <3195.1124807735@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/gnome-system-tools-1.3.92.tar.bz2 c51a1867e130d5cdb0e389be59867a83 gnome-system-tools-1.3.92.tar.bz2 Size: 1957351 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 16:37:00 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: eclipse-plugin-ajdt.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:37:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: eclipse-plugin-ajdt.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-ajdt.spec diff -u SPECS/eclipse-plugin-ajdt.spec:1.4 SPECS/eclipse-plugin-ajdt.spec:1.5 --- SPECS/eclipse-plugin-ajdt.spec:1.4 Wed Dec 1 16:21:39 2004 +++ SPECS/eclipse-plugin-ajdt.spec Tue Aug 23 16:36:55 2005 @@ -2,19 +2,19 @@ Summary: AJDT - aspectJ development tools Summary(pl): AJDT - narz?dzia programistyczne aspectJ Name: eclipse-plugin-ajdt -Version: 1.1.12 +Version: 1.3.0 Release: 1 License: CPL v0.5 Group: Development/Languages -Source0: http://download.eclipse.org/technology/ajdt/30/update/ajdt_%{version}_archive.zip -# Source0-md5: 80a9fcbdb18d5ca46340c011cf28f45a +Source0: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_%{version}.20050823115355_archive.zip +# Source0-md5: ae776fad1db899469c8a1aee9a5de752 URL: http://www.eclipse.org/ajdt/ BuildRequires: unzip -Requires: eclipse >= 3.0 +Requires: eclipse >= 3.1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _eclipsedir %{_datadir}/eclipse +%define _eclipsedir %{_libdir}/eclipse %description The AspectJ Development Tools (AJDT) project provides Eclipse platform @@ -40,8 +40,8 @@ %files %defattr(644,root,root,755) -%{_eclipsedir}/features/* -%{_eclipsedir}/plugins/* +%{_libdir}/eclipse/features/* +%{_libdir}/eclipse/plugins/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -49,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 14:36:55 pawcioos +- updated to 1.3.0 + Revision 1.4 2004/12/01 15:21:39 zbyniu - BR: unzip ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-ajdt.spec?r1=1.4&r2=1.5&f=u From pawcioos at pld-linux.org Tue Aug 23 16:38:20 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated to 3.0.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:38:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.0 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.13 SPECS/eclipse-plugin-cdt.spec:1.14 --- SPECS/eclipse-plugin-cdt.spec:1.13 Fri Jul 1 22:54:44 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 16:38:15 2005 @@ -28,31 +28,30 @@ %endif %endif -%define _rc RC1 Summary: CDT - a set of plugins for Eclipse that implement a C/C++ IDE Summary(pl): CDT - zestaw wtyczek do ?rodowiska Eclipse implementuj?cy IDE C/C++ Name: eclipse-plugin-cdt %define _ver_major 3.0 %define _ver_minor 0 Version: %{_ver_major}.%{_ver_minor} -Release: 0.%{_rc}.1 +Release: 0.1 License: CPL v1.0 Group: Development/Languages %if %{need_x86} -Source0: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86.tar.gz -# Source0-md5: 454b6e0279c83fd209d6ac839a459134 +Source0: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86.tar.gz +# Source0-md5: fd578bf9bcbcd89cdbf1480e792a5506 %endif %if %{need_ppc} -Source1: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ppc.tar.gz -# Source1-md5: 1e5e716bf6f0bfd56139c706d344142a +Source1: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ppc.tar.gz +# Source1-md5: 92e83865c079406a231114f3fea74aa0 %endif %if %{need_ia64} -Source2: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ia64.tar.gz +Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz # Source2-md5: 80ba477131beb0c0682019a7705b1cfe %endif %if %{need_x8664} -Source3: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86_64.tar.gz -# Source3-md5: 7d8e6c97e9a8055b0823292064f71dbd +Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz +# Source3-md5: 05f7bdaba4eb8fa0ac07c62c722a6f65 %endif URL: http://www.eclipse.org/cdt/ BuildRequires: unzip @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/23 14:38:15 pawcioos +- updated to 3.0.0 + Revision 1.13 2005/07/01 20:54:44 qboosh - incall enabled by default - updated ia64 md5 as well ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.13&r2=1.14&f=u From paladine at pld-linux.org Tue Aug 23 16:39:38 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: dbus.spec - added missing commit log - added BR: libselinux... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:39:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log - added BR: libselinux-devel ---- Files affected: SPECS: dbus.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.91 SPECS/dbus.spec:1.92 --- SPECS/dbus.spec:1.91 Tue Aug 23 16:35:14 2005 +++ SPECS/dbus.spec Tue Aug 23 16:39:33 2005 @@ -61,6 +61,7 @@ %{?with_qt:BuildRequires: qt-devel >= %{qt_version}} BuildRequires: rpmbuild(macros) >= 1.202 BuildRequires: sed >= 4.0 +BuildRequires: libselinux-devel >= 1.17.13 BuildRequires: xmlto PreReq: rc-scripts Requires: %{name}-libs = %{version}-%{release} @@ -344,7 +345,6 @@ --with-system-pid-file=%{_localstatedir}/run/dbus.pid \ --with-system-socket=%{_localstatedir}/lib/dbus-1/system_bus_socket \ --enable-selinux - %{__make} \ pythondir=%{py_sitedir} @@ -546,8 +546,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/23 14:39:33 paladine +- added missing commit log +- added BR: libselinux-devel + Revision 1.91 2005/08/23 14:35:14 paladine -*** empty log message *** +- added --enable-selinux to configure Revision 1.90 2005/08/02 16:18:30 jpc - add a patch fixing the dbus serializer type definitions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.91&r2=1.92&f=u From paladine at pld-linux.org Tue Aug 23 16:50:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:50:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.4 -> 1.46.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.4 SPECS/gnome-system-tools.spec:1.46.2.5 --- SPECS/gnome-system-tools.spec:1.46.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-system-tools.spec Tue Aug 23 16:50:22 2005 @@ -114,8 +114,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.5 2005/08/23 14:50:22 paladine +- added missing commit log + Revision 1.46.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- use more macros +- sorted files Revision 1.46.2.3 2005/08/18 11:03:33 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.4&r2=1.46.2.5&f=u From paladine at pld-linux.org Tue Aug 23 16:52:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:52:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.11 -> 1.157.2.12) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.11 SPECS/gnome-vfs2.spec:1.157.2.12 --- SPECS/gnome-vfs2.spec:1.157.2.11 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-vfs2.spec Tue Aug 23 16:51:55 2005 @@ -195,8 +195,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.12 2005/08/23 14:51:55 paladine +- added missing commit log + Revision 1.157.2.11 2005/08/23 14:35:15 paladine -*** empty log message *** +- itemize schemas Revision 1.157.2.10 2005/08/14 09:28:25 freetz - dropped patches: resolve_fstab_symlinks, user_visible_drives, get_volume_ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.11&r2=1.157.2.12&f=u From pawcioos at pld-linux.org Tue Aug 23 16:54:15 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:14 2005 Subject: DISTFILES: ajdt_1.3.0.20050823115355_archive.zip Message-ID: <4210.1124808855@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_1.3.0.20050823115355_archive.zip ae776fad1db899469c8a1aee9a5de752 ajdt_1.3.0.20050823115355_archive.zip Size: 15684941 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:56:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: gnome-volume-manager.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:56:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-volume-manager.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.29 SPECS/gnome-volume-manager.spec:1.30 --- SPECS/gnome-volume-manager.spec:1.29 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-volume-manager.spec Tue Aug 23 16:55:56 2005 @@ -96,8 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 14:55:56 paladine +- added missing commit log + Revision 1.29 2005/08/23 14:35:15 paladine -*** empty log message *** +- unpmountize +- itemize schemas Revision 1.28 2005/08/04 18:02:39 freetz - R: eject for CD volumes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Tue Aug 23 16:58:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: hal.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: hal.spec (1.80 -> 1.81) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.80 SPECS/hal.spec:1.81 --- SPECS/hal.spec:1.80 Tue Aug 23 16:35:15 2005 +++ SPECS/hal.spec Tue Aug 23 16:58:25 2005 @@ -230,8 +230,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81 2005/08/23 14:58:25 paladine +- added missing commit log + Revision 1.80 2005/08/23 14:35:15 paladine -*** empty log message *** +- back to fstab-sync +- enable verbose-mode Revision 1.79 2005/08/07 19:52:44 freetz - changelog typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.80&r2=1.81&f=u From paladine at pld-linux.org Tue Aug 23 17:00:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: mlview.spec - reverted accidental commit In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:00:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted accidental commit ---- Files affected: SPECS: mlview.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/mlview.spec diff -u SPECS/mlview.spec:1.35 SPECS/mlview.spec:1.36 --- SPECS/mlview.spec:1.35 Tue Aug 23 16:35:15 2005 +++ SPECS/mlview.spec Tue Aug 23 17:00:44 2005 @@ -2,36 +2,30 @@ Summary: XML Editor for GNOME Summary(pl): Edytor XML-a dla GNOME Name: mlview -Version: 0.9.0 -Release: 1 +Version: 0.7.1 +Release: 2 License: GPL Group: X11/Applications/Editors -Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.9/%{name}-%{version}.tar.bz2 -# Source0-md5: eb3722950af8d78556b197f23870adba +Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.7/%{name}-%{version}.tar.bz2 +# Source0-md5: 85383331e5bb6d59293cee5b86595284 Patch0: %{name}-locale-names.patch Patch1: %{name}-desktop.patch URL: http://www.freespiders.org/projects/gmlview/ BuildRequires: GConf2-devel >= 2.10.0 -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: dbus-devel >= 0.22 BuildRequires: eel-devel >= 2.10.0 BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 -BuildRequires: gnome-vfs2-devel >= 2.6.0 BuildRequires: gtk+2-devel >= 2:2.6.4 -BuildRequires: gktmm-devel >= 2.4.0 -BuildRequires: gktsourceview-devel >= 1.0.0 BuildRequires: intltool >= 0.33 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libglademm-devel >= 2.4.0 BuildRequires: libgnome-devel >= 2.10.0-2 -BuildRequires: libgnomeui-devel >= 2.2.0 +#BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libtool BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt >= 1.1.14 BuildRequires: rpmbuild(macros) >= 1.197 -BuildRequires: vte-devel >= 0.11.12 Requires(post): /sbin/ldconfig Requires(post,preun): GConf2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -107,8 +101,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.35 2005/08/23 14:35:15 paladine -*** empty log message *** +Revision 1.36 2005/08/23 15:00:44 paladine +- reverted accidental commit Revision 1.34 2005/04/18 10:22:51 paladine - no ldconfig_post{,un} macros, use %%postun -p ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.35&r2=1.36&f=u From paladine at pld-linux.org Tue Aug 23 17:02:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:14 2005 Subject: SPECS: streamtuner.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:02:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: streamtuner.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/streamtuner.spec diff -u SPECS/streamtuner.spec:1.12 SPECS/streamtuner.spec:1.13 --- SPECS/streamtuner.spec:1.12 Tue Aug 23 16:35:15 2005 +++ SPECS/streamtuner.spec Tue Aug 23 17:02:37 2005 @@ -224,8 +224,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 15:02:37 paladine +- added missing commit log + Revision 1.12 2005/08/23 14:35:15 paladine -*** empty log message *** +- removed todo +- works for me, rel. 1 Revision 1.11 2005/02/18 21:48:43 qboosh - missing defattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.12&r2=1.13&f=u From paladine at pld-linux.org Tue Aug 23 17:05:52 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:15 2005 Subject: DISTFILES: system-tools-backends-1.3.92.tar.bz2 Message-ID: <22092.1124809552@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/1.3/system-tools-backends-1.3.92.tar.bz2 fac8b7604603690e3e171086e42ba75b system-tools-backends-1.3.92.tar.bz2 Size: 705920 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 17:05:51 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS (DEVEL): system-tools-backends.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:05:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: system-tools-backends.spec (1.7.2.4 -> 1.7.2.5) ---- Diffs: ================================================================ Index: SPECS/system-tools-backends.spec diff -u SPECS/system-tools-backends.spec:1.7.2.4 SPECS/system-tools-backends.spec:1.7.2.5 --- SPECS/system-tools-backends.spec:1.7.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/system-tools-backends.spec Tue Aug 23 17:05:46 2005 @@ -61,8 +61,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7.2.5 2005/08/23 15:05:46 paladine +- added missing commit log + Revision 1.7.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- sorted %%files Revision 1.7.2.3 2005/08/09 11:52:46 aflinta - up to version 1.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.4&r2=1.7.2.5&f=u From paladine at pld-linux.org Tue Aug 23 17:07:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS (DEVEL): sylpheed.spec - updated to 2.1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:07:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.1.1 ---- Files affected: SPECS: sylpheed.spec (1.167.2.2 -> 1.167.2.3) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167.2.2 SPECS/sylpheed.spec:1.167.2.3 --- SPECS/sylpheed.spec:1.167.2.2 Tue Aug 23 16:35:15 2005 +++ SPECS/sylpheed.spec Tue Aug 23 17:07:26 2005 @@ -139,8 +139,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.167.2.3 2005/08/23 15:07:26 paladine +- updated to 2.1.1 + Revision 1.167.2.2 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 2.1.1 Revision 1.167.2.1 2005/08/14 18:31:50 freetz - starting developement on 2.1.x unstable series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.2&r2=1.167.2.3&f=u From paladine at pld-linux.org Tue Aug 23 17:07:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:15 2005 Subject: DISTFILES: sylpheed-2.1.1.tar.bz2 Message-ID: <22913.1124809662@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.1.tar.bz2 422db3499bec693f53673cf97f6ebb0c sylpheed-2.1.1.tar.bz2 Size: 2323547 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 17:27:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:15 2005 Subject: DISTFILES: ERRORS: org.eclipse.cdt-3.0.0-linux.x86.tar.gz org.eclipse.cdt-3.0.0-linux.ppc.tar.gz org.eclipse.cdt-3.0.0-linux.ia64.tar.gz org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Message-ID: <4975.1124810873@distfiles.pld-linux.org> FATAL: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ia64.tar.gz md5 mismatch, needed 80ba477131beb0c0682019a7705b1cfe, got ee07f4d21c3785e7d3b2b40b4669def0 Files fetched: 3 STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86.tar.gz fd578bf9bcbcd89cdbf1480e792a5506 org.eclipse.cdt-3.0.0-linux.x86.tar.gz Size: 11946636 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ppc.tar.gz 92e83865c079406a231114f3fea74aa0 org.eclipse.cdt-3.0.0-linux.ppc.tar.gz Size: 11949813 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz 05f7bdaba4eb8fa0ac07c62c722a6f65 org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Size: 11946896 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 17:59:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-vs2.patch - fix for removed fbsplash In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 15:59:17 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix for removed fbsplash ---- Files affected: SOURCES: linux-2.6-vs2.patch (1.1.2.6 -> 1.1.2.7) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2.patch diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.6 SOURCES/linux-2.6-vs2.patch:1.1.2.7 --- SOURCES/linux-2.6-vs2.patch:1.1.2.6 Sun Aug 7 02:14:10 2005 +++ SOURCES/linux-2.6-vs2.patch Tue Aug 23 17:59:11 2005 @@ -7572,10 +7572,10 @@ --- linux-2.6.12.3/include/linux/sysctl.h 2005-06-22 02:38:52 +0200 +++ linux-2.6.12.3-vs2.0-rc9/include/linux/sysctl.h 2005-08-01 10:32:45 +0200 @@ -136,6 +136,7 @@ enum + KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */ KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ KERN_RANDOMIZE=68, /* int: randomize virtual address space */ - KERN_FBSPLASH=69, /* string: path to fbsplash helper */ -+ KERN_VSHELPER=70, /* string: path to vshelper policy agent */ ++ KERN_VSHELPER=69, /* string: path to vshelper policy agent */ }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.patch?r1=1.1.2.6&r2=1.1.2.7&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:42 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: lms.spec - up to 1.6.3 (security update) In-Reply-To: References: Message-ID: Author: dzeus Date: Tue Aug 23 16:21:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.3 (security update) ---- Files affected: SPECS: lms.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/lms.spec diff -u SPECS/lms.spec:1.62 SPECS/lms.spec:1.63 --- SPECS/lms.spec:1.62 Thu Aug 11 17:20:59 2005 +++ SPECS/lms.spec Tue Aug 23 18:21:32 2005 @@ -8,17 +8,17 @@ # - cosmetics (sort in %%files and %%install) # - contrib split %define lmsver 1.6 -%define lmssubver 2 +%define lmssubver 3 Summary: LAN Managment System Summary(pl): System Zarz?dzania Sieci? Lokaln? Name: lms Version: %{lmsver}.%{lmssubver} -Release: 0.1 +Release: 1 License: GPL Vendor: LMS Developers Group: Networking/Utilities Source0: http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz -# Source0-md5: 36700215ccdb81674d183b7531d1a00c +# Source0-md5: 07619fbe576c6801fdb82d5a73fbb1ae Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig @@ -318,6 +318,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/23 16:21:32 dzeus +- up to 1.6.3 (security update) + Revision 1.62 2005/08/11 15:20:59 dzeus - up to 1.6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lms.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:51 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:39:15 2005 Subject: DISTFILES: lms-1.6.3.tar.gz Message-ID: <1322.1124814111@distfiles.pld-linux.org> Files fetched: 1 STORED: http://lms.rulez.pl/download/1.6/lms-1.6.3.tar.gz 07619fbe576c6801fdb82d5a73fbb1ae lms-1.6.3.tar.gz Size: 1980733 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Tue Aug 23 18:26:57 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: rc-scripts/trunk/rc.d/init.d/network Message-ID: <6327@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:26:48 2005 New Revision: 6327 Modified: rc-scripts/trunk/rc.d/init.d/network Log: [a-z] doesn't always mean whole alphabet (for example et_EE locale). Use C locale when searching. (Patch by Elan Ruusam?e) Modified: rc-scripts/trunk/rc.d/init.d/network ============================================================================== --- rc-scripts/trunk/rc.d/init.d/network (original) +++ rc-scripts/trunk/rc.d/init.d/network Tue Aug 23 18:26:48 2005 @@ -134,7 +134,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -143,7 +143,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep 'ifcfg-(.*)\.(.*)' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -151,7 +151,7 @@ interfaces_br_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-br* | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -159,7 +159,7 @@ interfaces_sit_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-sit* | \ - egrep 'ifcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -167,7 +167,7 @@ fi tunnels=$((cd /etc/sysconfig/interfaces && ls -1 tnlcfg-* | \ xargs egrep -l "ONBOOT=[^n][^o]" | \ - egrep 'tnlcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'tnlcfg-[a-z0-9]+$' | \ awk ' { gsub(/tnlcfg-/,NIL); print $0 } ') 2> /dev/null) # See how we were called. From cvs at pld-linux.org Tue Aug 23 18:28:27 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: rc-scripts/trunk/inittab Message-ID: <6328@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:28:24 2005 New Revision: 6328 Modified: rc-scripts/trunk/inittab Log: Example for agetty on serial port. Modified: rc-scripts/trunk/inittab ============================================================================== --- rc-scripts/trunk/inittab (original) +++ rc-scripts/trunk/inittab Tue Aug 23 18:28:24 2005 @@ -45,6 +45,8 @@ # If power was restored before the shutdown kicked in, cancel it. pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" +# Run agetty on serial port +# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels 1:12345:respawn:/sbin/mingetty --noclear tty1 From cvs at pld-linux.org Tue Aug 23 18:29:41 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: rc-scripts/trunk/sysconfig/interfaces: data/chat-ppp0.gprs-plusgsm ifcfg-ppp0.gprs-plusgsm Message-ID: <6329@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:29:35 2005 New Revision: 6329 Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Log: Fixed PlusGSM examples. (Patch by Pawe? Go?aszewski) Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -1,6 +1,9 @@ -ABORT BUSY -ABORT ERROR +ABORT "BUSY" +ABORT "ERROR" ABORT "NO CARRIER" +ABORT "NO DIALTONE" +ABORT "NO ANSWER" +ABORT "Username/Password Incorrect" "" AT -OK-AT-OK ATD"$PHONE" +OK-AT-OK ATDT"$PHONE" CONNECT Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -16,8 +16,8 @@ #ACTIVEFILTER= #IDLE= PHONE='*99***1#' -USER=ppp -PASSWORD=ppp +USER=plusgsm +PASSWORD=plusgsm #INITSTRING=ATe0s2=255 DATAFORCHAT="USER PASSWORD INITSTRING PHONE" From cvs at pld-linux.org Tue Aug 23 18:32:52 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: rc-scripts/trunk: ChangeLog configure.ac Message-ID: <6330@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:32:43 2005 New Revision: 6330 Modified: rc-scripts/trunk/ChangeLog rc-scripts/trunk/configure.ac Log: Update for 0.4.0.20. Modified: rc-scripts/trunk/ChangeLog ============================================================================== --- rc-scripts/trunk/ChangeLog (original) +++ rc-scripts/trunk/ChangeLog Tue Aug 23 18:32:43 2005 @@ -1,3 +1,115 @@ +2005-08-23 16:29 +0000 [r6327-6329] Arkadiusz Mi?kiewicz + + * sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm, + sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm: Fixed PlusGSM + examples. (Patch by Pawe? Go?aszewski) + + * inittab: Example for agetty on serial port. + + * rc.d/init.d/network: [a-z] doesn't always mean whole alphabet + (for example et_EE locale). Use C locale when searching. (Patch + by Elan Ruusam?e) + +2005-08-15 22:45 +0000 [r6315] Jan R?korajski + + * rc.d/init.d/cpusets: - don't spew errors on stdout - inform about + failurse + +2005-08-14 18:32 +0000 [r6311] Tomasz Wittner + + * DEVELOPMENT: - typo in enumeration + +2005-08-13 23:06 +0000 [r6307-6310] Jan R?korajski + + * rc.d/init.d/cpusets: - added echo for better status readability + + * rc.d/init.d/cpusets: - properly test cpuset dir for status + display + + * rc.d/init.d/cpusets: - properly escape message + + * rc.d/init.d/cpusets: - use show() when creating/removing cpusets + +2005-08-13 22:58 +0000 [r6306] Jan R?korajski + + * rc.d/init.d/cpusets: - typo + +2005-08-13 22:34 +0000 [r6305] Jan R?korajski + + * rc.d/init.d/functions: - take CPUSETS setting into account + +2005-08-13 22:00 +0000 [r6304] Jan R?korajski + + * rc.d/rc.sysinit: - mount cpuset filesystem if kernel capable + +2005-08-11 17:43 +0000 [r6300] Jan R?korajski + + * doc/sysconfig.txt, doc/sysconfig.docb: - added description for + available per-service settings + +2005-08-11 17:11 +0000 [r6299] Jan R?korajski + + * rc-scripts.spec.in: - cpusets added + +2005-08-11 17:04 +0000 [r6297-6298] Jan R?korajski + + * rc.d/init.d/Makefile.am: - cpusets script added + + * configure.ac: - sysconfig/cpusets/Makefile added + +2005-08-11 16:58 +0000 [r6294-6296] Jan R?korajski + + * po/pl.po: - final touch + + * po/pl.po: - updated + + * rc.d/init.d/functions: - added some code for completness + +2005-08-11 16:36 +0000 [r6293] Jan R?korajski + + * rc.d/init.d/cpusets: - defile cpuset settings as local in + function + +2005-08-11 16:35 +0000 [r6292] Arkadiusz Mi?kiewicz + + * rc.d/init.d/functions: filter_chroot(): Do not filter pids for + processes that no longer exists. We don't know whether these were + from current (ch)root so we assume that they were. + +2005-08-11 16:23 +0000 [r6291] Jan R?korajski + + * rc.d/init.d/functions: - added cpuset support to daemon and + status functions + +2005-08-10 20:10 +0000 [r6290] Jan R?korajski + + * sysconfig/system, sysconfig/cpusets/cpuset-test (added), + sysconfig/Makefile.am, rc.d/init.d/cpusets (added), + sysconfig/cpusets/Makefile.am (added): - CPUSETS support (work in + progress) + +2005-08-10 19:49 +0000 [r6289] Jan R?korajski + + * sysconfig/cpusets (added): - a place for cpusets config files + +2005-08-08 21:53 +0000 [r6288] Andrzej Dopiera?a + + * rc.d/init.d/network: - get only tnlcfg-name, not tnlcfg-name~ + +2005-07-27 09:09 +0000 [r6229] Arkadiusz Mi?kiewicz + + * sysconfig/network-scripts/ifup: ifup: Handle special + pcmcia-hotplug case. + +2005-07-21 22:35 +0000 [r6226] Andrzej Dopiera?a + + * rc.d/init.d/network: - first up bridge, next tunnels (tunnels can + be on bridges) - first down tunnels, next bridge ;) + +2005-05-30 18:54 +0000 [r6028] Arkadiusz Mi?kiewicz + + * configure.ac: Release 0.4.0.19. + 2005-05-30 18:47 +0000 [r6027] Arkadiusz Mi?kiewicz * sysconfig/network-scripts/ifup: Understand BOOTPROTO=static Modified: rc-scripts/trunk/configure.ac ============================================================================== --- rc-scripts/trunk/configure.ac (original) +++ rc-scripts/trunk/configure.ac Tue Aug 23 18:32:43 2005 @@ -1,6 +1,6 @@ dnl $Id$ -AC_INIT(["rc-scripts"], [0.4.0.19], [pld-rc-scripts@pld-linux.org], [rc-scripts]) +AC_INIT(["rc-scripts"], [0.4.0.20], [pld-rc-scripts@pld-linux.org], [rc-scripts]) AM_INIT_AUTOMAKE ALL_LINGUAS="pl de" From cvs at pld-linux.org Tue Aug 23 18:33:37 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: rc-scripts/tags/0.4.0.20 Message-ID: <6331@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:33:34 2005 New Revision: 6331 Added: rc-scripts/tags/0.4.0.20/ - copied from rev 6330, rc-scripts/trunk/ Log: Released 0.4.0.20. From glen at pld-linux.org Tue Aug 23 18:45:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec - use non-expanding heredoc redirecti... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:45:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use non-expanding heredoc redirection for readiness ---- Files affected: SPECS: macromedia-flash.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.24 SPECS/macromedia-flash.spec:1.25 --- SPECS/macromedia-flash.spec:1.24 Fri Jan 21 23:21:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:45:34 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla}.1 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -82,38 +82,37 @@ %if ! %{with license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install +cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install #!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/%{base_name}.spec ]; then BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev + mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" else - cp -f "\$3" . + cp -f "$3" . fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 + cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 else - cp -i "\$3" \$SPECDIR || exit 1 + cp -i "$3" $SPECDIR || exit 1 fi - ( cd \$SPECDIR + ( cd $SPECDIR %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then + if [ "$?" -ne 0 ]; then exit 2 fi RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm @@ -121,28 +120,27 @@ RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm RPMNAMES= if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=\$RPMDIR/\$RPMNAME1 - echo "Installing \$RPMNAME1" + RPMNAMES=$RPMDIR/$RPMNAME1 + echo "Installing $RPMNAME1" else - echo "Not installing \$RPMNAME1" + echo "Not installing $RPMNAME1" fi if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" + echo "Installing $RPMNAME2" else - echo "Not installing \$RPMNAME2" + echo "Not installing $RPMNAME2" fi if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME3" - echo "Installing \$RPMNAME3" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" + echo "Installing $RPMNAME3" else - echo "Not installing \$RPMNAME3" + echo "Not installing $RPMNAME3" fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/%{base_name}.spec.prev ]; then + mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec fi fi else @@ -151,7 +149,7 @@ this package by default. If you want to create full working package please build it with the following command: -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec +$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " fi EOF @@ -224,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/23 16:45:34 glen +- use non-expanding heredoc redirection for readiness + Revision 1.24 2005/01/21 22:21:34 qboosh - don't mention netraider, it's dead @@ -289,7 +290,7 @@ - updated to version 6.0.79.0 Revision 1.4 2003/03/04 10:47:30 grabba -added bcond to build in RA environment +- added bcond to build in RA environment Revision 1.3 2003/01/13 10:09:05 adgor - Prefix /usr @@ -318,7 +319,7 @@ - Release 2 Revision 1.6 2002/10/28 12:09:55 grabba -tested with mozilla 1.0 +- tested with mozilla 1.0 Revision 1.5 2002/10/28 10:56:25 misiek - updated to 6.0 beta @@ -327,7 +328,7 @@ - updated to 5.0r51 Revision 1.3 2002/08/18 12:34:00 blues -license fix +- license fix Revision 1.2 2002/08/12 18:27:34 blues - 5.0r50 - SECURITY update @@ -337,13 +338,13 @@ - License forbids distribution! Revision 1.12 2002/04/25 16:18:26 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/04/18 10:47:33 misiek -5.0r48 (still doesn't work with mozilla 0.9.9 +- 5.0r48 (still doesn't work with mozilla 0.9.9 Revision 1.10 2002/03/27 11:05:59 roman -s/Distribuable/distributable in License +- s/Distribuable/distributable in License Revision 1.9 2002/03/24 02:04:52 blues - s/Exclude/Exclusive/ @@ -356,13 +357,13 @@ Group field using gettext). Revision 1.6 2002/01/28 10:31:00 marcus --s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.5 2002/01/18 02:12:57 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.4 2001/07/12 14:07:53 kloczek -- ExcludeArch: %%{ix86} +- ExcludeArch: %{ix86} Revision 1.3 2001/07/12 14:04:47 kloczek - cosmetics and some minor changes in macros using. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.24&r2=1.25&f=u From glen at pld-linux.org Tue Aug 23 18:47:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:47:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: macromedia-flash.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.25 SPECS/macromedia-flash.spec:1.26 --- SPECS/macromedia-flash.spec:1.25 Tue Aug 23 18:45:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:47:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.1 +Release: 2%{?with_license_agreement:wla}.2 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -79,7 +79,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -169,7 +169,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -194,7 +194,7 @@ MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if ! %{with license_agreement} +%if %{without license_agreement} %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{base_name}.install @@ -222,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/23 16:47:51 glen +- use without macro + Revision 1.25 2005/08/23 16:45:34 glen - use non-expanding heredoc redirection for readiness ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.25&r2=1.26&f=u From arekm at pld-linux.org Tue Aug 23 18:50:37 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: CVSROOT: loginfo Drop old stuff. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:50:37 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Drop old stuff. ---- Files affected: CVSROOT: loginfo (1.194 -> 1.195) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.194 CVSROOT/loginfo:1.195 --- CVSROOT/loginfo:1.194 Thu Feb 3 17:42:53 2005 +++ CVSROOT/loginfo Tue Aug 23 18:50:32 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m ser-cvs@it-zone.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.194&r2=1.195&f=u From arekm at pld-linux.org Tue Aug 23 18:51:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:51:47 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.13 -> 1.14) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.13 test/plik:1.14 --- test/plik:1.13 Tue Feb 1 20:38:34 2005 +++ test/plik Tue Aug 23 18:51:42 2005 @@ -1,3 +1,4 @@ +alala 1112 4682 85 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.13&r2=1.14&f=u From arekm at pld-linux.org Tue Aug 23 18:57:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:57:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.14 -> 1.15) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.14 test/plik:1.15 --- test/plik:1.14 Tue Aug 23 18:51:42 2005 +++ test/plik Tue Aug 23 18:57:24 2005 @@ -1,3 +1,4 @@ +test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 18:58:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:05 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.15 -> 1.16) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.15 test/plik:1.16 --- test/plik:1.15 Tue Aug 23 18:57:24 2005 +++ test/plik Tue Aug 23 18:58:00 2005 @@ -1,4 +1,5 @@ test1 +test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.15&r2=1.16&f=u From arekm at pld-linux.org Tue Aug 23 18:58:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test3 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:25 2005 GMT Module: test Tag: HEAD ---- Log message: - test3 ---- Files affected: test: plik (1.16 -> 1.17) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.16 test/plik:1.17 --- test/plik:1.16 Tue Aug 23 18:58:00 2005 +++ test/plik Tue Aug 23 18:58:20 2005 @@ -1,5 +1,6 @@ test1 test2 +test3 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.16&r2=1.17&f=u From glen at pld-linux.org Tue Aug 23 19:02:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: gplflash.spec - typos fixed In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:02:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typos fixed ---- Files affected: SPECS: gplflash.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.8 SPECS/gplflash.spec:1.9 --- SPECS/gplflash.spec:1.8 Wed Aug 17 23:05:16 2005 +++ SPECS/gplflash.spec Tue Aug 23 19:02:05 2005 @@ -78,7 +78,7 @@ Obsoletes: mozilla-plugin-gplflash Requires: browser-plugins -# use macro, otherwise extra LF isinserted along with the ifarch +# use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 %define browsers mozilla, mozilla-firefox, opera, konqueror %else @@ -145,7 +145,7 @@ %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libnpflash.so %ifarch %{ix86} ppc sparc sparc64 -%triggerin -n browser-plugin-%{name} -n browser-plugin-%{name} -- opera +%triggerin -n browser-plugin-%{name} -- opera %nsplugin_install -d %{_libdir}/opera/plugins libnpflash.so %triggerun -n browser-plugin-%{name} -- opera @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 17:02:05 glen +- typos fixed + Revision 1.8 2005/08/17 21:05:16 qboosh - pl update ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Tue Aug 23 19:12:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: CVSROOT: ciabot.pl Updated to latest version. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:12:15 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Updated to latest version. ---- Files affected: CVSROOT: ciabot.pl (1.9 -> 1.10) ---- Diffs: ================================================================ Index: CVSROOT/ciabot.pl diff -u CVSROOT/ciabot.pl:1.9 CVSROOT/ciabot.pl:1.10 --- CVSROOT/ciabot.pl:1.9 Sun Jan 4 17:55:22 2004 +++ CVSROOT/ciabot.pl Tue Aug 23 19:12:10 2005 @@ -12,32 +12,45 @@ # Free Software Foundation. # # The master location of this file is -# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# +# This version has been modified a bit, and is available on CIA's web site: +# http://cia.navi.cx/clients/cvs/ciabot_cvs.pl # # This program is designed to run from the loginfo CVS administration file. It # takes a log message, massaging it and mailing it to the address given below. # # Its record in the loginfo file should look like: # -# ALL $CVSROOT/CVSROOT/ciabot.pl %s $USER project from_email dest_email +# ALL /usr/bin/perl $CVSROOT/CVSROOT/ciabot_cvs.pl %{,,,s} $USER project from_email dest_email ignore_regexp +# +# IMPORTANT: The %{,,,s} in loginfo is new, and is required for proper operation. # -# Note that the last three parameters are optional, you can alternatively change -# the defaults below in the configuration section. +# Make sure that you add the script to 'checkoutlist' before +# committing it. You may need to change /usr/bin/perl to point to your +# system's perl binary. # -# If it does not work, try to disable $xml_rpc in the configuration section -# below. +# Note that the last four parameters are optional, you can alternatively +# change the defaults below in the configuration section. # -# $Id$ use strict; -use vars qw ($project $from_email $dest_email $rpc_uri @sendmail $sync_delay $xml_rpc); - - +use vars qw ($project $from_email $dest_email $rpc_uri $sendmail $sync_delay + $xml_rpc $ignore_regexp $alt_local_message_target); ### Configuration # Project name (as known to CIA). +# +# NOTE: This shouldn't be a long description of your project. Ideally +# it is a short identifier with no spaces, punctuation, or +# unnecessary capitalization. This will be used in URLs related +# to your project, as an internal identifier, and in IRC messages. +# If you want a longer name shown for your project on the web +# interface, please use the "title" metadata key rather than +# putting that here. +# $project = 'pld'; # The from address in generated mails. @@ -49,25 +62,48 @@ # If using XML-RPC, connect to this URI. $rpc_uri = 'http://cia.navi.cx/RPC2'; -# Path to your sendmail binary. If you have it at a different place (and -# outside of $PATH), add your location at the start of this list. By all means -# keep the trailing empty string in the array. -@sendmail = ('sendmail', '/usr/lib/sendmail', '/usr/sbin/sendmail', ''); +# Path to your USCD sendmail compatible binary (your mailer daemon created this +# program somewhere). +$sendmail = '/usr/sbin/sendmail'; # Number of seconds to wait for possible concurrent instances. CVS calls up # this script for each involved directory separately and this is the sync # delay. 5s looks as a safe value, but feel free to increase if you are running # this on a slower (or overloaded) machine or if you have really a lot of # directories. +# Increasing this could be a very good idea if you're on Sourceforge ;) $sync_delay = 5; # This script can communicate with CIA either by mail or by an XML-RPC # interface. The XML-RPC interface is faster and more efficient, however you # need to have RPC::XML perl module installed, and some large CVS hosting sites # (like Savannah or Sourceforge) might not allow outgoing HTTP connections -# while they allow outgoing mail. +# while they allow outgoing mail. Also, this script will hang and eventually +# not deliver the event at all if CIA server happens to be down, which is +# unfortunately not an uncommon condition. $xml_rpc = 0; +# You can make this bot to totally ignore events concerning the objects +# specified below. Each object is composed of //, +# therefore file Manifest in root directory of module gentoo will be called +# "gentoo/Manifest", while file src/bfu/inphist.c of module elinks will be +# called "elinks/src/bfu/inphist.c". Easy, isn't it? +# +# This variable should contain regexp, against which will each object be +# checked, and if the regexp is matched, the file is ignored. Therefore ie. to +# ignore all changes in the two files above and everything concerning module +# 'admin', use: +# +# $ignore_regexp = "^(gentoo/Manifest|elinks/src/bfu/inphist.c|admin/)"; +$ignore_regexp = ""; + +# It can be useful to also grab the generated XML message by some other +# programs and ie. autogenerate some content based on it. Here you can specify +# a file to which it will be appended. +$alt_local_message_target = ""; + + + ### The code itself @@ -78,6 +114,16 @@ # affected in each directory +# A nice nonprinting character we can use as a separator relatively safely. +# The commas in loginfo above give us 4 commas and a space between file +# names given to us on the command line. This is the separator used internally. +# Now we can handle filenames containing spaces, and probably anything except +# strings of 4 commas or the ASCII bell character. +# +# This was inspired by the suggestion in: +# http://mail.gnu.org/archive/html/info-cvs/2003-04/msg00267.html +# +$" = "\7"; ### Input data loading @@ -85,7 +131,7 @@ # These arguments are from %s; first the relative path in the repository # and then the list of files modified. -@files = split (' ', ($ARGV[0] or '')); +@files = split (' ,,,', ($ARGV[0] or '')); $dir[0] = shift @files or die "$0: no directory specified\n"; $dirfiles[0] = "@files" or die "$0: no files specified\n"; @@ -97,6 +143,7 @@ # Figure out who is doing the update. +# $user = $ARGV[1]; $user = $ENV{'CVS_USER'} || $ENV{'CVS_USERNAME'} || $ENV{'CVSUSER'} || getlogin || (getpwuid($<))[0] || "nobody"; @@ -105,6 +152,7 @@ $project = $ARGV[2] if $ARGV[2]; $from_email = $ARGV[3] if $ARGV[3]; $dest_email = $ARGV[4] if $ARGV[4]; +$ignore_regexp = $ARGV[5] if $ARGV[5]; # Parse stdin (what's interesting is the tag and log message) @@ -114,11 +162,25 @@ last if /^Log Message/; } +$logmsg = ""; while () { next unless ($_ and $_ ne "\n" and $_ ne "\r\n"); + s/&/&/g; + s//>/g; $logmsg .= $_; } +### Remove to-be-ignored files + +$dirfiles[0] = join (' ', + grep { + my $f = "$module/$dir[0]/$_"; + $f !~ m/$ignore_regexp/; + } split (/\s+/, $dirfiles[0]) +) if ($ignore_regexp); +exit unless $dirfiles[0]; + ### Sync between the multiple instances potentially being ran simultanously @@ -126,6 +188,7 @@ my $sum; # _VERY_ simple hash of the log message. It is really weak, but I'm # lazy and it's really sorta exceptional to even get more commits # running simultanously anyway. +$sum = 0; map { $sum += ord $_ } split(//, $logmsg); my $syncfile; # Name of the file used for syncing @@ -173,7 +236,8 @@ ### Compose the mail message -my ($VERSION) = '$Revision$' =~ / (\d+\.\d+) /; +my ($VERSION) = '2.3'; +my ($URL) = 'http://cia.navi.cx/clients/cvs/ciabot_cvs.pl'; my $ts = time; $message = < CIA Perl client for CVS $VERSION - http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl + $URL $project @@ -205,11 +269,11 @@ map { $_ = $dir[$dirnum] . '/' . $_; s#^.*?/##; # weed out the module name - s/ / /g; + s/&/&/g; s//>/g; $message .= " $_\n"; - } split(/ /, $dirfiles[$dirnum]); + } split($", $dirfiles[$dirnum]); } $message .= <>$alt_local_message_target")) { + print ALT $message; + close ALT; +} + + + ### Send out the XML-RPC message @@ -254,10 +327,7 @@ # Open our mail program -foreach my $sendmail (@sendmail) { - die "$0: cannot fork sendmail: $!\n" unless ($sendmail); - open (MAIL, "| $sendmail -t -oi -oem") and last; -} +open (MAIL, "| $sendmail -t -oi -oem") or die "Cannot execute $sendmail : " . ($?>>8); # The mail header @@ -276,6 +346,6 @@ # Close the mail close MAIL; -die "$0: sendmail exit status " . $? >> 8 . "\n" unless ($? == 0); +die "$0: sendmail exit status " . ($? >> 8) . "\n" unless ($? == 0); # vi: set sw=2: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/ciabot.pl?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Tue Aug 23 19:13:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test4 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:13:13 2005 GMT Module: test Tag: HEAD ---- Log message: - test4 ---- Files affected: test: plik (1.17 -> 1.18) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.17 test/plik:1.18 --- test/plik:1.17 Tue Aug 23 18:58:20 2005 +++ test/plik Tue Aug 23 19:13:08 2005 @@ -1,6 +1,7 @@ test1 test2 test3 +test4 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.17&r2=1.18&f=u From pawcioos at pld-linux.org Tue Aug 23 19:14:03 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated md5 for Source2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 17:14:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 for Source2 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.14 SPECS/eclipse-plugin-cdt.spec:1.15 --- SPECS/eclipse-plugin-cdt.spec:1.14 Tue Aug 23 16:38:15 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 19:13:58 2005 @@ -47,7 +47,7 @@ %endif %if %{need_ia64} Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz -# Source2-md5: 80ba477131beb0c0682019a7705b1cfe +# Source2-md5: ee07f4d21c3785e7d3b2b40b4669def0 %endif %if %{need_x8664} Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/23 17:13:58 pawcioos +- updated md5 for Source2 + Revision 1.14 2005/08/23 14:38:15 pawcioos - updated to 3.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 19:16:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: CVSROOT: loginfo Fix for new ciabot.pl. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Fix for new ciabot.pl. ---- Files affected: CVSROOT: loginfo (1.195 -> 1.196) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.195 CVSROOT/loginfo:1.196 --- CVSROOT/loginfo:1.195 Tue Aug 23 18:50:32 2005 +++ CVSROOT/loginfo Tue Aug 23 19:16:05 2005 @@ -30,5 +30,5 @@ #^test /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -ALL /cvsroot/CVSROOT/ciabot.pl %s +ALL /cvsroot/CVSROOT/ciabot.pl %{,,,s} ALL /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.195&r2=1.196&f=u From arekm at pld-linux.org Tue Aug 23 19:16:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test5 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:52 2005 GMT Module: test Tag: HEAD ---- Log message: - test5 ---- Files affected: test: plik (1.18 -> 1.19) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.18 test/plik:1.19 --- test/plik:1.18 Tue Aug 23 19:13:08 2005 +++ test/plik Tue Aug 23 19:16:47 2005 @@ -2,6 +2,7 @@ test2 test3 test4 +test5 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Tue Aug 23 19:21:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: linux-libc-headers-endian.patch (NEW) - glibc header (nam... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:21:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - glibc header (namely ) defines both __LITTLE_ENDIAN and __BIG_ENDIAN so check __BYTE_ORDER value instead of *_ENDIAN macros presence ---- Files affected: SOURCES: linux-libc-headers-endian.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u /dev/null SOURCES/linux-libc-headers-endian.patch:1.1 --- /dev/null Tue Aug 23 19:21:36 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:21:31 2005 @@ -0,0 +1,641 @@ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + /* M32R relocation types */ + #define R_M32R_NONE 0 +@@ -82,9 +83,9 @@ + * These are used to set parameters in the core dumps. + */ + #define ELF_CLASS ELFCLASS32 +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define ELF_DATA ELFDATA2LSB +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define ELF_DATA ELFDATA2MSB + #else + #error no endian defined +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 +@@ -5,7 +5,7 @@ + + /* orig : i386 2.4.18 */ + +-#include ++#include + + struct __old_kernel_stat { + unsigned short st_dev; +@@ -67,10 +67,10 @@ + long long st_size; + unsigned long st_blksize; + +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + unsigned long __pad4; /* future possible st_blocks high bits */ + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ + unsigned long __pad4; /* future possible st_blocks high bits */ + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 +@@ -16,6 +16,7 @@ + #ifndef __ASSEMBLY__ + #include + #endif ++#include + + /* CS */ + #define JMR3927_ROMCE0 0x1fc00000 /* 4M */ +@@ -148,10 +149,10 @@ + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned short *)(a)) = (d) << 8) + #define jmr3927_ioc_reg_in(a) (((*(volatile unsigned short *)(a)) >> 8) & 0xff) + #else +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)(a)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)(a)) +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)((a)^1)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)((a)^1)) + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 +@@ -67,9 +67,9 @@ + volatile unsigned long csr; + }; + +-#include ++#include + +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + #define endian_def_s2(e1,e2) \ + volatile unsigned short e1,e2 + #define endian_def_sb2(e1,e2,e3) \ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 +@@ -53,9 +53,9 @@ + __s64 res2; /* secondary result */ + }; + +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define PADDED(x,y) x, y +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define PADDED(x,y) y, x + #else + #error edit for your odd byteorder. +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 +@@ -15,7 +15,7 @@ + #include + #include + +-#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) ++#if (__BYTE_ORDER != __LITTLE_ENDIAN) && (__BYTE_ORDER != __BIG_ENDIAN) + #error "Endian problem - this didn't happen" + #endif + +@@ -699,20 +699,20 @@ + } dvd_authinfo; + + struct request_sense { +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 valid : 1; + __u8 error_code : 7; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 error_code : 7; + __u8 valid : 1; + #endif + __u8 segment_number; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 ili : 1; + __u8 reserved2 : 1; + __u8 sense_key : 4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 sense_key : 4; + __u8 reserved2 : 1; + __u8 ili : 1; +@@ -771,22 +771,22 @@ + + struct mrw_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; + __u8 reserved1 : 2; + #endif + __u8 add_len; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 write : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 write : 1; + __u8 reserved2 : 7; + #endif +@@ -798,12 +798,12 @@ + /* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */ + struct rwrt_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; +@@ -813,10 +813,10 @@ + __u32 last_lba; + __u32 block_size; + __u16 blocking; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 page_present : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 page_present : 1; + __u8 reserved2 : 7; + #endif +@@ -825,12 +825,12 @@ + + typedef struct { + __u16 disc_information_length; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 3; + __u8 erasable : 1; + __u8 border_status : 2; + __u8 disc_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 disc_status : 2; + __u8 border_status : 2; + __u8 erasable : 1; +@@ -840,14 +840,14 @@ + __u8 n_sessions_lsb; + __u8 first_track_lsb; + __u8 last_track_lsb; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 did_v : 1; + __u8 dbc_v : 1; + __u8 uru : 1; + __u8 reserved2 : 2; + __u8 dbit : 1; + __u8 mrw_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 mrw_status : 2; + __u8 dbit : 1; + __u8 reserved2 : 2; +@@ -872,7 +872,7 @@ + __u8 track_lsb; + __u8 session_lsb; + __u8 reserved1; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 2; + __u8 damage : 1; + __u8 copy : 1; +@@ -885,7 +885,7 @@ + __u8 reserved3 : 6; + __u8 lra_v : 1; + __u8 nwa_v : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 track_mode : 4; + __u8 copy : 1; + __u8 damage : 1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 +@@ -24,13 +24,13 @@ + } u_echo; + + struct icmpv6_nd_advt { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u32 reserved:5, + override:1, + solicited:1, + router:1, + reserved2:24; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u32 router:1, + solicited:1, + override:1, +@@ -42,12 +42,12 @@ + + struct icmpv6_nd_ra { + __u8 hop_limit; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6, + other:1, + managed:1; + +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 managed:1, + other:1, + reserved:6; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 +@@ -221,14 +221,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned set_geometry : 1; + unsigned recalibrate : 1; + unsigned set_multmode : 1; + unsigned set_tune : 1; + unsigned serviced : 1; + unsigned reserved : 3; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved : 3; + unsigned serviced : 1; + unsigned set_tune : 1; +@@ -250,10 +250,10 @@ + typedef union { + unsigned all :16; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned low :8; /* LSB */ + unsigned high :8; /* MSB */ +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned high :8; /* MSB */ + unsigned low :8; /* LSB */ + #else +@@ -277,7 +277,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned mark :1; + unsigned tzero :1; + unsigned abrt :1; +@@ -286,7 +286,7 @@ + unsigned mce :1; + unsigned ecc :1; + unsigned bdd :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bdd :1; + unsigned ecc :1; + unsigned mce :1; +@@ -313,13 +313,13 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned head : 4; + unsigned unit : 1; + unsigned bit5 : 1; + unsigned lba : 1; + unsigned bit7 : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bit7 : 1; + unsigned lba : 1; + unsigned bit5 : 1; +@@ -351,7 +351,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned check :1; + unsigned idx :1; + unsigned corr :1; +@@ -360,7 +360,7 @@ + unsigned df :1; + unsigned drdy :1; + unsigned bsy :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bsy :1; + unsigned drdy :1; + unsigned df :1; +@@ -388,14 +388,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned bit0 : 1; + unsigned nIEN : 1; + unsigned SRST : 1; + unsigned bit3 : 1; + unsigned reserved456 : 3; + unsigned HOB : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned HOB : 1; + unsigned reserved456 : 3; + unsigned bit3 : 1; +@@ -419,12 +419,12 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned dma :1; + unsigned reserved321 :3; + unsigned reserved654 :3; + unsigned reserved7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved7 :1; + unsigned reserved654 :3; + unsigned reserved321 :3; +@@ -445,11 +445,11 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned cod :1; + unsigned io :1; + unsigned reserved :6; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved :6; + unsigned io :1; + unsigned cod :1; +@@ -471,13 +471,13 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned ili :1; + unsigned eom :1; + unsigned abrt :1; + unsigned mcr :1; + unsigned sense_key :4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned sense_key :4; + unsigned mcr :1; + unsigned abrt :1; +@@ -506,14 +506,14 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned sam_lun :3; + unsigned reserved3 :1; + unsigned drv :1; + unsigned one5 :1; + unsigned reserved6 :1; + unsigned one7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned one7 :1; + unsigned reserved6 :1; + unsigned one5 :1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 +@@ -82,7 +82,7 @@ + { + #if 0 + __u8 ulp; /* must contain 4 */ +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 d1_data_present:1; /* must be 1 */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 reserved:6; /* must be zero */ +@@ -91,7 +91,7 @@ + __u16 d1_area_size:8; /* must be 3 */ + __u16 d2_offset:3; /* must be zero */ + #endif +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6; /* must be zero */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 d1_data_present:1; /* must be 1 */ +@@ -111,20 +111,20 @@ + + struct hippi_le_hdr + { +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 fc:3; + __u8 double_wide:1; + __u8 message_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 message_type:4; + __u8 double_wide:1; + __u8 fc:3; + #endif + __u8 dest_switch_addr[3]; +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 dest_addr_type:4, + src_addr_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 src_addr_type:4, + dest_addr_type:4; + #endif +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 +@@ -91,10 +91,10 @@ + #define PTT_GEN_ERR __constant_htons(0x0203) + + struct pppoe_hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ver : 4; + __u8 type : 4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 type : 4; + __u8 ver : 4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 +@@ -67,11 +67,11 @@ + __u8 code; + __u16 csum; + __u32 group; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 qrv:3, + suppress:1, + resv:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 resv:4, + suppress:1, + qrv:3; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 +@@ -83,10 +83,10 @@ + #ifndef __NETINET_IP_H + + struct iphdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ihl:4, + version:4; +-#elif defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + ihl:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 +@@ -102,10 +102,10 @@ + */ + + struct ipv6hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 priority:4, + version:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + priority:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + /* The map stuff is very simple. You fill in your struct map_info with + a handful of routines for accessing the device, making sure they handle +@@ -160,7 +161,7 @@ + } else { + for (i=start; i < start+len; i++) { + int bitpos; +-#ifdef __LITTLE_ENDIAN ++#if __BYTE_ORDER == __LITTLE_ENDIAN + bitpos = i*8; + #else /* __BIG_ENDIAN */ + bitpos = (map_bankwidth(map)-1-i)*8; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 +@@ -16,6 +16,7 @@ + #define _MD_P_H + + #include ++#include + + /* + * RAID superblock. +@@ -130,7 +131,7 @@ + __u32 failed_disks; /* 4 Number of failed disks */ + __u32 spare_disks; /* 5 Number of spare disks */ + __u32 sb_csum; /* 6 checksum of the whole superblock */ +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + __u32 events_hi; /* 7 high-order of superblock update count */ <> From glen at pld-linux.org Tue Aug 23 19:22:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec - single package with triggers on bro... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:22:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - single package with triggers on browser packages ---- Files affected: SPECS: macromedia-flash.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.26 SPECS/macromedia-flash.spec:1.27 --- SPECS/macromedia-flash.spec:1.26 Tue Aug 23 18:47:51 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:22:40 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.2 +Release: 2.13%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -20,57 +20,33 @@ # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %endif URL: http://www.macromedia.com/software/flash/ +BuildRequires: rpmbuild(macros) >= 1.224 +Requires: browser-plugins +%if %{without license_agreement} +Requires: /usr/bin/builder +%endif +Obsoletes: flash-plugin +Obsoletes: mozilla-plugin-macromedia-flash +Obsoletes: mozilla-firefox-plugin-macromedia-flash +Obsoletes: konqueror-plugin-macromedia-flash ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _plugindir %{_libdir}/browser-plugins + +# TODO: opera, galeon and skipstone. +# use macro, otherwise extra LF inserted along with the ifarch +%define browsers mozilla, mozilla-firefox, konqueror + %description Flash plugin for Netscape-compatible WWW browsers. +Supported browsers: %{browsers}. + %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -%package -n mozilla-plugin-macromedia-flash -Summary: Flash plugin for Mozilla based browsers -Summary(pl): Wtyczka Flash dla przegl?darek opartych na Mozilli -Group: X11/Applications/Multimedia -PreReq: mozilla-embedded >= 1.0 -Obsoletes: flash-plugin - -%description -n mozilla-plugin-macromedia-flash -This package contains flash plugin for Mozilla based browsers, i.e. -mozilla itself, galeon or skipstone. - -%description -n mozilla-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darek opartych -na Mozilli, np.: mozilli jako takiej, galeona czy te? skipstone'a. - -%package -n mozilla-firefox-plugin-macromedia-flash -Summary: Flash plugin for Mozilla Firefox browser -Summary(pl): Wtyczka Flash dla Mozilla Firefox -Group: X11/Applications/Multimedia -PreReq: mozilla-firefox -Obsoletes: flash-plugin - -%description -n mozilla-firefox-plugin-macromedia-flash -This package contains flash plugin for Mozilla Firefox browser. - -%description -n mozilla-firefox-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darki -Mozilla Firefox. - -%package -n konqueror-plugin-macromedia-flash -Summary: Flash plugin for Konqueror browser -Summary(pl): Wtyczka obs?uguj?ca Flash dla przegl?darki Konqueror -Group: X11/Applications/Multimedia -PreReq: konqueror >= 3.0.8-2.3 -Obsoletes: flash-plugin - -%description -n konqueror-plugin-macromedia-flash -This package contains flash plugin for Konqueror browser. - -%description -n konqueror-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? obs?uguj?c? technologi? Flash dla przegl?darki -Konqueror. +Supported browsers: %{browsers}. %prep %if %{with license_agreement} @@ -115,28 +91,8 @@ if [ "$?" -ne 0 ]; then exit 2 fi - RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-firefox-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES= - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=$RPMDIR/$RPMNAME1 - echo "Installing $RPMNAME1" - else - echo "Not installing $RPMNAME1" - fi - if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" - echo "Installing $RPMNAME2" - else - echo "Not installing $RPMNAME2" - fi - if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" - echo "Installing $RPMNAME3" - else - echo "Not installing $RPMNAME3" - fi + RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/%{base_name}.spec.prev ]; then @@ -158,11 +114,8 @@ %else -install -d $RPM_BUILD_ROOT%{_libdir}/{mozilla/plugins,/mozilla-firefox/plugins,/kde3/plugins/konqueror} - -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins -install *.so $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror +install -d $RPM_BUILD_ROOT%{_plugindir} +install *.{so,xpt} $RPM_BUILD_ROOT%{_plugindir} %endif @@ -178,42 +131,48 @@ %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " -%endif +%else -%post -n mozilla-plugin-macromedia-flash +%triggerin -- mozilla-firefox +%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerun -- mozilla-firefox +%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerin -- mozilla +%nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%postun -n mozilla-plugin-macromedia-flash +%triggerun -- mozilla +%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if %{without license_agreement} +%triggerin -- konqueror +%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%triggerun -- konqueror +%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%endif + %files %defattr(644,root,root,755) + +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else -%files -n mozilla-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla/plugins/*.so -%{_libdir}/mozilla/plugins/*.xpt - -%files -n mozilla-firefox-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/*.so -%{_libdir}/mozilla-firefox/plugins/*.xpt - -%files -n konqueror-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/kde3/plugins/konqueror/*.so +%attr(755,root,root) %{_plugindir}/*.so +%{_plugindir}/*.xpt %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -222,6 +181,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/23 17:22:40 glen +- single package with triggers on browser packages + Revision 1.26 2005/08/23 16:47:51 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Tue Aug 23 19:23:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: linux-libc-headers.spec - added endian patch, release 2 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:23:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added endian patch, release 2 ---- Files affected: SPECS: linux-libc-headers.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.98 SPECS/linux-libc-headers.spec:1.99 --- SPECS/linux-libc-headers.spec:1.98 Thu Aug 4 21:33:48 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:23:22 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 1 +Release: 2 Epoch: 7 License: GPL Group: Development @@ -15,6 +15,7 @@ Patch3: %{name}-fbsplash.patch Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch +Patch6: %{name}-endian.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -58,6 +59,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %ifarch %{x8664} @@ -172,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/23 17:23:22 qboosh +- added endian patch, release 2 + Revision 1.98 2005/08/04 19:33:48 pluto - imq headers added. - release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.98&r2=1.99&f=u From arekm at pld-linux.org Tue Aug 23 19:26:22 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: CVSROOT: loginfo Add pld commit ml. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:26:22 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Add pld commit ml. ---- Files affected: CVSROOT: loginfo (1.196 -> 1.197) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.196 CVSROOT/loginfo:1.197 --- CVSROOT/loginfo:1.196 Tue Aug 23 19:16:05 2005 +++ CVSROOT/loginfo Tue Aug 23 19:26:17 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.196&r2=1.197&f=u From arekm at pld-linux.org Tue Aug 23 19:27:20 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:15 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:27:20 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.19 -> 1.20) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.19 test/plik:1.20 --- test/plik:1.19 Tue Aug 23 19:16:47 2005 +++ test/plik Tue Aug 23 19:27:15 2005 @@ -3,6 +3,7 @@ test3 test4 test5 +test6 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Tue Aug 23 19:30:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: test: pask2 - test In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:30:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: pask2 (1.2 -> 1.3) ---- Diffs: ================================================================ Index: test/pask2 diff -u test/pask2:1.2 test/pask2:1.3 --- test/pask2:1.2 Thu Jun 23 19:13:17 2005 +++ test/pask2 Tue Aug 23 19:30:24 2005 @@ -1 +1 @@ -Thu Jun 23 20:13:06 EEST 2005 +Tue Aug 23 20:30:20 EEST 2005 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/pask2?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Tue Aug 23 19:30:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: iproute2.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:30:35 Modified files: iproute2.spec Log message: - release 5: rebuild with fixed on big-endians Index: iproute2.spec =================================================================== RCS file: /cvsroot/SPECS/iproute2.spec,v diff -d -u -r1.145 -r1.146 --- iproute2.spec 5 Jul 2005 16:38:17 -0000 1.145 +++ iproute2.spec 23 Aug 2005 17:30:30 -0000 1.146 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 From qboosh at pld-linux.org Tue Aug 23 19:30:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: iproute2.spec - release 5: rebuild with fixed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:30:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 5: rebuild with fixed on big-endians ---- Files affected: SPECS: iproute2.spec (1.145 -> 1.146) ---- Diffs: ================================================================ Index: SPECS/iproute2.spec diff -u SPECS/iproute2.spec:1.145 SPECS/iproute2.spec:1.146 --- SPECS/iproute2.spec:1.145 Tue Jul 5 18:38:17 2005 +++ SPECS/iproute2.spec Tue Aug 23 19:30:30 2005 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iproute2.spec?r1=1.145&r2=1.146&f=u From baggins at pld-linux.org Tue Aug 23 19:38:05 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: rc-scripts-con_serial_sparc.patch, rc-scripts-dev_alias.p... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.4.0.20 ---- Files affected: SOURCES: rc-scripts-con_serial_sparc.patch (1.2 -> 1.3) , rc-scripts-dev_alias.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-con_serial_sparc.patch diff -u SOURCES/rc-scripts-con_serial_sparc.patch:1.2 SOURCES/rc-scripts-con_serial_sparc.patch:1.3 --- SOURCES/rc-scripts-con_serial_sparc.patch:1.2 Wed Jun 15 21:59:32 2005 +++ SOURCES/rc-scripts-con_serial_sparc.patch Tue Aug 23 19:38:00 2005 @@ -1,10 +1,10 @@ --- rc-scripts-0.4.0.19/inittab.orig 2005-06-15 19:55:54.862429768 +0200 +++ rc-scripts-0.4.0.19/inittab 2005-06-15 19:56:09.442213304 +0200 -@@ -45,6 +45,8 @@ - # If power was restored before the shutdown kicked in, cancel it. +@@ -45,7 +45,7 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" -+# Run agetty on serial port + # Run agetty on serial port +-# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels ================================================================ Index: SOURCES/rc-scripts-dev_alias.patch diff -u SOURCES/rc-scripts-dev_alias.patch:1.3 SOURCES/rc-scripts-dev_alias.patch:1.4 --- SOURCES/rc-scripts-dev_alias.patch:1.3 Tue Mar 29 20:18:46 2005 +++ SOURCES/rc-scripts-dev_alias.patch Tue Aug 23 19:38:00 2005 @@ -4,8 +4,8 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ -- egrep 'ifcfg-[a-z0-9\.]+$' | \ -+ egrep 'ifcfg-[a-z0-9\.:]+$' | \ +- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ ++ LC_ALL=C egrep 'ifcfg-[a-z0-9\.:]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rc-scripts-con_serial_sparc.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/rc-scripts-dev_alias.patch?r1=1.3&r2=1.4&f=u From baggins at pld-linux.org Tue Aug 23 19:38:26 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: rc-scripts-az-locale.patch (REMOVED), rc-scripts-plusgsm_... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: outdated ---- Files affected: SOURCES: rc-scripts-az-locale.patch (1.1 -> NONE) (REMOVED), rc-scripts-plusgsm_example.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 19:40:07 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: DISTFILES: rc-scripts-0.4.0.20.tar.gz Message-ID: <19301.1124818807@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/people/arekm/software/rc-scripts-0.4.0.20.tar.gz d67b427da40f42b6b2fc5f562dc9286d rc-scripts-0.4.0.20.tar.gz Size: 309815 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 19:40:00 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:39:58 Modified files: rc-scripts.spec Log message: - updated to 0.4.0.20 - release 0.1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.195 -r1.196 --- rc-scripts.spec 7 Jul 2005 16:42:20 -0000 1.195 +++ rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default From baggins at pld-linux.org Tue Aug 23 19:40:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: rc-scripts.spec - updated to 0.4.0.20 - release 0.1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.0.20 - release 0.1 ---- Files affected: SPECS: rc-scripts.spec (1.195 -> 1.196) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.195 SPECS/rc-scripts.spec:1.196 --- SPECS/rc-scripts.spec:1.195 Thu Jul 7 18:42:20 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:39:58 2005 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.195&r2=1.196&f=u From qboosh at pld-linux.org Tue Aug 23 19:47:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: linux-libc-headers-endian.patch - bugfixes in ip.h and tcp.h In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:47:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - bugfixes in ip.h and tcp.h ---- Files affected: SOURCES: linux-libc-headers-endian.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u SOURCES/linux-libc-headers-endian.patch:1.1 SOURCES/linux-libc-headers-endian.patch:1.2 --- SOURCES/linux-libc-headers-endian.patch:1.1 Tue Aug 23 19:21:31 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:47:28 2005 @@ -1,6 +1,6 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 22:19:47.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -23,7 +23,7 @@ #error no endian defined diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 22:19:47.000000000 +0200 @@ -5,7 +5,7 @@ /* orig : i386 2.4.18 */ @@ -48,7 +48,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #ifndef __ASSEMBLY__ #include @@ -72,7 +72,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,9 +67,9 @@ volatile unsigned long csr; }; @@ -87,7 +87,7 @@ #define endian_def_sb2(e1,e2,e3) \ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 -+++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 22:19:47.000000000 +0200 @@ -53,9 +53,9 @@ __s64 res2; /* secondary result */ }; @@ -102,7 +102,7 @@ #error edit for your odd byteorder. diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h --- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 22:19:47.000000000 +0200 @@ -15,7 +15,7 @@ #include #include @@ -244,7 +244,7 @@ __u8 damage : 1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -24,13 +24,13 @@ } u_echo; @@ -278,7 +278,7 @@ reserved:6; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 22:19:47.000000000 +0200 @@ -221,14 +221,14 @@ typedef union { unsigned all : 8; @@ -442,7 +442,7 @@ unsigned one5 :1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 22:19:47.000000000 +0200 @@ -82,7 +82,7 @@ { #if 0 @@ -488,7 +488,7 @@ #endif diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 22:19:47.000000000 +0200 @@ -91,10 +91,10 @@ #define PTT_GEN_ERR __constant_htons(0x0203) @@ -504,7 +504,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,11 +67,11 @@ __u8 code; __u16 csum; @@ -521,7 +521,7 @@ qrv:3; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 22:21:06.000000000 +0200 @@ -83,10 +83,10 @@ #ifndef __NETINET_IP_H @@ -531,13 +531,13 @@ __u8 ihl:4, version:4; -#elif defined (__BIG_ENDIAN) -+#if __BYTE_ORDER == __BIG_ENDIAN ++#elif __BYTE_ORDER == __BIG_ENDIAN __u8 version:4, ihl:4; #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -102,10 +102,10 @@ */ @@ -553,7 +553,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h --- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 22:19:47.000000000 +0200 @@ -7,6 +7,7 @@ #include #include @@ -573,7 +573,7 @@ bitpos = (map_bankwidth(map)-1-i)*8; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h --- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #define _MD_P_H @@ -593,16 +593,16 @@ __u32 cp_events_hi; /* 9 high-order of checkpoint update count */ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-headers-2.6.12.0/include/linux/tcp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h 2005-01-08 15:03:40.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 21:48:11.000000000 +0200 -@@ -18,14 +18,14 @@ ++++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 22:22:11.000000000 +0200 +@@ -18,6 +18,7 @@ #define _LINUX_TCP_H #include --#include +#include + #include struct tcphdr { - __u16 source; +@@ -25,7 +26,7 @@ __u16 dest; __u32 seq; __u32 ack_seq; @@ -611,7 +611,7 @@ __u16 res1:4, doff:4, fin:1, -@@ -36,7 +36,7 @@ +@@ -36,7 +37,7 @@ urg:1, ece:1, cwr:1; @@ -622,7 +622,7 @@ cwr:1, diff -Nur linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h --- linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h 2005-03-25 20:30:35.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 21:49:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 22:19:47.000000000 +0200 @@ -27,12 +27,12 @@ #ifndef __CS46XX_DSP_SCB_TYPES_H__ #define __CS46XX_DSP_SCB_TYPES_H__ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-libc-headers-endian.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 19:48:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: linux-libc-headers.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:48:17 Modified files: linux-libc-headers.spec Log message: - bugfix in endian patch, release 3 Index: linux-libc-headers.spec =================================================================== RCS file: /cvsroot/SPECS/linux-libc-headers.spec,v diff -d -u -r1.99 -r1.100 --- linux-libc-headers.spec 23 Aug 2005 17:23:22 -0000 1.99 +++ linux-libc-headers.spec 23 Aug 2005 17:48:17 -0000 1.100 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 From qboosh at pld-linux.org Tue Aug 23 19:48:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: linux-libc-headers.spec - bugfix in endian patch, release 3 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:48:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - bugfix in endian patch, release 3 ---- Files affected: SPECS: linux-libc-headers.spec (1.99 -> 1.100) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.99 SPECS/linux-libc-headers.spec:1.100 --- SPECS/linux-libc-headers.spec:1.99 Tue Aug 23 19:23:22 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:48:17 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.99&r2=1.100&f=u From baggins at pld-linux.org Tue Aug 23 19:55:19 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:55:17 Modified files: rc-scripts.spec Log message: - release 1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.196 -r1.197 --- rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 +++ rc-scripts.spec 23 Aug 2005 17:55:17 -0000 1.197 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 From baggins at pld-linux.org Tue Aug 23 19:55:22 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: rc-scripts.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:55:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: rc-scripts.spec (1.196 -> 1.197) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.196 SPECS/rc-scripts.spec:1.197 --- SPECS/rc-scripts.spec:1.196 Tue Aug 23 19:39:58 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:55:17 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.196&r2=1.197&f=u From glen at pld-linux.org Tue Aug 23 19:56:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: license-installer.sh (NEW) - shared installer, extracted ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - shared installer, extracted from macromedia-flash.spec ---- Files affected: SOURCES: license-installer.sh (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u /dev/null SOURCES/license-installer.sh:1.1 --- /dev/null Tue Aug 23 19:56:21 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:56:16 2005 @@ -0,0 +1,48 @@ +#!/bin/sh +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%{_rpmdir}"`; export RPMDIR + BACKUP=0 + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/@BASE_NAME@.spec ]; then + BACKUP=1 + mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev + fi + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" + else + cp -f "$3" . + fi + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) + ) + cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + else + cp -i "$3" $SPECDIR || exit 1 + fi + ( cd $SPECDIR + /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + if [ "$?" -ne 0 ]; then + exit 2 + fi + RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then + mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + fi +else + echo " +License issues made us not to include inherent files into +this package by default. If you want to create full working +package please build it with the following command: + +$0 --with license_agreement @SPECFILE@ +" +fi ================================================================ From glen at pld-linux.org Tue Aug 23 19:56:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 19:56:48 Modified files: macromedia-flash.spec Log message: - use shared installer script from SOURCES Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.27 -r1.28 --- macromedia-flash.spec 23 Aug 2005 17:22:40 -0000 1.27 +++ macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages From glen at pld-linux.org Tue Aug 23 19:56:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec - use shared installer script from SO... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES ---- Files affected: SPECS: macromedia-flash.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.27 SPECS/macromedia-flash.spec:1.28 --- SPECS/macromedia-flash.spec:1.27 Tue Aug 23 19:22:40 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:56:48 2005 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.27&r2=1.28&f=u From glen at pld-linux.org Tue Aug 23 19:59:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SOURCES: license-installer.sh - show install progress In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:59:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - show install progress ---- Files affected: SOURCES: license-installer.sh (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.1 SOURCES/license-installer.sh:1.2 --- SOURCES/license-installer.sh:1.1 Tue Aug 23 19:56:16 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:58:56 2005 @@ -31,7 +31,7 @@ exit 2 fi RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + rpm -Uhv $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Tue Aug 23 20:02:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:02:03 Modified files: macromedia-flash.spec Log message: - add opera support Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.28 -r1.29 --- macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 +++ macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES From glen at pld-linux.org Tue Aug 23 20:02:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: macromedia-flash.spec - add opera support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:02:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add opera support ---- Files affected: SPECS: macromedia-flash.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.28 SPECS/macromedia-flash.spec:1.29 --- SPECS/macromedia-flash.spec:1.28 Tue Aug 23 19:56:48 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:02:03 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.28&r2=1.29&f=u From glen at pld-linux.org Tue Aug 23 20:05:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: browser-plugins.spec - arch dependant due %{_libdir} usage In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:05:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - arch dependant due %{_libdir} usage ---- Files affected: SPECS: browser-plugins.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.3 SPECS/browser-plugins.spec:1.4 --- SPECS/browser-plugins.spec:1.3 Thu Jun 23 15:05:39 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:05:28 2005 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 20:05:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:15 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:05:29 Modified files: browser-plugins.spec Log message: - arch dependant due %{_libdir} usage Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.3 -r1.4 --- browser-plugins.spec 23 Jun 2005 13:05:39 -0000 1.3 +++ browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 From glen at pld-linux.org Tue Aug 23 20:07:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec - provide virtual to identify built ar... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:07:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - provide virtual to identify built archdecture ---- Files affected: SPECS: browser-plugins.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.4 SPECS/browser-plugins.spec:1.5 --- SPECS/browser-plugins.spec:1.4 Tue Aug 23 20:05:28 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:07:14 2005 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 20:07:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:07:15 Modified files: browser-plugins.spec Log message: - provide virtual to identify built archdecture Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.4 -r1.5 --- browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 +++ browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage From glen at pld-linux.org Tue Aug 23 20:10:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec (HEAD) template-browser-plugin.spec (HEAD) gplflash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:10:13 Modified files: macromedia-flash.spec template-browser-plugin.spec gplflash.spec Log message: - require correct arch of browser-plugins Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.29 -r1.30 --- macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 +++ macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.4 -r1.5 --- template-browser-plugin.spec 23 Jun 2005 12:54:15 -0000 1.4 +++ template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) Index: gplflash.spec =================================================================== RCS file: /cvsroot/SPECS/gplflash.spec,v diff -d -u -r1.9 -r1.10 --- gplflash.spec 23 Aug 2005 17:02:05 -0000 1.9 +++ gplflash.spec 23 Aug 2005 18:10:13 -0000 1.10 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed From glen at pld-linux.org Tue Aug 23 20:10:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec, template-browser-plugin.spec, gplfla... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:10:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require correct arch of browser-plugins ---- Files affected: SPECS: macromedia-flash.spec (1.29 -> 1.30) , template-browser-plugin.spec (1.4 -> 1.5) , gplflash.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.29 SPECS/macromedia-flash.spec:1.30 --- SPECS/macromedia-flash.spec:1.29 Tue Aug 23 20:02:03 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:10:13 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.4 SPECS/template-browser-plugin.spec:1.5 --- SPECS/template-browser-plugin.spec:1.4 Thu Jun 23 14:54:15 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:10:13 2005 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.9 SPECS/gplflash.spec:1.10 --- SPECS/gplflash.spec:1.9 Tue Aug 23 19:02:05 2005 +++ SPECS/gplflash.spec Tue Aug 23 20:10:13 2005 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.29&r2=1.30&f=u http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 20:14:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:14:06 Modified files: browser-plugins.spec Log message: - include VR in virtual prov, rel 2 Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.5 -r1.6 --- browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 +++ browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture From glen at pld-linux.org Tue Aug 23 20:14:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec - include VR in virtual prov, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:14:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - include VR in virtual prov, rel 2 ---- Files affected: SPECS: browser-plugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.5 SPECS/browser-plugins.spec:1.6 --- SPECS/browser-plugins.spec:1.5 Tue Aug 23 20:07:14 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:14:05 2005 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Tue Aug 23 20:19:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: rpm-macros.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:19:50 Modified files: rpm-macros.spec Log message: - rpm macros 1.233 Index: rpm-macros.spec =================================================================== RCS file: /cvsroot/SPECS/rpm-macros.spec,v diff -d -u -r1.18 -r1.19 --- rpm-macros.spec 15 Jul 2005 11:15:25 -0000 1.18 +++ rpm-macros.spec 23 Aug 2005 18:19:49 -0000 1.19 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 From glen at pld-linux.org Tue Aug 23 20:19:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: rpm-macros.spec - rpm macros 1.233 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:19:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rpm macros 1.233 ---- Files affected: SPECS: rpm-macros.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.18 SPECS/rpm-macros.spec:1.19 --- SPECS/rpm-macros.spec:1.18 Fri Jul 15 13:15:25 2005 +++ SPECS/rpm-macros.spec Tue Aug 23 20:19:49 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 20:32:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - allow additional dir... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:32:10 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - allow additional dirs to wipe .py files in %py_postclean ---- Files affected: SOURCES: rpm.macros (1.158.4.54 -> 1.158.4.55) SOURCES: rpm.macros (1.233 -> 1.234) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.54 SOURCES/rpm.macros:1.158.4.55 --- SOURCES/rpm.macros:1.158.4.54 Mon Jul 25 11:05:50 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -505,7 +505,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.233 SOURCES/rpm.macros:1.234 --- SOURCES/rpm.macros:1.233 Thu Aug 11 18:54:56 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -508,7 +508,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.54&r2=1.158.4.55&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.233&r2=1.234&f=u From glen at pld-linux.org Tue Aug 23 20:33:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: PLD-doc: BuildRequires.txt - enhanced %py_postclean macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:33:15 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - enhanced %py_postclean macro ---- Files affected: PLD-doc: BuildRequires.txt (1.39 -> 1.40) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.39 PLD-doc/BuildRequires.txt:1.40 --- PLD-doc/BuildRequires.txt:1.39 Tue Aug 16 01:32:09 2005 +++ PLD-doc/BuildRequires.txt Tue Aug 23 20:33:10 2005 @@ -119,6 +119,8 @@ # %py_postclean BuildRequires: rpmbuild(macros) >= 1.219 +# %py_postclean with additional dirs to wipe .py files from +BuildRequires: rpmbuild(macros) >= 1.234 # %gconf_schema_uninstall BuildRequires: rpmbuild(macros) >= 1.198 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.39&r2=1.40&f=u From twittner at pld-linux.org Tue Aug 23 20:39:14 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: darkice.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 20:39:12 Modified files: darkice.spec Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. Index: darkice.spec =================================================================== RCS file: /cvsroot/SPECS/darkice.spec,v diff -d -u -r1.20 -r1.21 --- darkice.spec 22 Aug 2005 14:50:06 -0000 1.20 +++ darkice.spec 23 Aug 2005 18:39:11 -0000 1.21 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ From twittner at pld-linux.org Tue Aug 23 20:39:17 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: darkice.spec - reverted last blekot's change - I've checked... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 18:39:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. ---- Files affected: SPECS: darkice.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.20 SPECS/darkice.spec:1.21 --- SPECS/darkice.spec:1.20 Mon Aug 22 16:50:06 2005 +++ SPECS/darkice.spec Tue Aug 23 20:39:11 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Tue Aug 23 20:44:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - %nsplugin_install fi... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:44:05 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - %nsplugin_install fix: check for target dir existence, if installing on alien base arch (i686 package on amd64) as the dependencies are basename based ---- Files affected: SOURCES: rpm.macros (1.158.4.55 -> 1.158.4.56) SOURCES: rpm.macros (1.234 -> 1.235) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.55 SOURCES/rpm.macros:1.158.4.56 --- SOURCES/rpm.macros:1.158.4.55 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -719,7 +719,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.234 SOURCES/rpm.macros:1.235 --- SOURCES/rpm.macros:1.234 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -722,7 +722,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.55&r2=1.158.4.56&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.234&r2=1.235&f=u From glen at pld-linux.org Tue Aug 23 20:45:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:45:30 Modified files: macromedia-flash.spec Log message: - make i686 package install on amd64 Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.30 -r1.31 --- macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 +++ macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:45:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec - make i686 package install on amd64 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:45:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - make i686 package install on amd64 ---- Files affected: SPECS: macromedia-flash.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.30 SPECS/macromedia-flash.spec:1.31 --- SPECS/macromedia-flash.spec:1.30 Tue Aug 23 20:10:13 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:45:30 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Tue Aug 23 20:46:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: template-browser-plugin.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:46:11 Modified files: template-browser-plugin.spec Log message: - up macros requirement for installing cross-arch packages Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.5 -r1.6 --- template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 +++ template-browser-plugin.spec 23 Aug 2005 18:46:11 -0000 1.6 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:46:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: template-browser-plugin.spec - up macros requirement for in... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up macros requirement for installing cross-arch packages ---- Files affected: SPECS: template-browser-plugin.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.5 SPECS/template-browser-plugin.spec:1.6 --- SPECS/template-browser-plugin.spec:1.5 Tue Aug 23 20:10:13 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:46:11 2005 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.5&r2=1.6&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 20:53:34 Modified files: man.spec Log message: - updated to 1.6a - added URL - adaptarized - sorted BR Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.102 -r1.103 --- man.spec 9 Aug 2005 18:37:01 -0000 1.102 +++ man.spec 23 Aug 2005 18:53:33 -0000 1.103 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it From paszczus at pld-linux.org Tue Aug 23 20:53:39 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: man.spec - updated to 1.6a - added URL - adaptarized - sort... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 18:53:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.6a - added URL - adaptarized - sorted BR ---- Files affected: SPECS: man.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.102 SPECS/man.spec:1.103 --- SPECS/man.spec:1.102 Tue Aug 9 20:37:01 2005 +++ SPECS/man.spec Tue Aug 23 20:53:33 2005 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.102&r2=1.103&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: DISTFILES: man-1.6a.tar.gz man-additional-man-pages.tar.bz2 Message-ID: <9685.1124823224@distfiles.pld-linux.org> Files fetched: 1 STORED: http://primates.ximian.com/~flucifredi/man/man-1.6a.tar.gz d53114b9ec030be32b858b1618da3c25 man-1.6a.tar.gz Size: 234660 bytes ALREADY GOT: no-url://man-additional-man-pages.tar.bz2 16c3fde2243289524cf40c1d2e7150e4 man-additional-man-pages.tar.bz2 -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 20:54:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:54:26 Modified files: browser-plugins.spec Log message: - listing browsers (please complete the list if you find somebody missing) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.6 -r1.7 --- browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 +++ browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:54:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec - listing browsers (please complete th... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:54:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - listing browsers (please complete the list if you find somebody missing) ---- Files affected: SPECS: browser-plugins.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.6 SPECS/browser-plugins.spec:1.7 --- SPECS/browser-plugins.spec:1.6 Tue Aug 23 20:14:05 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:54:24 2005 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Tue Aug 23 20:55:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:55:18 Modified files: browser-plugins.spec Log message: - i belive browser is a thing (fix last commit msg) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.7 -r1.8 --- browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 +++ browser-plugins.spec 23 Aug 2005 18:55:18 -0000 1.8 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:55:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: browser-plugins.spec - i belive browser is a thing (fix las... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:55:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - i belive browser is a thing (fix last commit msg) ---- Files affected: SPECS: browser-plugins.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.7 SPECS/browser-plugins.spec:1.8 --- SPECS/browser-plugins.spec:1.7 Tue Aug 23 20:54:24 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:55:18 2005 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Tue Aug 23 20:57:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:57:27 Modified files: w32codec.spec Log message: - use without macro Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.70 -r1.71 --- w32codec.spec 15 Apr 2005 07:15:57 -0000 1.70 +++ w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs From glen at pld-linux.org Tue Aug 23 20:57:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: w32codec.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:57:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: w32codec.spec (1.70 -> 1.71) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.70 SPECS/w32codec.spec:1.71 --- SPECS/w32codec.spec:1.70 Fri Apr 15 09:15:57 2005 +++ SPECS/w32codec.spec Tue Aug 23 20:57:26 2005 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.70&r2=1.71&f=u From glen at pld-linux.org Tue Aug 23 21:17:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:28 Modified files: macromedia-flash.spec Log message: - sync requires from w32codec.spec Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.31 -r1.32 --- macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 +++ macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 From glen at pld-linux.org Tue Aug 23 21:17:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec - sync requires from w32codec.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sync requires from w32codec.spec ---- Files affected: SPECS: macromedia-flash.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.31 SPECS/macromedia-flash.spec:1.32 --- SPECS/macromedia-flash.spec:1.31 Tue Aug 23 20:45:30 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:25 2005 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 21:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:50 Modified files: macromedia-flash.spec Log message: - unzip unneccessary Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.32 -r1.33 --- macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 +++ macromedia-flash.spec 23 Aug 2005 19:17:50 -0000 1.33 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec From glen at pld-linux.org Tue Aug 23 21:17:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec - unzip unneccessary In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unzip unneccessary ---- Files affected: SPECS: macromedia-flash.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.32 SPECS/macromedia-flash.spec:1.33 --- SPECS/macromedia-flash.spec:1.32 Tue Aug 23 21:17:25 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:50 2005 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.32&r2=1.33&f=u From paszczus at pld-linux.org Tue Aug 23 21:18:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 21:18:09 Modified files: man.spec Log message: - backing to %{__make} Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.103 -r1.104 --- man.spec 23 Aug 2005 18:53:33 -0000 1.103 +++ man.spec 23 Aug 2005 19:18:09 -0000 1.104 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL From paszczus at pld-linux.org Tue Aug 23 21:18:14 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: man.spec - backing to %{__make} In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 19:18:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - backing to %{__make} ---- Files affected: SPECS: man.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.103 SPECS/man.spec:1.104 --- SPECS/man.spec:1.103 Tue Aug 23 20:53:33 2005 +++ SPECS/man.spec Tue Aug 23 21:18:09 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.103&r2=1.104&f=u From twittner at pld-linux.org Tue Aug 23 21:18:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: luma.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 21:18:44 Modified files: luma.spec Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. Index: luma.spec =================================================================== RCS file: /cvsroot/SPECS/luma.spec,v diff -d -u -r1.8 -r1.9 --- luma.spec 22 Aug 2005 21:33:56 -0000 1.8 +++ luma.spec 23 Aug 2005 19:18:44 -0000 1.9 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog From twittner at pld-linux.org Tue Aug 23 21:18:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: luma.spec - truly noarch - %%_libdir replaced with %%{_pref... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 19:18:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. ---- Files affected: SPECS: luma.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.8 SPECS/luma.spec:1.9 --- SPECS/luma.spec:1.8 Mon Aug 22 23:33:56 2005 +++ SPECS/luma.spec Tue Aug 23 21:18:44 2005 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Tue Aug 23 21:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES: license-installer.sh - mirrors file not present, disable ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:20:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - mirrors file not present, disable mirrors file ---- Files affected: SOURCES: license-installer.sh (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.2 SOURCES/license-installer.sh:1.3 --- SOURCES/license-installer.sh:1.2 Tue Aug 23 19:58:56 2005 +++ SOURCES/license-installer.sh Tue Aug 23 21:20:31 2005 @@ -26,7 +26,7 @@ cp -i "$3" $SPECDIR || exit 1 fi ( cd $SPECDIR - /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec if [ "$?" -ne 0 ]; then exit 2 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Tue Aug 23 21:26:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:26:18 Modified files: w32codec.spec Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.71 -r1.72 --- w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 +++ w32codec.spec 23 Aug 2005 19:26:18 -0000 1.72 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro From glen at pld-linux.org Tue Aug 23 21:26:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: w32codec.spec - use shared installer script from SOURCES - ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:26:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) ---- Files affected: SPECS: w32codec.spec (1.71 -> 1.72) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.71 SPECS/w32codec.spec:1.72 --- SPECS/w32codec.spec:1.71 Tue Aug 23 20:57:26 2005 +++ SPECS/w32codec.spec Tue Aug 23 21:26:18 2005 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.71&r2=1.72&f=u From arekm at pld-linux.org Tue Aug 23 21:27:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:16 2005 Subject: CVSROOT: logdiff.pl, loginfo -m option no longer required In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 19:27:06 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: -m option no longer required ---- Files affected: CVSROOT: logdiff.pl (1.41 -> 1.42) , loginfo (1.197 -> 1.198) ---- Diffs: ================================================================ Index: CVSROOT/logdiff.pl diff -u CVSROOT/logdiff.pl:1.41 CVSROOT/logdiff.pl:1.42 --- CVSROOT/logdiff.pl:1.41 Mon Jul 28 12:42:50 2003 +++ CVSROOT/logdiff.pl Tue Aug 23 21:27:01 2005 @@ -256,8 +256,6 @@ @ARGVX = $arg; } } -($mailto) || die("No -m mail recipient specified\n"); - ## for now, the first "file" is the repository directory being committed, ## relative to the $CVSROOT location @@ -295,7 +293,10 @@ &do_changes_file($commitlog, @text); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -323,7 +324,10 @@ push(@text, " ".$_); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -558,7 +562,10 @@ ## ## Mail out the notification. ## -&mail_notification(@plain_txt); +if ($mailto) +{ + &mail_notification(@plain_txt); +} exit 0; # vim: ts=4 sw=4 et noai nosi cin ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.197 CVSROOT/loginfo:1.198 --- CVSROOT/loginfo:1.197 Tue Aug 23 19:26:17 2005 +++ CVSROOT/loginfo Tue Aug 23 21:27:01 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/logdiff.pl?r1=1.41&r2=1.42&f=u http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.197&r2=1.198&f=u From glen at pld-linux.org Tue Aug 23 21:28:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: builder - CVS/Entries might not always present, hide errors In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:28:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - CVS/Entries might not always present, hide errors ---- Files affected: SPECS: builder (1.323 -> 1.324) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.323 SPECS/builder:1.324 --- SPECS/builder:1.323 Sun Aug 21 19:35:46 2005 +++ SPECS/builder Tue Aug 23 21:28:11 2005 @@ -512,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -974,7 +974,7 @@ # --- # * -selinux # samba -mysql -pgsql - # w32codec license_agreement + # w32codec-installer license_agreement # php +mysqli # --- if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.323&r2=1.324&f=u From glen at pld-linux.org Tue Aug 23 21:39:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES: builder - up from SPECS HEAD, rev 1.324 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:39:39 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up from SPECS HEAD, rev 1.324 ---- Files affected: SOURCES: builder (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/builder diff -u SOURCES/builder:1.11 SOURCES/builder:1.12 --- SOURCES/builder:1.11 Sat Aug 14 04:23:46 2004 +++ SOURCES/builder Tue Aug 23 21:39:34 2005 @@ -2,15 +2,18 @@ # ----------- # $Id$ # Exit codes: -# 0 - succesful -# 1 - help displayed -# 2 - no spec file name in cmdl parameters -# 3 - spec file not stored in repo -# 4 - some source, patch or icon files not stored in repo -# 5 - package build failed -# 6 - spec file with errors -# 7 - wrong source in /etc/poldek.conf -# 8 - Failed installing buildrequirements and subrequirements +# 0 - succesful +# 1 - help displayed +# 2 - no spec file name in cmdl parameters +# 3 - spec file not stored in repo +# 4 - some source, patch or icon files not stored in repo +# 5 - package build failed +# 6 - spec file with errors +# 7 - wrong source in /etc/poldek.conf +# 8 - Failed installing buildrequirements and subrequirements +# 9 - Requested tag already exist +# 10 - Refused to build fractional release +# 100 - Unknown error (should not happen) # Notes (todo): # - builder -u fetches current version first @@ -23,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.11 (C) 1999-2004 Free Penguins". +V 0.12 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" @@ -42,6 +45,7 @@ UPDATE5="" ADD5="" NO5="" +ADAPTERIZE="" ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"} CVSROOT="" @@ -64,6 +68,7 @@ RPMOPTS="" BCOND="" GROUP_BCONDS="no" +CVSIGNORE_DF="no" PATCHES="" SOURCES="" @@ -80,30 +85,18 @@ CVS_SERVER="cvs.pld-linux.org" DISTFILES_SERVER="://distfiles.pld-linux.org" +ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org" -DEF_NICE_LEVEL=0 +DEF_NICE_LEVEL=19 FAIL_IF_NO_SOURCES="yes" -wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" -wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - -GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETLOCAL="cp -a" - -if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then - RPM="rpm" - RPMBUILD="rpm" +if [ -x /usr/bin/rpm-getdeps ]; then + FETCH_BUILD_REQUIRES_RPMGETDEPS="yes" else - RPM="rpm" - RPMBUILD="rpmbuild" + FETCH_BUILD_REQUIRES_RPMGETDEPS="no" fi -POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" -POLDEK_SOURCE="cvs" -POLDEK_CMD="/usr/bin/poldek --noask" - # Here we load saved user environment used to # predefine options set above, or passed to builder # in command line. @@ -121,6 +114,7 @@ #GROUP_BCONDS="yes" #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE' # +SU_SUDO="" if [ -n "$HOME_ETC" ]; then USER_CFG="$HOME_ETC/.builderrc" else @@ -129,6 +123,36 @@ [ -f "$USER_CFG" ] && . "$USER_CFG" +if [ -n "$USE_PROZILLA" ]; then + GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-O" +elif [ -n "$USE_AXEL" ]; then + GETURI="axel -a $AXEL_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-o" +else + wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" + wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" + + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" + GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" + OUTFILEOPT="-O" +fi + +GETLOCAL="cp -a" + +if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then + RPM="rpm" + RPMBUILD="rpm" +else + RPM="rpm" + RPMBUILD="rpmbuild" +fi + +POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" +POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask" + run_poldek() { RES_FILE=~/tmp/poldek-exit-status.$RANDOM @@ -137,7 +161,7 @@ if [ -n "$LASTLOG_FILE" ]; then echo "LASTLOG=$LOG" > $LASTLOG_FILE fi - (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee $LOG + (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG return $exit_pldk else (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null @@ -146,17 +170,6 @@ fi } -# Example grep cvs /etc/poldek.conf: -# source = cvs /home/users/yoshi/rpm/RPMS/ -if [ "$UPDATE_POLDEK_INDEXES" = "yes" ]; then - run_poldek -l -n ${POLDEK_SOURCE} 1>&2 > /dev/null - if [ ! "$?" == "0" ]; then - echo "Using improper source '${POLDEK_SOURCE}' in /etc/poldek.conf" - echo "Fix it and try to continue" - exit 7 - fi -fi - #--------------------------------------------- # functions @@ -175,11 +188,13 @@ [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [-nu|--no-urls] [-v|--verbose] [--opts ] [--with/--without ] [--define ] [.spec] - + -5, --update-md5 - update md5 comments in spec, implies -nd -ncs +--adapter[ize] - run adapter.awk on SPECFILE -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd -ncs -n5, --no-md5 - ignore md5 comments in spec --D, --debug - enable script debugging mode, +-D, --debug - enable builder script debugging mode, +-debug - produce rpm debug package (same as --opts -debug) -V, --version - output builder version -a, --as_anon - get files via pserver as cvs@$CVS_SERVER, -b, -ba, --build - get all files from CVS repo or HTTP/FTP and build package @@ -192,7 +207,7 @@ -B, --branch - add branch -c, --clean - clean all temporarily created files (in BUILD, SOURCES, SPECS and \$RPM_BUILD_ROOT), --d , --cvsroot +-d , --cvsroot - setup \$CVSROOT, --define - define a macro with value , @@ -227,22 +242,30 @@ -FRB, --force-remove-build-requires - remove all you fetched with -R or --fetch-build-requires remember, this option works without confirmation, +-sf, --source-files - list sources - bare filenames (intended for offline + operations; does not work when Icon field is present + but icon file is absent), +-sp, --source-paths - list sources - filenames with full local paths (intended for + offline operations; does not work when Icon field is present + but icon file is absent), -T , --tag - add cvs tag for files, -Tvs, --tag-version-stable - - add cvs tags STABLE and NAME-VERSION-RELESE for files, + - add cvs tags STABLE and NAME-VERSION-RELEASE for files, -Tvn, --tag-version-nest - - add cvs tags NEST and NAME-VERSION-RELESE for files, + - add cvs tags NEST and NAME-VERSION-RELEASE for files, -Ts, --tag-stable - add cvs tag STABLE for files, -Tn, --tag-nest - add cvs tag NEST for files, -Tv, --tag-version - - add cvs tag NAME-VERSION-RELESE for files, + - add cvs tag NAME-VERSION-RELEASE for files, -Tp, --tag-prefix - add to NAME-VERSION-RELEASE tags, -tt, --test-tag - fail if tag is already present, +-ir, --integer-release-only + - allow only integer and snapshot releases -v, --verbose - be verbose, -u, --try-upgrade - check version, and try to upgrade package -un, --try-upgrade-with-float-version @@ -255,16 +278,20 @@ %_without_ macro switch. You may now use --with feat1 feat2 feat3 --without feat4 feat5 --with feat6 constructions. Set GROUP_BCONDS to yes to make use of it. ---target +--target , --target= - build for platform . " } cache_rpm_dump () { + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi rpm_dump_cache=` case "$RPMBUILD" in rpm ) - rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1 + rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1 ;; rpmbuild ) rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1 @@ -303,6 +330,13 @@ PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -n 1`" PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`" +# These variables may be unset after first cache_rpm_dump call +# (because of not-yet-retrieved icon file) +# +# if [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then +# Exit_error err_no_package_data; +# fi + if [ -n "$BE_VERBOSE" ]; then echo "- Sources : `nourl $SOURCES`" if [ -n "$PATCHES" ]; then @@ -347,7 +381,22 @@ remove_build_requires echo "Error: package build failed. (${2:-no more info})"; exit 5 ;; + "err_no_package_data" ) + remove_build_requires + echo "Error: couldn't get out package name/version/release from spec file." + exit 6 ;; + "err_tag_exists" ) + remove_build_requires + echo "Tag ${2} already exists (spec release: ${3})."; + exit 9 ;; + "err_fract_rel" ) + remove_build_requires + echo "Release ${2} not integer and not a snapshot."; + exit 10 ;; + esac + echo "Unknown error." + exit 100 } init_builder() @@ -423,7 +472,7 @@ chmod $CHMOD_MODE $SPECFILE fi unset OPTIONS - grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE + [ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE } find_mirror() @@ -463,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -473,7 +522,17 @@ sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \ grep -E '^[0-9a-f]{32}$') if [ X"$md5" = X"" ] ; then - grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs + source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$source_md5" ] ; then + echo $source_md5; + else + # we have empty SourceX-md5, but it is still possible + # that we have NoSourceX-md5 AND NoSource: X + nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" = X"" ] ; then + echo $nosource_md5; + fi; + fi; else if [ $(echo "$md5" | wc -l) != 1 ] ; then echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2 @@ -484,12 +543,12 @@ distfiles_url () { - echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$DISTFILES_SERVER/distfiles/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } distfiles_attic_url () { - echo "$PROTOCOL$DISTFILES_SERVER/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } good_md5 () @@ -499,6 +558,23 @@ [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ] } +good_size () +{ + size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)" + [ -n "$size" -a "$size" -gt 0 ] +} + +cvsignore_df () +{ + if [ "$CVSIGNORE_DF" != "yes" ]; then + return + fi + cvsignore=${SOURCE_DIR}/.cvsignore + if ! grep -q "^$1\$" $cvsignore 2> /dev/null; then + echo "$1" >> $cvsignore + fi +} + get_files() { GET_FILES="$@" @@ -547,7 +623,7 @@ fi if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i"; then echo "$(nourl "$i") having proper md5sum already exists" continue fi @@ -561,9 +637,9 @@ if [ -z "$NOMIRRORS" ]; then url="`find_mirror "$url"`" fi - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi fi if ! test -s "$target"; then @@ -574,13 +650,15 @@ if [ -z "$NOMIRRORS" ]; then url_attic="`find_mirror "$url_attic"`" fi - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi fi - if ! test -s "$target"; then + if test -s "$target"; then + cvsignore_df $target + else rm -f "$target" FROM_DISTFILES=0 fi @@ -613,7 +691,7 @@ ${GETURI} "$im" || \ if [ `echo $im | grep -E 'ftp://'` ]; then ${GETURI2} "$im" - fi + fi fi fi @@ -634,8 +712,8 @@ ' \ $SPECS_DIR/$SPECFILE fi - - if good_md5 "$i"; then + + if good_md5 "$i" && good_size "$i"; then : elif [ "$FROM_DISTFILES" = 1 ]; then # wrong md5 from distfiles: remove the file and try again @@ -643,24 +721,24 @@ echo "MD5 sum mismatch. Trying full fetch." FROM_DISTFILES=2 rm -f $target - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi if ! test -s "$target"; then rm -f "$target" - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi test -s "$target" || rm -f "$target" fi - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i" ; then : else - echo "MD5 sum mismatch. Use -U to refetch sources," + echo "MD5 sum mismatch or 0 size. Use -U to refetch sources," echo "or -5 to update md5 sums, if you're sure files are correct." Exit_error err_no_source_in_repo $i fi @@ -677,6 +755,12 @@ } make_tagver() { + + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi + # Check whether first character of PACKAGE_NAME is legal for tag name if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then TAG_PREFIX=tag_ @@ -807,16 +891,16 @@ eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE" eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE" parse_spec; + if [ -n "$ICONS" ]; then + get_files $ICONS; + parse_spec; + fi get_files "$SOURCES $PATCHES"; unset TOLDVER TNEWVER TNOTIFY fi fi cd "$SPECS_DIR" - - if [ -n "$TARGET" ]; then - TARGET_SWITCH="--target $TARGET" - fi - + case "$COMMAND" in build ) BUILD_SWITCH="-ba" ;; @@ -838,7 +922,7 @@ echo "LASTLOG=$LOG" > $LASTLOG_FILE fi RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM - (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG + (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG RETVAL=`cat $RES_FILE` rm $RES_FILE if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then @@ -849,7 +933,7 @@ fi fi else - eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE + eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE RETVAL=$? fi if [ "$RETVAL" -ne "0" ]; then @@ -860,7 +944,6 @@ Exit_error err_build_fail; fi unset BUILD_SWITCH - unset TARGET_SWITCH } nourl() @@ -868,7 +951,6 @@ echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g' } - install_required_packages() { run_poldek -vi $1 @@ -881,16 +963,56 @@ AVAIL_BCONDS_WITH="" if `grep -q ^%bcond ${SPECFILE}`; then BCOND_VERSION="NEW" - elif `grep -q bcond ${SPECFILE}`; then + elif `egrep -q ^#\ *_with ${SPECFILE}`; then BCOND_VERSION="OLD" else BCOND_VERSION="NONE" fi + + # expand bconds from ~/.bcondrc + # The file structure is like gentoo's package.use: + # --- + # * -selinux + # samba -mysql -pgsql + # w32codec-installer license_agreement + # php +mysqli + # --- + if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then + # This takes package name, first defined in spec. + # so consider that when defining flags for package. + PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1` + AVAIL=`$RPMBUILD --bcond $SPECFILE` + + BCONDRC=$HOME/.bcondrc + [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && BCONDRC=$HOME_ETC/.bcondrc + + while read pkg flags; do + # ignore comments + [[ "$pkg" == \#* ]] && continue + + # any package or current package? + if [ "$pkg" = "*" ] || [ "$pkg" = "$PN" ]; then + for flag in $flags; do + opt=${flag#[+-]} + + # use only flags which are in this package. + if [[ $AVAIL = *${opt}* ]]; then + if [[ $flag = -* ]]; then + BCOND="$BCOND --without $opt" + else + BCOND="$BCOND --with $opt" + fi + fi + done + fi + done < $BCONDRC + fi + case "${BCOND_VERSION}" in NONE) - : + : ;; - OLD) + OLD) echo "Warning: This spec has old style bconds. Fix it || die." for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_without_` do @@ -901,7 +1023,7 @@ AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT" fi done - + for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_with_` do AVAIL_BCOND_WITH=`echo $opt|sed -e "s/^_with_//g"` @@ -923,6 +1045,22 @@ _with) cond_type="with" ;; + _without_*) + AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`" + if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/builder?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Tue Aug 23 21:41:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: builder - v0.13 :) In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:41:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - v0.13 :) ---- Files affected: SPECS: builder (1.324 -> 1.325) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.324 SPECS/builder:1.325 --- SPECS/builder:1.324 Tue Aug 23 21:28:11 2005 +++ SPECS/builder Tue Aug 23 21:41:39 2005 @@ -26,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.12 (C) 1999-2005 Free Penguins". +V 0.13 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.324&r2=1.325&f=u From pluto at pld-linux.org Tue Aug 23 21:59:36 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: gcc.spec - %files updated, rebuild. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 19:59:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %files updated, rebuild. ---- Files affected: SPECS: gcc.spec (1.358 -> 1.359) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.358 SPECS/gcc.spec:1.359 --- SPECS/gcc.spec:1.358 Tue Aug 23 15:21:59 2005 +++ SPECS/gcc.spec Tue Aug 23 21:59:29 2005 @@ -41,7 +41,7 @@ Name: gcc Version: 4.1.0 %define _snap 20050823T1409UTC -Release: 0.%{_snap}.1 +Release: 0.%{_snap}.2 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1173,8 +1173,6 @@ %attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain %{_infodir}/fastjar* %{_infodir}/gcj* -%{_infodir}/hacking* -%{_infodir}/vmintegration* %{_mandir}/man1/fastjar* %{_mandir}/man1/gcj* %{_mandir}/man1/gjnih* @@ -1280,6 +1278,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.359 2005/08/23 19:59:29 pluto +- %files updated, rebuild. + Revision 1.358 2005/08/23 13:21:59 pluto - updated to 4.1.0-20050823T1409UTC. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.358&r2=1.359&f=u From glen at pld-linux.org Tue Aug 23 22:00:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: macromedia-flash.spec - update URL In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:00:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update URL ---- Files affected: SPECS: macromedia-flash.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.33 SPECS/macromedia-flash.spec:1.34 --- SPECS/macromedia-flash.spec:1.33 Tue Aug 23 21:17:50 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:00:05 2005 @@ -21,7 +21,7 @@ %else Source0: license-installer.sh %endif -URL: http://www.macromedia.com/software/flash/ +URL: http://www.macromedia.com/software/flashplayer/ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/23 20:00:05 glen +- update URL + Revision 1.33 2005/08/23 19:17:50 glen - unzip unneccessary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.33&r2=1.34&f=u From twittner at pld-linux.org Tue Aug 23 22:11:04 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: man.spec - force make -j1 - simultaneous builds fail (repor... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 20:11:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ---- Files affected: SPECS: man.spec (1.104 -> 1.105) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.104 SPECS/man.spec:1.105 --- SPECS/man.spec:1.104 Tue Aug 23 21:18:09 2005 +++ SPECS/man.spec Tue Aug 23 22:10:58 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - %{__make} \ +%{__make} -j1 \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.105 2005/08/23 20:10:58 twittner +- force make -j1 - simultaneous builds fail (reported by paszczus, + confirmed by me) + Revision 1.104 2005/08/23 19:18:09 paszczus - backing to %{__make} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.104&r2=1.105&f=u From glen at pld-linux.org Tue Aug 23 22:16:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES: horde-path.patch - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:16:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SOURCES: horde-path.patch (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SOURCES/horde-path.patch diff -u SOURCES/horde-path.patch:1.9 SOURCES/horde-path.patch:1.10 --- SOURCES/horde-path.patch:1.9 Mon May 9 19:57:40 2005 +++ SOURCES/horde-path.patch Tue Aug 23 22:16:24 2005 @@ -1,433 +1,14 @@ --- horde-3.0-rc3/config/registry.php.dist 2004-11-01 11:39:39.000000000 +0000 -+++ horde-3.0-rc3.new/config/registry.php.dist 2004-12-12 23:00:36.489047024 +0000 -@@ -45,7 +45,7 @@ - // variable uses forward slashes. If it does not, you'll have to tweak ++++ ./config/registry.php.dist 2005-08-23 23:15:12.000000000 +0300 +@@ -46,7 +46,7 @@ // this. if (isset($_SERVER['PHP_SELF'])) { -- $webroot = strstr(dirname(__FILE__), '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); -+ $webroot = strstr("/usr/share/horde", '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); + $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY); +- $webroot = strstr(dirname(__FILE__), '/' . array_shift($webroot)); ++ $webroot = strstr("/usr/share/horde", '/' . array_shift($webroot)); if ($webroot !== false) { $webroot = preg_replace(';/config$;', '', $webroot); } else { -@@ -56,17 +56,17 @@ - } - - $this->applications['horde'] = array( -- 'fileroot' => dirname(__FILE__) . '/..', -+ 'fileroot' => '/usr/share/horde', - 'webroot' => $webroot, - 'initial_page' => 'login.php', - 'name' => _("Horde"), - 'status' => 'active', -- 'templates' => dirname(__FILE__) . '/../templates', -+ 'templates' => '/usr/share/horde/templates', - 'provides' => 'horde' - ); - - $this->applications['imp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../imp', -+ 'fileroot' => '/usr/share/horde/imp', - 'webroot' => $this->applications['horde']['webroot'] . '/imp', - 'name' => _("Mail"), - 'status' => 'active', -@@ -81,7 +81,7 @@ - ); - - $this->applications['ingo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ingo', -+ 'fileroot' => '/usr/share/horde/ingo', - 'webroot' => $this->applications['horde']['webroot'] . '/ingo', - 'name' => _("Filters"), - 'status' => 'active', -@@ -129,7 +129,7 @@ - ); - - $this->applications['turba'] = array( -- 'fileroot' => dirname(__FILE__) . '/../turba', -+ 'fileroot' => '/usr/share/horde/turba', - 'webroot' => $this->applications['horde']['webroot'] . '/turba', - 'name' => _("Address Book"), - 'status' => 'active', -@@ -138,7 +138,7 @@ - ); - - $this->applications['kronolith'] = array( -- 'fileroot' => dirname(__FILE__) . '/../kronolith', -+ 'fileroot' => '/usr/share/horde/kronolith', - 'webroot' => $this->applications['horde']['webroot'] . '/kronolith', - 'name' => _("Calendar"), - 'status' => 'active', -@@ -154,7 +154,7 @@ - ); - - $this->applications['mnemo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mnemo', -+ 'fileroot' => '/usr/share/horde/mnemo', - 'webroot' => $this->applications['horde']['webroot'] . '/mnemo', - 'name' => _("Notes"), - 'status' => 'active', -@@ -163,7 +163,7 @@ - ); - - $this->applications['nag'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nag', -+ 'fileroot' => '/usr/share/horde/nag', - 'webroot' => $this->applications['horde']['webroot'] . '/nag', - 'name' => _("Tasks"), - 'status' => 'active', -@@ -195,7 +195,7 @@ - ); - - $this->applications['chora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../chora', -+ 'fileroot' => '/usr/share/horde/chora', - 'webroot' => $this->applications['horde']['webroot'] . '/chora', - 'name' => _("Version Control"), - 'status' => 'active', -@@ -284,7 +284,7 @@ - ); - - $this->applications['klutz'] = array( -- 'fileroot' => dirname(__FILE__) . '/../klutz', -+ 'fileroot' => '/usr/share/horde/klutz', - 'webroot' => $this->applications['horde']['webroot'] . '/klutz', - 'name' => _("Comics"), - 'status' => 'inactive', ---- ./config/registry.php.dist~ 2005-03-04 20:59:19.000000000 +0200 -+++ ./config/registry.php.dist 2005-03-04 21:00:57.000000000 +0200 -@@ -90,7 +90,7 @@ - ); - - $this->applications['sam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sam', -+ 'fileroot' => '/usr/share/horde/sam', - 'webroot' => $this->applications['horde']['webroot'] . '/sam', - 'name' => _("Spam"), - 'status' => 'inactive', -@@ -101,7 +101,7 @@ - ); - - $this->applications['troll'] = array( -- 'fileroot' => dirname(__FILE__) . '/../troll', -+ 'fileroot' => '/usr/share/horde/troll', - 'webroot' => $this->applications['horde']['webroot'] . '/troll', - 'name' => _("Newsgroups"), - 'status' => 'inactive', -@@ -109,7 +109,7 @@ - ); - - $this->applications['vilma'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vilma', -+ 'fileroot' => '/usr/share/horde/vilma', - 'webroot' => $this->applications['horde']['webroot'] . '/vilma', - 'name' => _("Mail Admin"), - 'status' => 'inactive', -@@ -117,7 +117,7 @@ - ); - - $this->applications['mimp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mimp', -+ 'fileroot' => '/usr/share/horde/mimp', - 'webroot' => $this->applications['horde']['webroot'] . '/mimp', - 'name' => _("Mobile Mail"), - 'status' => 'inactive' -@@ -172,7 +172,7 @@ - ); - - $this->applications['genie'] = array( -- 'fileroot' => dirname(__FILE__) . '/../genie', -+ 'fileroot' => '/usr/share/horde/genie', - 'webroot' => $this->applications['horde']['webroot'] . '/genie', - 'name' => _("Wishlists"), - 'status' => 'inactive', -@@ -181,7 +181,7 @@ - ); - - $this->applications['trean'] = array( -- 'fileroot' => dirname(__FILE__) . '/../trean', -+ 'fileroot' => '/usr/share/horde/trean', - 'webroot' => $this->applications['horde']['webroot'] . '/trean', - 'name' => _("Bookmarks"), - 'status' => 'inactive', -@@ -203,7 +203,7 @@ - ); - - $this->applications['babel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../babel', -+ 'fileroot' => '/usr/share/horde/babel', - 'webroot' => $this->applications['horde']['webroot'] . '/babel', - 'name' => _("i18n"), - 'status' => 'inactive', -@@ -211,7 +211,7 @@ - ); - - $this->applications['thor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../thor', -+ 'fileroot' => '/usr/share/horde/thor', - 'webroot' => $this->applications['horde']['webroot'] . '/thor', - 'name' => _("Projects"), - 'status' => 'inactive', -@@ -220,7 +220,7 @@ - ); - - $this->applications['whups'] = array( -- 'fileroot' => dirname(__FILE__) . '/../whups', -+ 'fileroot' => '/usr/share/horde/whups', - 'webroot' => $this->applications['horde']['webroot'] . '/whups', - 'name' => _("Tickets"), - 'status' => 'inactive', -@@ -229,7 +229,7 @@ - ); - - $this->applications['luxor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../luxor', -+ 'fileroot' => '/usr/share/horde/luxor', - 'webroot' => $this->applications['horde']['webroot'] . '/luxor', - 'name' => _("X-Ref"), - 'status' => 'inactive', -@@ -237,7 +237,7 @@ - ); - - $this->applications['nic'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nic', -+ 'fileroot' => '/usr/share/horde/nic', - 'webroot' => $this->applications['horde']['webroot'] . '/nic', - 'name' => _("Network"), - 'status' => 'inactive', -@@ -251,7 +251,7 @@ - ); - - $this->applications['mottle'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mottle', -+ 'fileroot' => '/usr/share/horde/mottle', - 'webroot' => $this->applications['horde']['webroot'] . '/mottle', - 'name' => _("MOTD"), - 'status' => 'inactive', -@@ -259,7 +259,7 @@ - ); - - $this->applications['jonah'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jonah', -+ 'fileroot' => '/usr/share/horde/jonah', - 'webroot' => $this->applications['horde']['webroot'] . '/jonah', - 'name' => _("News"), - 'status' => 'inactive', -@@ -268,7 +268,7 @@ - ); - - $this->applications['occam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../occam', -+ 'fileroot' => '/usr/share/horde/occam', - 'webroot' => $this->applications['horde']['webroot'] . '/occam', - 'name' => _("Courses"), - 'status' => 'inactive', -@@ -276,7 +276,7 @@ - ); - - $this->applications['goops'] = array( -- 'fileroot' => dirname(__FILE__) . '/../goops', -+ 'fileroot' => '/usr/share/horde/goops', - 'webroot' => $this->applications['horde']['webroot'] . '/goops', - 'name' => _("Search Engines"), - 'status' => 'inactive', -@@ -293,7 +293,7 @@ - ); - - $this->applications['orator'] = array( -- 'fileroot' => dirname(__FILE__) . '/../orator', -+ 'fileroot' => '/usr/share/horde/orator', - 'webroot' => $this->applications['horde']['webroot'] . '/orator', - 'name' => _("Presentations"), - 'status' => 'inactive', -@@ -306,7 +306,7 @@ - ); - - $this->applications['hermes'] = array( -- 'fileroot' => dirname(__FILE__) . '/../hermes', -+ 'fileroot' => '/usr/share/horde/hermes', - 'webroot' => $this->applications['horde']['webroot'] . '/hermes', - 'name' => _("Time Tracking"), - 'status' => 'inactive', -@@ -315,7 +315,7 @@ - ); - - $this->applications['juno'] = array( -- 'fileroot' => dirname(__FILE__) . '/../juno', -+ 'fileroot' => '/usr/share/horde/juno', - 'webroot' => $this->applications['horde']['webroot'] . '/juno', - 'name' => _("Accounting"), - 'status' => 'inactive', -@@ -323,7 +323,7 @@ - ); - - $this->applications['sesha'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sesha', -+ 'fileroot' => '/usr/share/horde/sesha', - 'webroot' => $this->applications['horde']['webroot'] . '/sesha', - 'name' => _("Inventory"), - 'status' => 'inactive', -@@ -336,7 +336,7 @@ - ); - - $this->applications['accounts'] = array( -- 'fileroot' => dirname(__FILE__) . '/../accounts', -+ 'fileroot' => '/usr/share/horde/accounts', - 'webroot' => $this->applications['horde']['webroot'] . '/accounts', - 'name' => _("My Account"), - 'status' => 'inactive', -@@ -344,7 +344,7 @@ - ); - - $this->applications['gollem'] = array( -- 'fileroot' => dirname(__FILE__) . '/../gollem', -+ 'fileroot' => '/usr/share/horde/gollem', - 'webroot' => $this->applications['horde']['webroot'] . '/gollem', - 'name' => _("File Manager"), - 'status' => 'inactive', -@@ -353,7 +353,7 @@ - ); - - $this->applications['forwards'] = array( -- 'fileroot' => dirname(__FILE__) . '/../forwards', -+ 'fileroot' => '/usr/share/horde/forwards', - 'webroot' => $this->applications['horde']['webroot'] . '/forwards', - 'name' => _("Forwards"), - 'status' => 'inactive', -@@ -362,7 +362,7 @@ - ); - - $this->applications['passwd'] = array( -- 'fileroot' => dirname(__FILE__) . '/../passwd', -+ 'fileroot' => '/usr/share/horde/passwd', - 'webroot' => $this->applications['horde']['webroot'] . '/passwd', - 'name' => _("Password"), - 'status' => 'inactive', -@@ -370,7 +370,7 @@ - ); - - $this->applications['jeta'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jeta', -+ 'fileroot' => '/usr/share/horde/jeta', - 'webroot' => $this->applications['horde']['webroot'] . '/jeta', - 'name' => _("SSH"), - 'status' => 'inactive', -@@ -378,7 +378,7 @@ - ); - - $this->applications['vacation'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vacation', -+ 'fileroot' => '/usr/share/horde/vacation', - 'webroot' => $this->applications['horde']['webroot'] . '/vacation', - 'name' => _("Vacation"), - 'status' => 'inactive', -@@ -392,7 +392,7 @@ - ); - - $this->applications['giapeto'] = array( -- 'fileroot' => dirname(__FILE__) . '/../giapeto', -+ 'fileroot' => '/usr/share/horde/giapeto', - 'webroot' => $this->applications['horde']['webroot'] . '/giapeto', - 'name' => _("CMS"), - 'status' => 'inactive', -@@ -401,7 +401,7 @@ - ); - - $this->applications['midas'] = array( -- 'fileroot' => dirname(__FILE__) . '/../midas', -+ 'fileroot' => '/usr/share/horde/midas', - 'webroot' => $this->applications['horde']['webroot'] . '/midas', - 'name' => _("Ads"), - 'status' => 'inactive', -@@ -409,7 +409,7 @@ - ); - - $this->applications['agora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../agora', -+ 'fileroot' => '/usr/share/horde/agora', - 'webroot' => $this->applications['horde']['webroot'] . '/agora', - 'name' => _("Forums"), - 'status' => 'inactive', -@@ -418,7 +418,7 @@ - ); - - $this->applications['odin'] = array( -- 'fileroot' => dirname(__FILE__) . '/../odin', -+ 'fileroot' => '/usr/share/horde/odin', - 'webroot' => $this->applications['horde']['webroot'] . '/odin', - 'name' => _("Data"), - 'status' => 'inactive', -@@ -426,7 +426,7 @@ - ); - - $this->applications['ulaform'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ulaform', -+ 'fileroot' => '/usr/share/horde/ulaform', - 'webroot' => $this->applications['horde']['webroot'] . '/ulaform', - 'name' => _("Forms"), - 'status' => 'inactive', -@@ -434,7 +434,7 @@ - ); - - $this->applications['volos'] = array( -- 'fileroot' => dirname(__FILE__) . '/../volos', -+ 'fileroot' => '/usr/share/horde/volos', - 'webroot' => $this->applications['horde']['webroot'] . '/volos', - 'name' => _("Guestbook"), - 'status' => 'inactive', -@@ -442,7 +442,7 @@ - ); - - $this->applications['ansel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ansel', -+ 'fileroot' => '/usr/share/horde/ansel', - 'webroot' => $this->applications['horde']['webroot'] . '/ansel', - 'name' => _("Photos"), - 'status' => 'inactive', -@@ -451,7 +451,7 @@ - ); - - $this->applications['scry'] = array( -- 'fileroot' => dirname(__FILE__) . '/../scry', -+ 'fileroot' => '/usr/share/horde/scry', - 'webroot' => $this->applications['horde']['webroot'] . '/scry', - 'name' => _("Polls"), - 'status' => 'inactive', -@@ -460,7 +460,7 @@ - ); - - $this->applications['rakim'] = array( -- 'fileroot' => dirname(__FILE__) . '/../rakim', -+ 'fileroot' => '/usr/share/horde/rakim', - 'webroot' => $this->applications['horde']['webroot'] . '/rakim', - 'name' => _("Support"), - 'status' => 'inactive', -@@ -468,7 +468,7 @@ - ); - - $this->applications['merk'] = array( -- 'fileroot' => dirname(__FILE__) . '/../merk', -+ 'fileroot' => '/usr/share/horde/merk', - 'webroot' => $this->applications['horde']['webroot'] . '/merk', - 'name' => _("Shopping"), - 'status' => 'inactive', -@@ -476,7 +476,7 @@ - ); - - $this->applications['swoosh'] = array( -- 'fileroot' => dirname(__FILE__) . '/../swoosh', -+ 'fileroot' => '/usr/share/horde/swoosh', - 'webroot' => $this->applications['horde']['webroot'] . '/swoosh', - 'name' => _("SMS Messaging"), - 'status' => 'inactive', -@@ -485,7 +485,7 @@ - ); - - $this->applications['wicked'] = array( -- 'fileroot' => dirname(__FILE__) . '/../wicked', -+ 'fileroot' => '/usr/share/horde/wicked', - 'webroot' => $this->applications['horde']['webroot'] . '/wicked', - 'name' => _("Wiki"), - 'status' => 'inactive', --- ./config/registry.php.dist~ 2005-03-04 21:02:58.000000000 +0200 +++ ./config/registry.php.dist 2005-03-04 21:12:11.517027935 +0200 @@ -223,7 +223,7 @@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-path.patch?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 22:24:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: horde.spec - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:24:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SPECS: horde.spec (1.95 -> 1.96) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.95 SPECS/horde.spec:1.96 --- SPECS/horde.spec:1.95 Sun May 22 22:15:19 2005 +++ SPECS/horde.spec Tue Aug 23 22:23:55 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ # TODO: # - support for Oracle and Sybase +# - Support SQLite and Oracle in all SQL configurations. +# - LDAP and memcached session handlers. # - remove config/ (and others in apache.conf) from document root, so # apache deny from all not needed. # - put docs/CREDITS to package, rather in doc (so installations with @@ -12,40 +14,40 @@ Summary(pl): Wsp?lny szkielet Horde do wszystkich modu??w Horde Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde -Version: 3.0.4 -Release: 6 +Version: 3.0.5 +Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz -# Source0-md5: e2221d409ba1c8841ce4ecee981d7b61 +# Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch Patch3: %{name}-blank-admins.patch -Patch4: %{name}-fix-config-blanks.patch +Patch4: %{name}-config-xml.patch URL: http://www.horde.org/ -BuildRequires: rpmbuild(macros) >= 1.177 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 Requires(triggerpostun): grep Requires(triggerpostun): sed >= 4.0 Requires: apache >= 1.3.33-3 -Requires: apache(mod_dir) >= 1.3.22 Requires: apache(mod_access) Requires: apache(mod_alias) +Requires: apache(mod_dir) >= 1.3.22 Requires: php >= 4.1.0 +Requires: php-domxml Requires: php-gettext >= 4.1.0 Requires: php-imap >= 4.1.0 Requires: php-mcrypt >= 4.1.0 -Requires: php-pear-PEAR -Requires: php-pear-Log Requires: php-pcre >= 4.1.0 +Requires: php-pear-Log +Requires: php-pear-PEAR Requires: php-posix >= 4.1.0 Requires: php-session >= 4.1.0 Requires: php-xml >= 4.1.0 Requires: php-zlib >= 4.1.0 -Requires: php-domxml Obsoletes: horde-mysql Obsoletes: horde-pgsql BuildArch: noarch @@ -58,11 +60,8 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org %define _appdir %{hordedir} -%define _apache1dir /etc/apache -%define _apache2dir /etc/httpd %define schemadir /usr/share/openldap/schema - %description The Horde Framework provides a common structure and interface for Horde modules (such as IMP, a web-based mail program). This RPM is @@ -106,13 +105,17 @@ Ten pakiet zawiera horde.schema dla pakietu openldap. %prep -%setup -q +%setup -q %{?_rc:-n %{name}-%{version}-%{_rc}} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 +sed -i -e " +s#dirname(__FILE__) . '/..#'%{hordedir}#g +" config/registry.php.dist + # Described in documentation as dangerous file... rm test.php @@ -121,16 +124,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_appdir}/{admin,js,services} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \ - $RPM_BUILD_ROOT/var/log/%{name} \ + $RPM_BUILD_ROOT/var/{lib,log}/%{name} \ $RPM_BUILD_ROOT%{schemadir} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.php.dist; do cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) done -sed -e ' - s,/tmp/horde.log,/var/log/%{name}/%{name}.log, -'< config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml + +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak cp -pR admin/* $RPM_BUILD_ROOT%{_appdir}/admin @@ -159,21 +161,6 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak fi -# apache1 -if [ -d %{_apache1dir}/conf.d ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache1dir}/conf.d/99_%{name}.conf - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi -fi -# apache2 -if [ -d %{_apache2dir}/httpd.conf ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi -fi - if [ "$1" = 1 ]; then %banner %{name} -e <&2 - fi - fi - # apache2 - if [ -d %{_apache2dir}/httpd.conf ]; then - rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi - fi -fi - %post -n openldap-schema-horde if ! grep -q %{schemadir}/horde.schema /etc/openldap/slapd.conf; then sed -i -e ' @@ -244,6 +213,18 @@ fi fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %triggerpostun -- horde <= 2.2.7-2 for i in horde.php html.php lang.php mime_drivers.php mime_mapping.php motd.php prefs.php registry.php; do if [ -f /home/services/httpd/html/horde/config/$i.rpmsave ]; then @@ -267,14 +248,14 @@ fi fi -if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then +if [ -f /etc/apache/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache1dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/apache/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi -if [ -f %{_apache2dir}/horde.conf.rpmsave ]; then +if [ -f /etc/httpd/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi # unified location @@ -284,11 +265,11 @@ fi if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 + /etc/rc.d/init.d/apache reload 1>&2 fi if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi %files @@ -317,6 +298,7 @@ %{_appdir}/themes %dir %attr(770,root,http) /var/log/%{name} +%dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log %files -n openldap-schema-horde @@ -329,6 +311,36 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96 2005/08/23 20:23:55 glen +- merged from DEVEL, updated to 3.0.5 + +Revision 1.95.2.9 2005/08/15 21:49:37 glen +- sorter BR/R with adapter + +Revision 1.95.2.8 2005/08/15 21:31:19 glen +- adapter "friendly" + +Revision 1.95.2.7 2005/07/31 10:52:01 glen +- include /var/lib/horde to package (one can store vfs tmp data there) + +Revision 1.95.2.6 2005/07/31 10:40:45 glen +- use apache config triggers + +Revision 1.95.2.5 2005/07/31 10:29:13 glen +- patch conf.xml, rather sed-ing + +Revision 1.95.2.4 2005/07/16 14:22:34 glen +- 3.0.5-RC2 + +Revision 1.95.2.3 2005/07/13 07:00:23 glen +- TODO updated + +Revision 1.95.2.2 2005/07/12 20:34:29 glen +- make df happy + +Revision 1.95.2.1 2005/07/12 20:19:57 glen +- 3.0.5-rc1 + Revision 1.95 2005/05/22 20:15:19 glen - fix for Ticket #2013. rel 6; STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.95&r2=1.96&f=u From glen at pld-linux.org Tue Aug 23 22:24:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: DISTFILES: horde-3.0.5.tar.gz Message-ID: <14271.1124828668@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz Size: 3549687 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: SPECS: ocaml-findlib.spec - updated to 1.0.4 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:25:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.4 ; STBR ---- Files affected: SPECS: ocaml-findlib.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.15 SPECS/ocaml-findlib.spec:1.16 --- SPECS/ocaml-findlib.spec:1.15 Mon Jun 6 16:24:03 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:25:31 2005 @@ -2,14 +2,14 @@ Summary: OCaml module manager Summary(pl): Zarz?dca modu??w OCamla Name: ocaml-findlib -Version: 0.8.1 -Release: 6 +Version: 1.0.4 +Release: 1 License: distributable Group: Development/Tools Vendor: Gerd Stolpmann URL: http://www.ocaml-programming.de/packages/ -# Source0-md5: b4643888d1a6626981113e23a92b9154 Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz +# Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -69,7 +69,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install PREFIX=$RPM_BUILD_ROOT +%{__make} install prefix=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli @@ -92,7 +92,7 @@ %files %defattr(644,root,root,755) -%doc README LICENSE doc/html +%doc README LICENSE doc/*-html %attr(755,root,root) %{_bindir}/* %config %{_sysconfdir}/ocamlfind.conf %{_libdir}/ocaml/site-lib @@ -105,7 +105,6 @@ %{_libdir}/ocaml/findlib/*.a %{_libdir}/ocaml/ocamlfind %{_libdir}/ocaml/topfind -%{_mandir}/man3/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -113,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/23 20:25:31 paszczus +- updated to 1.0.4 ; STBR + Revision 1.15 2005/06/06 14:24:03 zbyniu - BR: ncurses-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.15&r2=1.16&f=u From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:16 2005 Subject: DISTFILES: findlib-1.0.4.tar.gz Message-ID: <15253.1124828736@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ocaml-programming.de/packages/findlib-1.0.4.tar.gz dbfabe1b3677a03bcf238ecccb36d84f findlib-1.0.4.tar.gz Size: 148287 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:26:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:16 2005 Subject: SOURCES: horde-fix-config-blanks.patch (REMOVED) - outdated in 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:26:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated in 3.0.5 ---- Files affected: SOURCES: horde-fix-config-blanks.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paszczus at pld-linux.org Tue Aug 23 22:32:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: gollem.spec - updated to FINAL 1.0 In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:32:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to FINAL 1.0 ---- Files affected: SPECS: gollem.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.9 SPECS/gollem.spec:1.10 --- SPECS/gollem.spec:1.9 Tue Aug 2 22:29:34 2005 +++ SPECS/gollem.spec Tue Aug 23 22:32:23 2005 @@ -1,18 +1,15 @@ # $Revision$, $Date$ -%define _rc rc2 -%define _rel 1 - %include /usr/lib/rpm/macros.php Summary: Gollem - the Horde File Manager Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.%{_rc}.%{_rel} +Release: 0.1 License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/gollem/%{name}-%{version}-%{_rc}.tar.gz -# Source0-md5: c5270fd6603ddf21682e7dcbb41b195c +Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz +# Source0-md5: 29f668de08c0672169cbe52a80dc1771 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/gollem/ @@ -54,7 +51,7 @@ Gollema) mo?na znale?? na stronie . %prep -%setup -q -n %{name}-%{version}-%{_rc} +%setup -q -n %{name}-h3-%{version} tar zxf %{SOURCE0} --strip-components=1 %patch0 -p1 @@ -132,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 20:32:23 paszczus +- updated to FINAL 1.0 + Revision 1.9 2005/08/02 20:29:34 qboosh - typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.9&r2=1.10&f=u From paszczus at pld-linux.org Tue Aug 23 22:32:38 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gollem-h3-1.0.tar.gz Message-ID: <18933.1124829158@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/gollem/gollem-h3-1.0.tar.gz 29f668de08c0672169cbe52a80dc1771 gollem-h3-1.0.tar.gz Size: 680558 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:34:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): adapter.spec - tests updated In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - tests updated ---- Files affected: SPECS: adapter.spec (1.26.2.6 -> 1.26.2.7) ---- Diffs: ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.6 SPECS/adapter.spec:1.26.2.7 --- SPECS/adapter.spec:1.26.2.6 Fri Jul 15 09:01:45 2005 +++ SPECS/adapter.spec Tue Aug 23 22:33:58 2005 @@ -35,13 +35,21 @@ %{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8} PreReq: sh-utils Requires(pre): /bin/id -Requires(pre): /usr/sbin/useradd Requires(post): /bin/hostname +Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/userdel Requires: pam >= 0.77.3 +Requires: ll +Requires: c +# this is comment to R: aaaa +Requires: aaaa Requires: daemontools >= 0.76-1.4 BuildRequires: rpm-pythonprov %{?with_home_etc:Requires: home-etc >= 1.0.8} +%{!?with_home_etc:Requires: home-etc <= 1} +Requires: poop +Conflicts: qmail-client1 +Requires: afterwards Conflicts: qmail-client Provides: group(nofiles) Obsoletes: zmailer @@ -134,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.7 2005/08/23 20:33:58 glen +- tests updated + Revision 1.26.2.6 2005/07/15 07:01:45 glen - fix fix-info-dir misuse in %post ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.6&r2=1.26.2.7&f=u From glen at pld-linux.org Tue Aug 23 22:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): adapter.awk, adapter.spec - replace name and versio... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - replace name and version with macros in %setup. req by PaSzCzUs ---- Files affected: SPECS: adapter.awk (1.171 -> 1.172) , adapter.spec (1.26.2.7 -> 1.26.2.8) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.171 SPECS/adapter.awk:1.172 --- SPECS/adapter.awk:1.171 Tue Aug 16 00:06:39 2005 +++ SPECS/adapter.awk Tue Aug 23 22:34:51 2005 @@ -206,6 +206,11 @@ sub(/^%setup/, "%setup -q") } + if (/^%setup/) { + gsub(name, "%{name}"); + gsub(version, "%{version}"); + } + if (/^%setup/ && /-n %{name}-%{version}( |$)/) { sub(/ -n %{name}-%{version}/, "") } ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.7 SPECS/adapter.spec:1.26.2.8 --- SPECS/adapter.spec:1.26.2.7 Tue Aug 23 22:33:58 2005 +++ SPECS/adapter.spec Tue Aug 23 22:34:51 2005 @@ -64,6 +64,7 @@ - this one gets wrapped, but logically it shouldn't due bcond %prep +%setup -q -n adapter-0.666 %setup -q -n %{name}-%{version} %setup -q -c -n %{name}-%{version} %setup -q -n %{name}-%{version}.orig -a 1 @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.8 2005/08/23 20:34:51 glen +- replace name and version with macros in %setup. req by PaSzCzUs + Revision 1.26.2.7 2005/08/23 20:33:58 glen - tests updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.171&r2=1.172&f=u http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.7&r2=1.26.2.8&f=u From paszczus at pld-linux.org Tue Aug 23 22:38:49 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: pcre-ocaml-5.10.1.tar.bz2 Message-ID: <23014.1124829529@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-5.10.1.tar.bz2 d53864f6a0436e40c3cdedcdc8352aba pcre-ocaml-5.10.1.tar.bz2 Size: 46328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:38:42 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: ocaml-pcre.spec - updated to 5.10.1 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:38:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 5.10.1 ; STBR ---- Files affected: SPECS: ocaml-pcre.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/ocaml-pcre.spec diff -u SPECS/ocaml-pcre.spec:1.8 SPECS/ocaml-pcre.spec:1.9 --- SPECS/ocaml-pcre.spec:1.8 Thu Mar 17 10:02:37 2005 +++ SPECS/ocaml-pcre.spec Tue Aug 23 22:38:35 2005 @@ -2,13 +2,13 @@ Summary: PCRE binding for OCaml Summary(pl): Wi?zania PCRE dla OCamla Name: ocaml-pcre -Version: 5.09.0 +Version: 5.10.1 Release: 1 License: LGPL Group: Libraries Vendor: Markus Mottl Source0: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-%{version}.tar.bz2 -# Source0-md5: 070e556348e050c4d3d75e8917e7e322 +# Source0-md5: d53864f6a0436e40c3cdedcdc8352aba URL: http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html BuildRequires: pcre-devel BuildRequires: ocaml-findlib @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 20:38:35 paszczus +- updated to 5.10.1 ; STBR + Revision 1.8 2005/03/17 09:02:37 paszczus - updated to 5.09.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-pcre.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Tue Aug 23 22:39:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: ocaml-findlib.spec - unified, pl cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:39:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified, pl cosmetics ---- Files affected: SPECS: ocaml-findlib.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.16 SPECS/ocaml-findlib.spec:1.17 --- SPECS/ocaml-findlib.spec:1.16 Tue Aug 23 22:25:31 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:39:40 2005 @@ -7,9 +7,9 @@ License: distributable Group: Development/Tools Vendor: Gerd Stolpmann -URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz # Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f +URL: http://www.ocaml-programming.de/packages/ BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -26,9 +26,9 @@ %description -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. %package devel Summary: OCaml module manager @@ -46,9 +46,9 @@ %description devel -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba. @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 20:39:40 qboosh +- unified, pl cosmetics + Revision 1.16 2005/08/23 20:25:31 paszczus - updated to 1.0.4 ; STBR @@ -164,4 +167,3 @@ Revision 1.1 2002/05/10 11:32:51 malekith - initial; from scratch - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Tue Aug 23 22:41:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: macromedia-flash.spec - updated pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:41:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl desc ---- Files affected: SPECS: macromedia-flash.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.34 SPECS/macromedia-flash.spec:1.35 --- SPECS/macromedia-flash.spec:1.34 Tue Aug 23 22:00:05 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:41:27 2005 @@ -50,7 +50,7 @@ %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -Supported browsers: %{browsers}. +Obs?ugiwane przegl?darki: %{browsers}. %prep %if %{with license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/23 20:41:27 qboosh +- updated pl desc + Revision 1.34 2005/08/23 20:00:05 glen - update URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Tue Aug 23 22:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: web-cyradm.spec - pl fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fixes ---- Files affected: SPECS: web-cyradm.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.1 SPECS/web-cyradm.spec:1.2 --- SPECS/web-cyradm.spec:1.1 Tue Aug 23 16:02:14 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 22:48:55 2005 @@ -8,8 +8,8 @@ %define version_major 0.5.4 %define version_minor 1 # -Summary: Cyrus-IMAP based mail accounts managment system. -Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Summary: Cyrus-IMAP based mail accounts managment system +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP Name: web-cyradm Version: %{version_major}.%{version_minor} Release: 0.1 @@ -21,9 +21,9 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ Requires: mysql -Requires: webserver Requires: php Requires: php-gettext +Requires: webserver BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,25 +44,28 @@ and superusers - Sieve functions like forwarding single e-mail adresses and out-of-office replies - - Enable/Disable different services like imap, pop, sieve and stmp + - Enable/Disable different services like imap, pop, sieve and smtp for particular users - Support for MySQL and PostgreSQL databases - Storing passwords in crypt, md5 or MySQL passwd compatible format %description -l pl -Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Web-cyradm jest oprogramowaniem sklejaj?cym wiele technologii Open Source w jeden du?y system pocztowy. Mo?liwo?ci: - - Administracja wieloma wirtualnymu domenami - - Zarz?dzanie kontami urzytkownik?w - - Mapowanie kont urzytkownik?w na adresy e-mail + - Administrowanie wieloma wirtualnymi domenami + - Zarz?dzanie kontami u?ytkownik?w + - Mapowanie kont u?ytkownik?w na adresy e-mail - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Ustawianie limit?w dla u?ytkownik?w i domen - Delegacja zada? do administrator?w domen - Resetowanie hase? u?ytkownikom przez administrator?w domen - - Filtry poczty Sieve - - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w - - Wsparcie dla MySQL'a i PostgreSQL'a + - Funkcje Sieve, takie jak przekazywanie pojedynczych adres?w e-mail + czy automatyczne odpowiedzi o nieobecno?ci + - W??czanie i wy??czanie us?ug (imap, pop, sieve, smtp) dla + poszczeg?lnych u?ytkownik?w + - Obsluga baz MySQL i PostgreSQL - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() %prep @@ -131,6 +134,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/23 20:48:55 qboosh +- pl fixes + Revision 1.1 2005/08/23 14:02:14 kosmo - initial release. - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 22:56:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: rlocate.spec - don't link scripts (causes EPERM) In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:56:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't link scripts (causes EPERM) ---- Files affected: SPECS: rlocate.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.31 SPECS/rlocate.spec:1.32 --- SPECS/rlocate.spec:1.31 Mon Aug 22 22:56:51 2005 +++ SPECS/rlocate.spec Tue Aug 23 22:56:04 2005 @@ -137,7 +137,6 @@ ln -sf %{_kernelsrcdir}/config-$cfg .config ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm - ln -sf %{_kernelsrcdir}/scripts scripts touch include/config/MARKER echo "EXTRA_CFLAGS:= -DRL_VERSION=\\\"%{version}\\\" -DRLOCATE_UPDATES" > Makefile @@ -253,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 20:56:04 qboosh +- don't link scripts (causes EPERM) + Revision 1.31 2005/08/22 20:56:51 paszczus - fixed %files, cron and init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 23:03:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: horde-nag.spec - 2.0.2 final In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:03:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 final ---- Files affected: SPECS: horde-nag.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.3 SPECS/horde-nag.spec:1.4 --- SPECS/horde-nag.spec:1.3 Tue Aug 2 22:28:41 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:03:03 2005 @@ -3,20 +3,20 @@ # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec -%define _rc rc1 -%define _rel 5 +#define _rc rc1 +%define _rel 0.1 %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? Name: nag Version: 2.0.2 -Release: %{_rc}.%{_rel} +Release: %{?_rc:%{_rc}.}%{_rel} License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}-%{_rc}.tar.gz -# Source0-md5: c6f572411894f706df19f8b649a11b2e +Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +# Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/nag/ @@ -55,7 +55,7 @@ Naga) mo?na znale?? na stronie . %prep -%setup -q -n nag-h3-%{version}-%{_rc} +%setup -q -n %{?_snap:nag}%{!?_snap:nag-h3-%{version}%{?_rc:-%{_rc}}} %install rm -rf $RPM_BUILD_ROOT @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 21:03:03 glen +- 2.0.2 final + Revision 1.3 2005/08/02 20:28:41 qboosh - pl, copy-pasto ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 23:03:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: nag-h3-2.0.2.tar.gz Message-ID: <8202.1124831003@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/nag/nag-h3-2.0.2.tar.gz 7aa928522dadda94f02dfcbc5fb90058 nag-h3-2.0.2.tar.gz Size: 1050906 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 23:06:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: rlocate.spec - rel 0.2, so still not finished... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:06:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2, so still not finished... ---- Files affected: SPECS: rlocate.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.32 SPECS/rlocate.spec:1.33 --- SPECS/rlocate.spec:1.32 Tue Aug 23 22:56:04 2005 +++ SPECS/rlocate.spec Tue Aug 23 23:05:58 2005 @@ -20,7 +20,7 @@ Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate Version: 0.3.2 -%define _rel 0.1 +%define _rel 0.2 Release: %{_rel} License: GPL Group: Base @@ -252,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 21:05:58 paszczus +- rel 0.2, so still not finished... + Revision 1.32 2005/08/23 20:56:04 qboosh - don't link scripts (causes EPERM) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.32&r2=1.33&f=u From glen at pld-linux.org Tue Aug 23 23:08:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: horde-nag.spec - unify with horde-passwd.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:08:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unify with horde-passwd.spec ---- Files affected: SPECS: horde-nag.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.4 SPECS/horde-nag.spec:1.5 --- SPECS/horde-nag.spec:1.4 Tue Aug 23 23:03:03 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:08:02 2005 @@ -2,10 +2,12 @@ # TODO # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec +# - or forget it and rename all horde packages to horde-*.spec #define _rc rc1 -%define _rel 0.1 +%define _rel 0.3 +%define _hordeapp nag %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? @@ -15,7 +17,7 @@ License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +Source0: ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}.tar.gz # Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch @@ -34,7 +36,7 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define _appdir %{hordedir}/%{_hordeapp} %description Nag is the Horde task list application. It stores todo items, things @@ -59,33 +61,33 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi if [ "$1" = 1 ]; then @@ -100,12 +102,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml %dir %{_appdir} %{_appdir}/*.php @@ -122,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 21:08:02 glen +- unify with horde-passwd.spec + Revision 1.4 2005/08/23 21:03:03 glen - 2.0.2 final ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 23:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: horde-passwd.spec - 2005-08-23 snap In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:20:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005-08-23 snap ---- Files affected: SPECS: horde-passwd.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.17 SPECS/horde-passwd.spec:1.18 --- SPECS/horde-passwd.spec:1.17 Tue Aug 23 10:00:47 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:20:29 2005 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +%define _snap 2005-08-23 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -6,14 +8,15 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.12 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 +#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,7 +49,7 @@ modu?. %prep -%setup -q -n passwd-h3-%{version}-beta +%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -72,7 +75,7 @@ cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf @@ -138,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/23 21:20:29 glen +- 2005-08-23 snap + Revision 1.17 2005/08/23 08:00:47 paszczus - little clean ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Tue Aug 23 23:20:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: passwd-HEAD-2005-08-23.tar.gz Message-ID: <17201.1124832048@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-23/passwd-HEAD-2005-08-23.tar.gz 15944d881c02ce24379d58a4bb613ab1 passwd-HEAD-2005-08-23.tar.gz Size: 903848 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 23:22:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: horde-passwd.spec - don't package .htaccess In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:22:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't package .htaccess ---- Files affected: SPECS: horde-passwd.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.18 SPECS/horde-passwd.spec:1.19 --- SPECS/horde-passwd.spec:1.18 Tue Aug 23 23:20:29 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:22:27 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-23 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -52,6 +52,7 @@ %setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 +rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 21:22:27 glen +- don't package .htaccess + Revision 1.18 2005/08/23 21:20:29 glen - 2005-08-23 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 23:23:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SOURCES (DEVEL): horde-passwd.conf, imp.conf - vim modeline In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:23:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - vim modeline ---- Files affected: SOURCES: horde-passwd.conf (1.2 -> 1.3) , imp.conf (1.3 -> 1.3.2.1) ---- Diffs: ================================================================ Index: SOURCES/horde-passwd.conf diff -u SOURCES/horde-passwd.conf:1.2 SOURCES/horde-passwd.conf:1.3 --- SOURCES/horde-passwd.conf:1.2 Tue Nov 9 11:46:43 2004 +++ SOURCES/horde-passwd.conf Tue Aug 23 23:23:39 2005 @@ -21,3 +21,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ Index: SOURCES/imp.conf diff -u SOURCES/imp.conf:1.3 SOURCES/imp.conf:1.3.2.1 --- SOURCES/imp.conf:1.3 Thu Oct 28 20:31:10 2004 +++ SOURCES/imp.conf Tue Aug 23 23:23:39 2005 @@ -22,3 +22,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-passwd.conf?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/imp.conf?r1=1.3&r2=1.3.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 23:51:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: horde-passwd.spec - added one more noautoreq - please do no... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:51:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added one more noautoreq - please do not remove it... ---- Files affected: SPECS: horde-passwd.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.19 SPECS/horde-passwd.spec:1.20 --- SPECS/horde-passwd.spec:1.19 Tue Aug 23 23:22:27 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:51:45 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' +%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/23 21:51:45 paszczus +- added one more noautoreq - please do not remove it... + Revision 1.19 2005/08/23 21:22:27 glen - don't package .htaccess ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.19&r2=1.20&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gtksourceview.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:52:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gtksourceview.spec (1.26.4.2 -> 1.26.4.3) ---- Diffs: ================================================================ Index: SPECS/gtksourceview.spec diff -u SPECS/gtksourceview.spec:1.26.4.2 SPECS/gtksourceview.spec:1.26.4.3 --- SPECS/gtksourceview.spec:1.26.4.2 Sun Aug 21 10:22:59 2005 +++ SPECS/gtksourceview.spec Tue Aug 23 23:52:19 2005 @@ -2,12 +2,12 @@ Summary: Text widget that extends the standard GTK+ 2.x Summary(pl): Widget tekstowy rozszerzaj?cy standardowy z GTK+ 2.x Name: gtksourceview -Version: 1.3.91 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ce519c2eba2adaabe908f12f953916cc +# Source0-md5: 998b7ab6ffdc661943fa1d610d7d82b7 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.4.3 2005/08/23 21:52:19 aflinta +- 1.3.92 + Revision 1.26.4.2 2005/08/21 08:22:59 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtksourceview.spec?r1=1.26.4.2&r2=1.26.4.3&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gtksourceview-1.3.92.tar.bz2 Message-ID: <3655.1124833949@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/gtksourceview-1.3.92.tar.bz2 998b7ab6ffdc661943fa1d610d7d82b7 gtksourceview-1.3.92.tar.bz2 Size: 698267 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: zenity-2.11.92.tar.bz2 Message-ID: <4479.1124834035@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/zenity-2.11.92.tar.bz2 b6ea8f5f1b46fd9409d11a2c31d6a5e3 zenity-2.11.92.tar.bz2 Size: 648483 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): zenity.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:53:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: zenity.spec (1.25.2.4 -> 1.25.2.5) ---- Diffs: ================================================================ Index: SPECS/zenity.spec diff -u SPECS/zenity.spec:1.25.2.4 SPECS/zenity.spec:1.25.2.5 --- SPECS/zenity.spec:1.25.2.4 Mon Aug 8 15:41:52 2005 +++ SPECS/zenity.spec Tue Aug 23 23:53:51 2005 @@ -2,12 +2,12 @@ Summary: The GNOME port of dialog Summary(pl): Port dialog dla GNOME Name: zenity -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a4bd15f652d5464cc77b562accd0d52c +# Source0-md5: b6ea8f5f1b46fd9409d11a2c31d6a5e3 URL: http://freshmeat.net/projects/zenity/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25.2.5 2005/08/23 21:53:51 aflinta +- 2.11.92 + Revision 1.25.2.4 2005/08/08 13:41:52 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/zenity.spec?r1=1.25.2.4&r2=1.25.2.5&f=u From glen at pld-linux.org Tue Aug 23 23:57:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: php-pear-Crypt_CHAP.spec - R php-mhash In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:57:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R php-mhash ---- Files affected: SPECS: php-pear-Crypt_CHAP.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/php-pear-Crypt_CHAP.spec diff -u SPECS/php-pear-Crypt_CHAP.spec:1.12 SPECS/php-pear-Crypt_CHAP.spec:1.13 --- SPECS/php-pear-Crypt_CHAP.spec:1.12 Fri Dec 3 22:57:03 2004 +++ SPECS/php-pear-Crypt_CHAP.spec Tue Aug 23 23:57:02 2005 @@ -17,6 +17,7 @@ URL: http://pear.php.net/package/Crypt_CHAP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear +Requires: php-mhash BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -63,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 21:57:02 glen +- R php-mhash + Revision 1.12 2004/12/03 21:57:03 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Crypt_CHAP.spec?r1=1.12&r2=1.13&f=u From kosmo at pld-linux.org Wed Aug 24 00:36:26 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (AC-branch): beecrypt.spec - fixed _without_java bcond In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 22:36:26 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - fixed _without_java bcond ---- Files affected: SPECS: beecrypt.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/beecrypt.spec diff -u SPECS/beecrypt.spec:1.36.2.4 SPECS/beecrypt.spec:1.36.2.5 --- SPECS/beecrypt.spec:1.36.2.4 Sun Jun 19 19:43:32 2005 +++ SPECS/beecrypt.spec Wed Aug 24 00:36:19 2005 @@ -220,9 +220,11 @@ $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.la > $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.la mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.a $RPM_BUILD_ROOT%{_libdir}/ +%if %{with java} mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt_java* $RPM_BUILD_ROOT%{_libdir}/ %{__sed} -i "s|libdir='%{_libaltdir}'|libdir='%{_libdir}'|" \ $RPM_BUILD_ROOT%{_libdir}/libbeecrypt_java.la +%endif rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} @@ -283,6 +285,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/23 22:36:19 kosmo +- fixed _without_java bcond + Revision 1.36.2.4 2005/06/19 17:43:32 baggins - release 4 - moved so lib to /lib ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/beecrypt.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From glen at pld-linux.org Wed Aug 24 00:42:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: php4-mcache.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:42:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-mcache.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.7 SPECS/php4-mcache.spec:1.8 --- SPECS/php4-mcache.spec:1.7 Tue Aug 23 14:42:29 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:42:47 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ %define _name mcache %define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: mcache PHP Extension Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.1 +Release: 0.beta%{_beta}.5 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -16,12 +17,13 @@ URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 +BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel Requires: php4-common = %{php_ver} +Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 %define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -78,21 +80,28 @@ %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_name} %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_name} %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README index.html %doc mcache.php +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/mcache.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -101,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 22:42:47 glen +- use .ini file in conf.d directory + Revision 1.7 2005/08/23 12:42:29 glen - up to 1.2.0-beta7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Wed Aug 24 00:46:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: php4-mcache.spec - use %requires_eq_to macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %requires_eq_to macro ---- Files affected: SPECS: php4-mcache.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.8 SPECS/php4-mcache.spec:1.9 --- SPECS/php4-mcache.spec:1.8 Wed Aug 24 00:42:47 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:46:45 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ %define _name mcache -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) %define _sysconfdir /etc/php4 Summary: mcache PHP Extension @@ -8,7 +7,7 @@ Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.5 +Release: 0.beta%{_beta}.7 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -19,7 +18,7 @@ BuildRequires: libmemcache-devel >= 1.3.0 BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel -Requires: php4-common = %{php_ver} +%requires_eq_to php4-common php4-devel Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 22:46:45 glen +- use %requires_eq_to macro + Revision 1.8 2005/08/23 22:42:47 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.8&r2=1.9&f=u From charles at pld-linux.org Wed Aug 24 01:26:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: libtheora.spec - updated to 1.0alpha5 - clear optflags, BR:... In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 23:26:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0alpha5 - clear optflags, BR: sed >= 4.0 ---- Files affected: SPECS: libtheora.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/libtheora.spec diff -u SPECS/libtheora.spec:1.7 SPECS/libtheora.spec:1.8 --- SPECS/libtheora.spec:1.7 Wed May 25 14:33:42 2005 +++ SPECS/libtheora.spec Wed Aug 24 01:26:47 2005 @@ -3,12 +3,12 @@ Summary(pl): Theora - kodek obrazu do u?ywania w systemie strumieni multimedialnych Ogg Name: libtheora Version: 1.0 -%define bver alpha4 -Release: 0.%{bver}.2 +%define bver alpha5 +Release: 0.%{bver}.1 License: BSD-like Group: Libraries -Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.gz -# Source0-md5: 75f436a980b80f8b8102ee182ddb8748 +Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.bz2 +# Source0-md5: 41940562932a8b7bf795d79e4190b21a URL: http://www.theora.org/ BuildRequires: SDL-devel BuildRequires: autoconf @@ -18,6 +18,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel >= 1:1.0.1 BuildRequires: pkgconfig +BuildRequires: sed >= 4.0 Requires: libogg >= 2:1.1 Requires: libvorbis >= 1:1.0.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -64,8 +65,10 @@ %setup -q -n %{name}-%{version}%{bver} %build +%{__sed} -i 's,CFLAGS="-g -O2 ,CFLAGS=",' configure.ac + %{__libtoolize} -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__automake} %configure @@ -108,6 +111,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 23:26:47 charles +- updated to 1.0alpha5 +- clear optflags, BR: sed >= 4.0 + Revision 1.7 2005/05/25 12:33:42 pluto - release .2 for Th. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libtheora.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 01:27:08 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: libtheora-1.0alpha5.tar.bz2 Message-ID: <636.1124839628@distfiles.pld-linux.org> Files fetched: 1 STORED: http://downloads.xiph.org/releases/theora/libtheora-1.0alpha5.tar.bz2 41940562932a8b7bf795d79e4190b21a libtheora-1.0alpha5.tar.bz2 Size: 1765512 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Wed Aug 24 01:27:39 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 09:39:17 2005 Subject: PLD-doc/queue/system.sec Message-ID: <6332@svn.pld-linux.org> Author: qwiat Date: Wed Aug 24 01:27:36 2005 New Revision: 6332 Added: PLD-doc/queue/system.sec Log: - prawie gotowy opis pliku /etc/sysconfig/system Added: PLD-doc/queue/system.sec ============================================================================== --- (empty file) +++ PLD-doc/queue/system.sec Wed Aug 24 01:27:36 2005 @@ -0,0 +1,89 @@ + +
+Podstawowe ustawienia systemu + + Plik /etc/sysconfig/system przechowuje + zaawansowan? konfiguracj? systemu, poni?ej przedstawiono opis + cz??ci z nich. + + +
+ Konfiguracja skrypt?w startowych + + Zmienna okre?la czy skrypty startowe maj? u?ywa? kolor?w: + COLOR_INIT=yes + + + Numer kolumny wy?wietlania statusu skryptu startowego: + INIT_COL=75 + + + Szybsze uruchomienie systemu z pomini?ciem niekt?rych skrypt?w, + startowych - m.in. skryptu od obs?ugi j?zyk?w. + FASTRC=no + + + Zezwolenie na interaktywny start rc-skrypt?w po wci?ni?ciu + klawisza "I": + PROMPT=yes + +
+ + +
+ Opcje zwi?zane z j?drem + + "Gadatliwo??" kernela dla komunikat?w wysy?anych na konsol? + tekstow?. Opcja jest jednoznaczna z wywo?aniem polecenia + dmesg -n {$nr} (domyslnie 1): + CONSOLE_LOGLEVEL=1 + + + Czas w sekundach, po kt?rym nast?pi restart maszyny je?li wyst?pi? + krytyczny b??d j?dra (kernel panic). Wa?na opcja w przypadku + komputer?w do kt?rych nie mamy fizycznego dost?pu + PANIC_REBOOT_TIME=60 + +
+ + +
+ Opcje uruchamiania systemu + + Uruchomienie programu sulogin (pytanie o has?o root-a) zamiast + pow?oki je?li wyst?pi? problemy w trakcie uruchomienia; + RUN_SULOGIN_ON_ERR=yes + + + Warto?? "yes" poni?szej zmiennej pozwala na zalogowanie + si? u?ytkownik?w dopiero po zako?czeniu procesu ?adowania + systemu. + DELAY_LOGIN=yes + + + Opcja okre?la czy pod czas startu ma by? usuwana zawarto?? + katalogu /tmp + CLEAN_TMP=yes + + + Wskazuje czy ma by? zamontowany system plik?w devfs + MOUNT_DEVFS=no + +
+ +
+ Us?ugi + + Domy?lny priorytet (liczba nice) dla us?ug o ile + ta warto?? nie zosta?a zdefiniowana w zmiennej SERVICE_RUN_NICE_LEVEL + umieszczonej w /etc/sysconfig/{$us?uga}: + DEFAULT_SERVICE_RUN_NICE_LEVEL=0 + + + Lista katalog?w przechowuj?cych systemy typu chroot. Warto?? + ta jest odczytywana przez skrypt + /etc/init.d/sys-chroots: + SYSTEM_CHROOTS=/jakis_katalog + +
+
From charles at pld-linux.org Wed Aug 24 02:00:19 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: mkvtoolnix.spec - updated to 1.5.5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 00:00:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5.5 ---- Files affected: SPECS: mkvtoolnix.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.5 SPECS/mkvtoolnix.spec:1.6 --- SPECS/mkvtoolnix.spec:1.5 Sun Jul 3 21:29:39 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 02:00:08 2005 @@ -5,12 +5,12 @@ Summary: Matroska video utilities Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix -Version: 1.5.0 +Version: 1.5.5 Release: 0.1 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 -# Source0-md5: 71c447f02ee306dbff53804c770b5ff3 +# Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 00:00:08 charles +- updated to 1.5.5 + Revision 1.5 2005/07/03 19:29:39 charles - updated to 1.5.0 (now build gui) - updated TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 02:00:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: mkvtoolnix-1.5.5.tar.bz2 Message-ID: <11871.1124841627@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-1.5.5.tar.bz2 f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 mkvtoolnix-1.5.5.tar.bz2 Size: 648667 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:54:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92.1 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:54:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92.1 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.7 -> 1.152.2.8) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.7 SPECS/gnome-applets.spec:1.152.2.8 --- SPECS/gnome-applets.spec:1.152.2.7 Tue Aug 23 14:04:08 2005 +++ SPECS/gnome-applets.spec Wed Aug 24 08:54:24 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.92 +Version: 2.11.92.1 Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e +# Source0-md5: 035684af82060eb19af881d70a822478 Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -34,7 +34,7 @@ BuildRequires: intltool >= 0.33 BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgtop-devel >= 1:2.10.0 +BuildRequires: libgtop-devel >= 1:2.11.92 BuildRequires: libtool BuildRequires: libwnck-devel >= 2.11.91 BuildRequires: libxml2-devel >= 1:2.6.19 @@ -748,6 +748,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.8 2005/08/24 06:54:24 paladine +- updated to 2.11.92.1 + Revision 1.152.2.7 2005/08/23 12:04:08 paladine - updated to 2.11.92 - updated %%files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.7&r2=1.152.2.8&f=u From paladine at pld-linux.org Wed Aug 24 08:54:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gnome-applets-2.11.92.1.tar.bz2 Message-ID: <2520.1124866476@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.1.tar.bz2 035684af82060eb19af881d70a822478 gnome-applets-2.11.92.1.tar.bz2 Size: 3786672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gnome-backgrounds-2.11.92.tar.bz2 Message-ID: <4125.1124866647@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/gnome-backgrounds-2.11.92.tar.bz2 580d2feea8f522ffaa77f71d53dcbcc9 gnome-backgrounds-2.11.92.tar.bz2 Size: 1767324 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:24 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-backgrounds.spec - updated to 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:57:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 ---- Files affected: SPECS: gnome-backgrounds.spec (1.8 -> 1.8.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-backgrounds.spec diff -u SPECS/gnome-backgrounds.spec:1.8 SPECS/gnome-backgrounds.spec:1.8.2.1 --- SPECS/gnome-backgrounds.spec:1.8 Fri Jul 8 16:29:08 2005 +++ SPECS/gnome-backgrounds.spec Wed Aug 24 08:57:18 2005 @@ -2,12 +2,12 @@ Summary: Set of backgrounds for GNOME desktop Summary(pl): Zestaw tapet dla ?rodowiska GNOME Name: gnome-backgrounds -Version: 2.10.2 +Version: 2.11.92 Release: 1 License: GPL v2 Group: Themes -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b6cf2ed37c4b6ef4982dee0a5d9226 +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 580d2feea8f522ffaa77f71d53dcbcc9 URL: http://www.gnome.org/ BuildRequires: intltool >= 0.33 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8.2.1 2005/08/24 06:57:18 paladine +- updated to 2.11.92 + Revision 1.8 2005/07/08 14:29:08 freetz - 2.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-backgrounds.spec?r1=1.8&r2=1.8.2.1&f=u From glen at pld-linux.org Wed Aug 24 09:11:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SOURCES: qemu-ifup.patch (NEW) - patch to override qemu-ifup path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:11:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch to override qemu-ifup path ---- Files affected: SOURCES: qemu-ifup.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/qemu-ifup.patch diff -u /dev/null SOURCES/qemu-ifup.patch:1.1 --- /dev/null Wed Aug 24 09:11:48 2005 +++ SOURCES/qemu-ifup.patch Wed Aug 24 09:11:43 2005 @@ -0,0 +1,11 @@ +--- ./vl.c~ 2005-08-20 16:14:48.000000000 +0300 ++++ ./vl.c 2005-08-21 14:05:26.000000000 +0300 +@@ -85,7 +85,7 @@ + + //#define DO_TB_FLUSH + +-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" ++#define DEFAULT_NETWORK_SCRIPT "/sbin/qemu-ifup" + + //#define DEBUG_UNUSED_IOPORT + //#define DEBUG_IOPORT ================================================================ From glen at pld-linux.org Wed Aug 24 09:12:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: qemu.spec - supply /sbin/qemu-ifup script In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:12:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - supply /sbin/qemu-ifup script ---- Files affected: SPECS: qemu.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/qemu.spec diff -u SPECS/qemu.spec:1.33 SPECS/qemu.spec:1.34 --- SPECS/qemu.spec:1.33 Sat Aug 20 07:54:55 2005 +++ SPECS/qemu.spec Wed Aug 24 09:12:17 2005 @@ -16,7 +16,7 @@ Summary(pl): QEMU - emulator procesora Name: qemu Version: 0.7.1 -%define _rel 1 +%define _rel 1.4 Release: %{_rel}%{?with_kqemu:k} License: GPL Group: Applications/Emulators @@ -37,6 +37,7 @@ Patch6: %{name}-gcc4_ppc.patch Patch7: %{name}-parallel.patch Patch8: %{name}-nosdlgui.patch +Patch9: %{name}-ifup.patch URL: http://fabrice.bellard.free.fr/qemu/ BuildRequires: SDL-devel >= 1.2.1 %if %{with kqemu} && %{with dist_kernel} @@ -127,6 +128,7 @@ %patch6 -p1 %patch7 -p1 %{?with_nosdlgui:%patch8 -p1} +%patch9 -p1 %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure %{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile @@ -181,6 +183,16 @@ %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/sbin +cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup +#!/bin/sh +if [ -f /etc/sysconfig/qemu ]; then + . /etc/sysconfig/qemu +fi +# of course this will work only for one interface. a lot possible to involve +sudo /sbin/ifconfig $1 ${INTERFACE_ADDR:-172.20.0.1} +EOF %endif %if %{with kernel} @@ -217,11 +229,11 @@ %postun -n kernel-smp-misc-kqemu %depmod %{_kernel_ver}smp - %if %{with userspace} %files %defattr(644,root,root,755) %doc README qemu-doc.html qemu-tech.html +%attr(755,root,root) /sbin/qemu-ifup %attr(755,root,root) %{_bindir}/* %{_datadir}/qemu %{_mandir}/man1/qemu.1* @@ -250,6 +262,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/24 07:12:17 glen +- supply /sbin/qemu-ifup script + Revision 1.33 2005/08/20 05:54:55 charles - separated kernel modules + bconds - updated BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.33&r2=1.34&f=u From paladine at pld-linux.org Wed Aug 24 09:12:48 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gtk-engines-2.6.5.tar.bz2 Message-ID: <12768.1124867568@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.5.tar.bz2 28469a797ba1e6aaa3f7eea4c9f5f9b7 gtk-engines-2.6.5.tar.bz2 Size: 477897 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:12:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: gtk2-engines.spec - updated to 2.6.5 - sorted and fixed %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:12:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.5 - sorted and fixed %%files ---- Files affected: SPECS: gtk2-engines.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/gtk2-engines.spec diff -u SPECS/gtk2-engines.spec:1.35 SPECS/gtk2-engines.spec:1.36 --- SPECS/gtk2-engines.spec:1.35 Wed Jul 27 21:42:55 2005 +++ SPECS/gtk2-engines.spec Wed Aug 24 09:12:40 2005 @@ -2,13 +2,13 @@ Summary: Default GTK+2 theme engines Summary(pl): Motywy do GTK+2 Name: gtk2-engines -Version: 2.6.4 +Version: 2.6.5 Release: 1 Epoch: 1 License: GPL Group: Themes/GTK+ Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-%{version}.tar.bz2 -# Source0-md5: 3389a92b62b9c8b916fbb52c4529f072 +# Source0-md5: 28469a797ba1e6aaa3f7eea4c9f5f9b7 URL: http://gtk.themes.org/ BuildRequires: autoconf BuildRequires: automake @@ -70,17 +70,17 @@ %files %defattr(644,root,root,755) %doc ChangeLog README -%dir %{_libdir}/gtk-2.0/*/engines -%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so -%{_pkgconfigdir}/* %{_datadir}/themes/Clearlooks %{_datadir}/themes/Crux -%{_datadir}/themes/Industrial +%{_datadir}/themes/Industrial/* %{_datadir}/themes/LighthouseBlue %{_datadir}/themes/Metal/* %{_datadir}/themes/Mist %{_datadir}/themes/Redmond %{_datadir}/themes/ThinIce/* +%dir %{_libdir}/gtk-2.0/*/engines +%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so +%{_pkgconfigdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -88,6 +88,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:12:40 paladine +- updated to 2.6.5 +- sorted and fixed %%files + Revision 1.35 2005/07/27 19:42:55 freetz - 2.6.4, makefile path already included ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk2-engines.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: conary.spec - updated to 0.61.10 In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:23:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.61.10 ---- Files affected: SPECS: conary.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.35 SPECS/conary.spec:1.36 --- SPECS/conary.spec:1.35 Wed Aug 3 09:12:37 2005 +++ SPECS/conary.spec Wed Aug 24 09:23:12 2005 @@ -2,13 +2,14 @@ Summary: Distributed software management system for Linux distributions Summary(pl): Rozproszony system zarz?dzania oprogramowaniem dla dystrybucji Linuksa Name: conary -Version: 0.61.6 +Version: 0.61.10 Release: 0.1 License: CPL 1.0 Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 -# Source0-md5: 6d81530fe8561537a9b1d743cf207cd7 +# Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb URL: http://wiki.specifixinc.com/ +BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 Requires: python-devel-tools @@ -84,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:23:12 paszczus +- updated to 0.61.10 + Revision 1.35 2005/08/03 07:12:37 paszczus - updated to 0.61.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: conary-0.61.10.tar.bz2 Message-ID: <18443.1124868207@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://download.rpath.com/pub/conary/conary-0.61.10.tar.bz2 2779696b7c6b24d5dc07c348e7743dfb conary-0.61.10.tar.bz2 Size: 384469 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Wed Aug 24 09:27:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: conary.spec - updated URL (thx glen) In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:27:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL (thx glen) ---- Files affected: SPECS: conary.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.36 SPECS/conary.spec:1.37 --- SPECS/conary.spec:1.36 Wed Aug 24 09:23:12 2005 +++ SPECS/conary.spec Wed Aug 24 09:27:21 2005 @@ -8,7 +8,7 @@ Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 # Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb -URL: http://wiki.specifixinc.com/ +URL: http://wiki.conary.com/ BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 @@ -85,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/24 07:27:21 paszczus +- updated URL (thx glen) + Revision 1.36 2005/08/24 07:23:12 paszczus - updated to 0.61.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.36&r2=1.37&f=u From jareq at pld-linux.org Wed Aug 24 09:34:35 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS: monotone.spec - updated to 0.22 - rel 1 In-Reply-To: References: Message-ID: Author: jareq Date: Wed Aug 24 07:34:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.22 - rel 1 ---- Files affected: SPECS: monotone.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/monotone.spec diff -u SPECS/monotone.spec:1.13 SPECS/monotone.spec:1.14 --- SPECS/monotone.spec:1.13 Mon Jul 25 23:18:15 2005 +++ SPECS/monotone.spec Wed Aug 24 09:34:30 2005 @@ -6,12 +6,12 @@ Summary: A free distributed version control system Summary(pl): Wolnodost?pny rozproszony system kontroli wersji Name: monotone -Version: 0.21 -Release: 3 +Version: 0.22 +Release: 1 License: GPL v2 Group: Development/Version Control Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz -# Source0-md5: c30c96b97ae56268cac567bd8837b991 +# Source0-md5: ee0f25577b8a640df3015113e67bb718 URL: http://www.venge.net/monotone/ BuildRequires: boost-date_time-devel BuildRequires: boost-devel >= 1.32.0-3 @@ -83,6 +83,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/24 07:34:30 jareq +- updated to 0.22 +- rel 1 + Revision 1.13 2005/07/25 21:18:15 arekm - add BR boost-mem_fn-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monotone.spec?r1=1.13&r2=1.14&f=u From jareq at pld-linux.org Wed Aug 24 09:35:16 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: monotone-0.22.tar.gz Message-ID: <25417.1124868916@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.venge.net/monotone/downloads/monotone-0.22.tar.gz ee0f25577b8a640df3015113e67bb718 monotone-0.22.tar.gz Size: 5038069 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gconf-editor.spec - updated to 2.11.92 - sorted %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:40:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: gconf-editor.spec (1.30 -> 1.30.2.1) ---- Diffs: ================================================================ Index: SPECS/gconf-editor.spec diff -u SPECS/gconf-editor.spec:1.30 SPECS/gconf-editor.spec:1.30.2.1 --- SPECS/gconf-editor.spec:1.30 Fri Apr 8 12:48:53 2005 +++ SPECS/gconf-editor.spec Wed Aug 24 09:40:33 2005 @@ -2,12 +2,12 @@ Summary: An editor for the GConf configuration system Summary(pl): Edytor do systemu konfiguracji GConf Name: gconf-editor -Version: 2.10.0 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 651a18f7eb5af91761521aa4f04ccc07 +Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: afbc07a3d861e1b43a5c2592419cc47d Patch0: %{name}-desktop.patch BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -69,12 +69,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_desktopdir}/* -%{_pixmapsdir}/* +%{_iconsdir}/*/*/apps/*.png %{_mandir}/man1/* %{_omf_dest_dir}/%{name} -%{_iconsdir}/*/*/apps/*.png +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/gconf-editor.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -82,6 +82,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30.2.1 2005/08/24 07:40:33 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.30 2005/04/08 10:48:53 paladine - new style macros - rel. 3, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gconf-editor.spec?r1=1.30&r2=1.30.2.1&f=u From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gconf-editor-2.11.92.tar.bz2 Message-ID: <29238.1124869240@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/gconf-editor-2.11.92.tar.bz2 afbc07a3d861e1b43a5c2592419cc47d gconf-editor-2.11.92.tar.bz2 Size: 477844 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: bug-buddy-2.11.92.tar.bz2 Message-ID: <31679.1124869523@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/bug-buddy-2.11.92.tar.bz2 fd6affcdb1a205b2acfc866eb4844c4a bug-buddy-2.11.92.tar.bz2 Size: 561719 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): bug-buddy.spec - updated to 2.11.92 - sorted %%file... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:45:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: bug-buddy.spec (1.37.2.3 -> 1.37.2.4) ---- Diffs: ================================================================ Index: SPECS/bug-buddy.spec diff -u SPECS/bug-buddy.spec:1.37.2.3 SPECS/bug-buddy.spec:1.37.2.4 --- SPECS/bug-buddy.spec:1.37.2.3 Thu Aug 18 07:52:41 2005 +++ SPECS/bug-buddy.spec Wed Aug 24 09:45:20 2005 @@ -2,12 +2,12 @@ Summary: Utility to ease the reporting of bugs within the GNOME Summary(pl): Narz?dzie u?atwiaj?ce zg?aszanie b??d?w w ?rodowisku GNOME Name: bug-buddy -Version: 2.11.1 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 490f9b8f63119bafd19a37a0f0719b65 +# Source0-md5: fd6affcdb1a205b2acfc866eb4844c4a Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -92,12 +92,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO docs/multiple_bts.txt %attr(755,root,root) %{_bindir}/* -%{_mandir}/man1/* %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* +%{_mandir}/man1/* %{_omf_dest_dir}/* -%{_sysconfdir}/gconf/schemas/* +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/bug-buddy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -105,6 +105,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.4 2005/08/24 07:45:20 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.37.2.3 2005/08/18 05:52:41 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bug-buddy.spec?r1=1.37.2.3&r2=1.37.2.4&f=u From paladine at pld-linux.org Wed Aug 24 09:48:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gnome-themes-2.11.92.tar.bz2 Message-ID: <1446.1124869702@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/gnome-themes-2.11.92.tar.bz2 89be15b82ac0561553356f537bb3686b gnome-themes-2.11.92.tar.bz2 Size: 2574494 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:48:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-themes.spec - updated to 2.11.92 - small fix ... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:48:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - small fix in Clearlooks subpackage %%files - require new gtk2-engines - removed redundant R: gtk2-engines from subpackages ---- Files affected: SPECS: gnome-themes.spec (1.46.4.3 -> 1.46.4.4) ---- Diffs: ================================================================ Index: SPECS/gnome-themes.spec diff -u SPECS/gnome-themes.spec:1.46.4.3 SPECS/gnome-themes.spec:1.46.4.4 --- SPECS/gnome-themes.spec:1.46.4.3 Mon Aug 8 16:47:36 2005 +++ SPECS/gnome-themes.spec Wed Aug 24 09:48:18 2005 @@ -2,20 +2,20 @@ Summary: Default themes for GNOME2 enviroment Summary(pl): Domy?lne motywy dla ?rodowiska GNOME2 Name: gnome-themes -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: c040ffaf01d644bfba22e0835fdac7b0 +# Source0-md5: 89be15b82ac0561553356f537bb3686b URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: gtk2-engines >= 1:2.6.2-1 +BuildRequires: gtk2-engines >= 1:2.6.5 BuildRequires: libtool BuildRequires: intltool >= 0.28 BuildRequires: rpmbuild(macros) >= 1.197 -Requires: gtk2-engines >= 1:2.6.2-1 +Requires: gtk2-engines >= 1:2.6.5 Conflicts: crux-engine Conflicts: crux-theme BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +71,6 @@ Group: Themes Requires: %{name} = %{version}-%{release} Requires: gnome-icon-theme >= 2.10.0 -Requires: gtk2-engines >= 2.6.2 %description Glider Glider theme for GNOME 2 enviroment. @@ -208,7 +207,6 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-Sandwish = %{version}-%{release} Requires: %{name}-Sandy = %{version}-%{release} -Requires: gtk2-engines >= 2.6.2 %description Ocean-Dream Ocean-Dream theme for GNOME 2 enviroment. @@ -344,7 +342,7 @@ %files Clearlooks %defattr(644,root,root,755) -%{_datadir}/themes/Clearlooks +%{_datadir}/themes/Clearlooks/* %files Crux %defattr(644,root,root,755) @@ -442,6 +440,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.4.4 2005/08/24 07:48:18 paladine +- updated to 2.11.92 +- small fix in Clearlooks subpackage %%files +- require new gtk2-engines +- removed redundant R: gtk2-engines from subpackages + Revision 1.46.4.3 2005/08/08 14:47:36 paladine - updated to 2.11.91 - new Clearlooks theme subpackage :) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-themes.spec?r1=1.46.4.3&r2=1.46.4.4&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:16 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:00:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.1 ---- Files affected: SPECS: gtk+2.spec (1.179.2.8 -> 1.179.2.9) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.8 SPECS/gtk+2.spec:1.179.2.9 --- SPECS/gtk+2.spec:1.179.2.8 Wed Aug 17 22:18:52 2005 +++ SPECS/gtk+2.spec Wed Aug 24 10:00:08 2005 @@ -14,17 +14,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: e169d35239bf9d23bdd84c473e3c4917 +# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version -Patch2: %{name}-colormap.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -35,7 +34,7 @@ BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.8.0 +BuildRequires: glib2-devel >= 1:2.8.1 %{?with_doc:BuildRequires: gtk-doc >= 1.0} %{?with_xlibs:BuildRequires: libXfixes-devel} %{?with_xlibs:BuildRequires: libXi-devel} @@ -145,7 +144,6 @@ %setup -q -n gtk+-%{version} %patch0 -p1 %{?with_xlibs:%patch1 -p1} -%patch2 -p0 %build %{__gtkdocize} @@ -277,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.9 2005/08/24 08:00:08 aflinta +- 2.8.1 + Revision 1.179.2.8 2005/08/17 20:18:52 aflinta - require official releases ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.8&r2=1.179.2.9&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gtk+-2.8.1.tar.bz2 Message-ID: <8359.1124870455@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.1.tar.bz2 62ffb0e555dcc4eee3eba5e3214897e3 gtk+-2.8.1.tar.bz2 Size: 11802868 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: DISTFILES: gnome-nettool-1.3.92.tar.bz2 Message-ID: <21586.1124871734@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/gnome-nettool-1.3.92.tar.bz2 fae4671363b0a10608e07c2b02601000 gnome-nettool-1.3.92.tar.bz2 Size: 472700 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:22:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gnome-nettool.spec (1.9 -> 1.9.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9 SPECS/gnome-nettool.spec:1.9.2.1 --- SPECS/gnome-nettool.spec:1.9 Tue Jun 14 21:25:31 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:21:57 2005 @@ -2,12 +2,12 @@ Summary: GNOME interface for networking tools Summary(pl): Interfejs dla narz?dzi sieciowych dla GNOME Name: gnome-nettool -Version: 1.2.0 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 277338cf5d54ae9941260dd993a14f7a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/%{name}-%{version}.tar.bz2 +# Source0-md5: fae4671363b0a10608e07c2b02601000 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel @@ -18,7 +18,6 @@ BuildRequires: gtk+2-devel >= 2:2.6.3 BuildRequires: intltool >= 0.11 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libtool BuildRequires: pkgconfig Requires: gtk+2 >= 2:2.6.3 @@ -57,6 +56,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +%banner %{name} -e << EOF +For full functionality, you need to install various networking command-line +tools, like ping, netstat, ifconfig, whois, traceroute, finger +EOF + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO @@ -71,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.1 2005/08/24 08:21:57 aflinta +- 1.3.92 + Revision 1.9 2005/06/14 19:25:31 zbyniu - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9&r2=1.9.2.1&f=u From aflinta at pld-linux.org Wed Aug 24 10:24:44 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - missing dot i banner In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:24:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dot i banner ---- Files affected: SPECS: gnome-nettool.spec (1.9.2.1 -> 1.9.2.2) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9.2.1 SPECS/gnome-nettool.spec:1.9.2.2 --- SPECS/gnome-nettool.spec:1.9.2.1 Wed Aug 24 10:21:57 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:24:39 2005 @@ -59,7 +59,7 @@ %post %banner %{name} -e << EOF For full functionality, you need to install various networking command-line -tools, like ping, netstat, ifconfig, whois, traceroute, finger +tools, like ping, netstat, ifconfig, whois, traceroute, finger. EOF %files -f %{name}.lang @@ -76,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.2 2005/08/24 08:24:39 aflinta +- missing dot i banner + Revision 1.9.2.1 2005/08/24 08:21:57 aflinta - 1.3.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9.2.1&r2=1.9.2.2&f=u From aflinta at pld-linux.org Wed Aug 24 10:26:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:17 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - fixed schema name in post In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:26:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed schema name in post ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.5 -> 1.46.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.5 SPECS/gnome-system-tools.spec:1.46.2.6 --- SPECS/gnome-system-tools.spec:1.46.2.5 Tue Aug 23 16:50:22 2005 +++ SPECS/gnome-system-tools.spec Wed Aug 24 10:26:29 2005 @@ -5,7 +5,7 @@ Summary(pl): GNOME System Tools - narz?dzia systemowe GNOME Name: gnome-system-tools Version: 1.3.92 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/System Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/%{name}-%{version}.tar.bz2 @@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install gnome-system-tools-schemas +%gconf_schema_install gnome-system-tools.schemas %scrollkeeper_update_post %preun @@ -114,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.6 2005/08/24 08:26:29 aflinta +- fixed schema name in post + Revision 1.46.2.5 2005/08/23 14:50:22 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.5&r2=1.46.2.6&f=u From glen at pld-linux.org Wed Aug 24 10:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SOURCES: eventum-hl-quot-fix.patch (NEW) - fix quote code (bryan a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:28:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix quote code (bryan also sent patch to upstream) ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u /dev/null SOURCES/eventum-hl-quot-fix.patch:1.1 --- /dev/null Wed Aug 24 10:28:30 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:28:25 2005 @@ -0,0 +1,120 @@ +Only in /tmp/: .channels +Only in /tmp/: .config +Only in /tmp/: .depdb +Only in /tmp/: .depdblock +Only in /tmp/: .filemap +Only in /tmp/: .lock +Only in /tmp/: .registry +Only in /tmp/: .siegerc +Only in /tmp/: .ssh-auth +Only in /tmp/: StartSession.php +Only in /tmp/: a +Only in /tmp/: apache-tinymce.conf +Only in /tmp/: audio +Only in .: block.textformat.php +Only in /tmp/: browser-plugins.spec +Only in .: compiler.assign.php +Only in /tmp/: configure.in +Only in .: function.assign_debug_info.php +Only in .: function.calendar.php +Only in .: function.config_load.php +Only in .: function.counter.php +Only in .: function.cycle.php +Only in .: function.debug.php +Only in .: function.eval.php +Only in .: function.fetch.php +Only in .: function.get_display_style.php +Only in .: function.get_innerhtml.php +Only in .: function.get_textarea_size.php +Only in .: function.html_checkboxes.php +Only in .: function.html_image.php +Only in .: function.html_options.php +Only in .: function.html_radios.php +Only in .: function.html_select_date.php +Only in .: function.html_select_time.php +Only in .: function.html_table.php +Only in .: function.mailto.php +Only in .: function.math.php +Only in .: function.popup.php +Only in .: function.popup_init.php +Only in /tmp/: glibc-2.3.5-2.i686.rpm +Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm +Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm +Only in /tmp/: gollem.spec +Only in /tmp/: horde-passwd-hook-misconf.patch +Only in /tmp/: hsperfdata_builder +Only in /tmp/: iconv-2.3.5-3.1.i686.rpm +Only in /tmp/: issue +Only in /tmp/: jama +Only in /tmp/: jserv +Only in /tmp/: jserv.conf +Only in /tmp/: junk +Only in /tmp/: l +Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm +Only in /tmp/: m.patch +Only in /tmp/: macromedia-flash.install +Only in /tmp/: main.php +Only in .: modifier.capitalize.php +Only in .: modifier.cat.php +Only in .: modifier.count_characters.php +Only in .: modifier.count_paragraphs.php +Only in .: modifier.count_sentences.php +Only in .: modifier.count_words.php +Only in .: modifier.date_format.php +Only in .: modifier.debug_print_var.php +Only in .: modifier.default.php +Only in .: modifier.escape.php +diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php +--- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +@@ -56,18 +56,19 @@ + if ($escape) { + $match[2] = htmlspecialchars($match[2]); + } +- if(trim($match[2]) != "") { ++ $line = trim($match[2]); ++ if ($line) { + $indent = strlen(preg_replace('/[\s]*/','',$match[1])); + $color = $indent % count($colors); + + $ret .= ''; + $ret .= htmlspecialchars($match[1])." "; +- $ret .= $match[2]; +- $ret .= ""; ++ $ret .= $line; ++ $ret .= "\n"; + } else { +- $ret .= $match[2]; ++ $ret .= "\n"; + } + } + return $ret; + } +-?> +\ No newline at end of file ++?> +Only in .: modifier.indent.php +Only in .: modifier.lower.php +Only in .: modifier.nl2br.php +Only in .: modifier.regex_replace.php +Only in .: modifier.replace.php +Only in .: modifier.spacify.php +Only in .: modifier.string_format.php +Only in .: modifier.strip.php +Only in .: modifier.strip_tags.php +Only in .: modifier.truncate.php +Only in .: modifier.upper.php +Only in .: modifier.wordwrap.php +Only in .: outputfilter.trimwhitespace.php +Only in /tmp/: poldek.conf.rpmnew +Only in /tmp/: poldek.conf.rpmsave +Only in /tmp/: posttrans +Only in /tmp/: pretrans +Only in /tmp/: rc-script +Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm +Only in /tmp/: rpm.groups +Only in /tmp/: rpm.patch +Only in /tmp/: rpm.spec +Only in /tmp/: settings.php +Only in .: shared.escape_special_chars.php +Only in .: shared.make_timestamp.php ================================================================ From glen at pld-linux.org Wed Aug 24 10:29:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - remove junk In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:29:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove junk ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.1 SOURCES/eventum-hl-quot-fix.patch:1.2 --- SOURCES/eventum-hl-quot-fix.patch:1.1 Wed Aug 24 10:28:25 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:29:00 2005 @@ -1,69 +1,3 @@ -Only in /tmp/: .channels -Only in /tmp/: .config -Only in /tmp/: .depdb -Only in /tmp/: .depdblock -Only in /tmp/: .filemap -Only in /tmp/: .lock -Only in /tmp/: .registry -Only in /tmp/: .siegerc -Only in /tmp/: .ssh-auth -Only in /tmp/: StartSession.php -Only in /tmp/: a -Only in /tmp/: apache-tinymce.conf -Only in /tmp/: audio -Only in .: block.textformat.php -Only in /tmp/: browser-plugins.spec -Only in .: compiler.assign.php -Only in /tmp/: configure.in -Only in .: function.assign_debug_info.php -Only in .: function.calendar.php -Only in .: function.config_load.php -Only in .: function.counter.php -Only in .: function.cycle.php -Only in .: function.debug.php -Only in .: function.eval.php -Only in .: function.fetch.php -Only in .: function.get_display_style.php -Only in .: function.get_innerhtml.php -Only in .: function.get_textarea_size.php -Only in .: function.html_checkboxes.php -Only in .: function.html_image.php -Only in .: function.html_options.php -Only in .: function.html_radios.php -Only in .: function.html_select_date.php -Only in .: function.html_select_time.php -Only in .: function.html_table.php -Only in .: function.mailto.php -Only in .: function.math.php -Only in .: function.popup.php -Only in .: function.popup_init.php -Only in /tmp/: glibc-2.3.5-2.i686.rpm -Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm -Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm -Only in /tmp/: gollem.spec -Only in /tmp/: horde-passwd-hook-misconf.patch -Only in /tmp/: hsperfdata_builder -Only in /tmp/: iconv-2.3.5-3.1.i686.rpm -Only in /tmp/: issue -Only in /tmp/: jama -Only in /tmp/: jserv -Only in /tmp/: jserv.conf -Only in /tmp/: junk -Only in /tmp/: l -Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm -Only in /tmp/: m.patch -Only in /tmp/: macromedia-flash.install -Only in /tmp/: main.php -Only in .: modifier.capitalize.php -Only in .: modifier.cat.php -Only in .: modifier.count_characters.php -Only in .: modifier.count_paragraphs.php -Only in .: modifier.count_sentences.php -Only in .: modifier.count_words.php -Only in .: modifier.date_format.php -Only in .: modifier.debug_print_var.php -Only in .: modifier.default.php -Only in .: modifier.escape.php diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php --- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 +++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -93,28 +27,3 @@ -?> \ No newline at end of file +?> -Only in .: modifier.indent.php -Only in .: modifier.lower.php -Only in .: modifier.nl2br.php -Only in .: modifier.regex_replace.php -Only in .: modifier.replace.php -Only in .: modifier.spacify.php -Only in .: modifier.string_format.php -Only in .: modifier.strip.php -Only in .: modifier.strip_tags.php -Only in .: modifier.truncate.php -Only in .: modifier.upper.php -Only in .: modifier.wordwrap.php -Only in .: outputfilter.trimwhitespace.php -Only in /tmp/: poldek.conf.rpmnew -Only in /tmp/: poldek.conf.rpmsave -Only in /tmp/: posttrans -Only in /tmp/: pretrans -Only in /tmp/: rc-script -Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm -Only in /tmp/: rpm.groups -Only in /tmp/: rpm.patch -Only in /tmp/: rpm.spec -Only in /tmp/: settings.php -Only in .: shared.escape_special_chars.php -Only in .: shared.make_timestamp.php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 10:31:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:17 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - fix path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:31:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix path ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.2 SOURCES/eventum-hl-quot-fix.patch:1.3 --- SOURCES/eventum-hl-quot-fix.patch:1.2 Wed Aug 24 10:29:00 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:31:16 2005 @@ -1,6 +1,6 @@ diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php ---- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 -+++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +--- ./include/Smarty/plugins/modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ ./modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -56,18 +56,19 @@ if ($escape) { $match[2] = htmlspecialchars($match[2]); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Wed Aug 24 10:34:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: eventum.spec - fix hilite quoting for routed emails. rel 3 In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:34:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix hilite quoting for routed emails. rel 3 ---- Files affected: SPECS: eventum.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.113 SPECS/eventum.spec:1.114 --- SPECS/eventum.spec:1.113 Tue Aug 23 12:01:01 2005 +++ SPECS/eventum.spec Wed Aug 24 10:33:59 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 2 +%define _rel 3 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -64,6 +64,7 @@ Patch6: http://glen.alkohol.ee/pld/%{name}-maq-subject.patch Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch +Patch10: %{name}-hl-quot-fix.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -451,6 +452,7 @@ %patch6 -p1 %patch7 -p1 %patch9 -p1 +%patch10 -p1 %patch22 -p1 # replace in remaining scripts config.inc.php to system one @@ -855,6 +857,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/24 08:33:59 glen +- fix hilite quoting for routed emails. rel 3 + Revision 1.113 2005/08/23 10:01:01 glen - add missing smarty modifier, rel 2, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.113&r2=1.114&f=u From paszczus at pld-linux.org Wed Aug 24 10:37:57 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: horde-passwd.spec - ok, it is not a fake dep In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 08:37:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ok, it is not a fake dep ---- Files affected: SPECS: horde-passwd.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.20 SPECS/horde-passwd.spec:1.21 --- SPECS/horde-passwd.spec:1.20 Tue Aug 23 23:51:45 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 10:37:51 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +%define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 08:37:51 paszczus +- ok, it is not a fake dep + Revision 1.20 2005/08/23 21:51:45 paszczus - added one more noautoreq - please do not remove it... ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.20&r2=1.21&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:02 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: web-cyradm-locale.patch - fixed. In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed. ---- Files affected: SOURCES: web-cyradm-locale.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u SOURCES/web-cyradm-locale.patch:1.1 SOURCES/web-cyradm-locale.patch:1.2 --- SOURCES/web-cyradm-locale.patch:1.1 Tue Aug 23 16:01:43 2005 +++ SOURCES/web-cyradm-locale.patch Wed Aug 24 11:02:56 2005 @@ -1,13 +1,13 @@ diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php --- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 +++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 -@@ -70,9 +70,6 @@ +@@ -70,8 +70,8 @@ putenv("LANG=" . $LANG); putenv("LANGUAGE=" . $LANG); -- // Specify location of translation tables + // Specify location of translation tables - bindtextdomain("web-cyradm", "./locale"); -- ++ bindtextdomain("web-cyradm", "/usr/share/locale"); + // Choose domain textdomain("web-cyradm"); - require_once WC_BASE . "/session.php"; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/web-cyradm-locale.patch?r1=1.1&r2=1.2&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:30 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: web-cyradm-apache.conf (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-apache.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-apache.conf diff -u /dev/null SOURCES/web-cyradm-apache.conf:1.1 --- /dev/null Wed Aug 24 11:03:30 2005 +++ SOURCES/web-cyradm-apache.conf Wed Aug 24 11:03:25 2005 @@ -0,0 +1,22 @@ +Alias /web-cyradm /usr/share/web-cyradm + + + Options None + AllowOverride None + Order allow,deny + Allow from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + ================================================================ From kosmo at pld-linux.org Wed Aug 24 11:11:25 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: web-cyradm.spec - R & BR changes - better /etc/httpd/web-cy... In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:11:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R & BR changes - better /etc/httpd/web-cyradm.conf - added %ghost for logfile ---- Files affected: SPECS: web-cyradm.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.2 SPECS/web-cyradm.spec:1.3 --- SPECS/web-cyradm.spec:1.2 Tue Aug 23 22:48:55 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 11:11:20 2005 @@ -2,8 +2,6 @@ # # TODO: # - R: & BR: -# - better /etc/httpd/web-cyradm.conf -# - many more # %define version_major 0.5.4 %define version_minor 1 @@ -17,13 +15,14 @@ License: GPL Group: Applications Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Source1: %{name}-apache.conf Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ -Requires: mysql +Requires: apache Requires: php Requires: php-gettext -Requires: webserver +Requires: php-pear-DB BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -79,8 +78,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install config/conf.php.dist \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css @@ -94,6 +95,8 @@ install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES done +touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}/%{name}-login.log + %find_lang %{name} %clean @@ -104,7 +107,7 @@ ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi @@ -115,7 +118,7 @@ rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi fi @@ -126,6 +129,7 @@ %dir %{_sysconfdir}/%{name} %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%ghost %{_localstatedir}/log/%{name}/*.log %{_datadir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -134,6 +138,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 09:11:20 kosmo +- R & BR changes +- better /etc/httpd/web-cyradm.conf +- added %ghost for logfile + Revision 1.2 2005/08/23 20:48:55 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Wed Aug 24 11:18:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:18 2005 Subject: test: plik cia test1 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:07 2005 GMT Module: test Tag: HEAD ---- Log message: cia test1 ---- Files affected: test: plik (1.20 -> 1.21) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.20 test/plik:1.21 --- test/plik:1.20 Tue Aug 23 19:27:15 2005 +++ test/plik Wed Aug 24 11:18:01 2005 @@ -4,6 +4,7 @@ test4 test5 test6 +cia-test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Wed Aug 24 11:18:48 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:18 2005 Subject: test: plik cia test2 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:48 2005 GMT Module: test Tag: HEAD ---- Log message: cia test2 ---- Files affected: test: plik (1.21 -> 1.22) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.21 test/plik:1.22 --- test/plik:1.21 Wed Aug 24 11:18:01 2005 +++ test/plik Wed Aug 24 11:18:42 2005 @@ -4,7 +4,7 @@ test4 test5 test6 -cia-test1 +cia-test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 11:31:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: eventum.spec - htmloptions truncate patch In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 09:31:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - htmloptions truncate patch ---- Files affected: SPECS: eventum.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.114 SPECS/eventum.spec:1.115 --- SPECS/eventum.spec:1.114 Wed Aug 24 10:33:59 2005 +++ SPECS/eventum.spec Wed Aug 24 11:31:29 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 3 +%define _rel 3.2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -65,6 +65,7 @@ Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch Patch10: %{name}-hl-quot-fix.patch +Patch11: http://glen.alkohol.ee/pld/eventum-htmloptions-truncate.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -857,6 +858,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/24 09:31:29 glen +- htmloptions truncate patch + Revision 1.114 2005/08/24 08:33:59 glen - fix hilite quoting for routed emails. rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.114&r2=1.115&f=u From kosmo at pld-linux.org Wed Aug 24 12:04:29 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: cyrus-sasl-md5sum-passwords.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: cyrus-sasl-md5sum-passwords.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cyrus-sasl-md5sum-passwords.patch diff -u /dev/null SOURCES/cyrus-sasl-md5sum-passwords.patch:1.1 --- /dev/null Wed Aug 24 12:04:29 2005 +++ SOURCES/cyrus-sasl-md5sum-passwords.patch Wed Aug 24 12:04:23 2005 @@ -0,0 +1,73 @@ +diff -urN cyrus-sasl-2.1.21.orig/lib/checkpw.c cyrus-sasl-2.1.21/lib/checkpw.c +--- cyrus-sasl-2.1.21.orig/lib/checkpw.c 2005-08-24 11:36:23.000000000 +0200 ++++ cyrus-sasl-2.1.21/lib/checkpw.c 2005-08-24 11:36:07.000000000 +0200 +@@ -103,10 +103,12 @@ + #define PASSWORD_FORMAT_CLEARTEXT 1 + #define PASSWORD_FORMAT_CRYPT 2 + #define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_FORMAT_MD5 4 + #define PASSWORD_SALT_BUF_LEN 22 + + /* weeds out crypt(3) password's salt */ + int _sasl_get_salt (char *dest, char *src, int format); ++const char *_sasl_md5sum(const char *src); + + /****************************** + * crypt(3) patch stop * +@@ -192,6 +194,9 @@ + /* traditional crypt(3) */ + else if (strncmp(p, "crypt_trad", 11) == 0) + password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* md5sum like hash */ ++ else if (strncmp(p, "md5", 11) == 0) ++ password_format = PASSWORD_FORMAT_MD5; + /* cleartext password */ + else + password_format = PASSWORD_FORMAT_CLEARTEXT; +@@ -250,13 +255,20 @@ + _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); + + /* crypt(3)-ed password? */ +- if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ if (password_format == PASSWORD_FORMAT_CRYPT || password_format == PASSWORD_FORMAT_CRYPTTRAD) { + /* compare password */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) + return SASL_OK; + else + ret = SASL_BADAUTH; + } ++ /* md5 hash password */ ++ else if (password_format == PASSWORD_FORMAT_MD5) { ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcasecmp(auxprop_values[0].values[0], _sasl_md5sum(passwd)) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } + else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { + /* compare passwords */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) +@@ -1087,3 +1099,24 @@ + return 1; + } + ++ ++const char *_sasl_md5sum(const char *src) { ++ static char md5sum[33]; ++ const char hex[] = "0123456789abcdef"; ++ char md5[16]; ++ MD5_CTX ctx; ++ int i = 0; ++ int j = 0; ++ ++ _sasl_MD5Init(&ctx); ++ _sasl_MD5Update(&ctx, src, strlen(src)); ++ _sasl_MD5Final(&md5, &ctx); ++ ++ for(i=0; i<16; i++) { ++ md5sum[j++] = hex[md5[i] >> 4]; ++ md5sum[j++] = hex[md5[i] & 0x0F]; ++ } ++ ++ md5sum[j] = 0; ++ return(md5sum); ++} ================================================================ From kosmo at pld-linux.org Wed Aug 24 12:04:57 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: cyrus-sasl.spec - added cyrus-sasl-md5sum-passwords.patch In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added cyrus-sasl-md5sum-passwords.patch ---- Files affected: SPECS: cyrus-sasl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/cyrus-sasl.spec diff -u SPECS/cyrus-sasl.spec:1.140 SPECS/cyrus-sasl.spec:1.141 --- SPECS/cyrus-sasl.spec:1.140 Thu Jul 21 00:35:47 2005 +++ SPECS/cyrus-sasl.spec Wed Aug 24 12:04:51 2005 @@ -42,6 +42,7 @@ Patch5: %{name}-gcc4.patch # Adapted from http://frost.ath.cx/software/cyrus-sasl-patches/dist/2.1.19/cyrus-sasl-2.1.19-checkpw.c+sql.c.patch Patch6: %{name}-cryptedpw.patch +Patch7: %{name}-md5sum-passwords.patch URL: http://asg.web.cmu.edu/sasl/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -424,6 +425,7 @@ %patch5 -p1 %if %{with cryptedpw} %patch6 -p1 +%patch7 -p1 %endif cd doc @@ -649,6 +651,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/24 10:04:51 kosmo +- added cyrus-sasl-md5sum-passwords.patch + Revision 1.140 2005/07/20 22:35:47 romke - added bcond cryptedpw allowing storing crypted passwd in database (mysql or pgsql) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.140&r2=1.141&f=u From glen at pld-linux.org Wed Aug 24 12:25:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php4-eaccelerator.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-eaccelerator.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.6 SPECS/php4-eaccelerator.spec:1.7 --- SPECS/php4-eaccelerator.spec:1.6 Mon Jun 13 08:54:58 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 12:25:10 2005 @@ -1,13 +1,13 @@ # $Revision$, $Date$ %define _name eaccelerator %define _pkgname eaccelerator -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: eAccelerator module for PHP Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1 +Release: 1.1 Epoch: 0 License: GPL Vendor: Turck Software @@ -17,15 +17,14 @@ URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool -BuildRequires: php4-devel >= 4.1 -Requires: php4 = %{php_ver} +BuildRequires: php4-devel >= 3:4.1 +%requires_eq_to php4 php4-devel Requires: php4-zlib -Requires(post,preun): php4-common >= 4.1 +Requires: %{_sysconfdir}/conf.d Conflicts: php-mmcache BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description eAccelerator is a further development from mmcache PHP Accelerator & @@ -52,26 +51,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install eaccelerator %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove eaccelerator %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so %attr(755,root,root) %{_bindir}/encoder.php @@ -81,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 10:25:10 glen +- use .ini file in conf.d directory + Revision 1.6 2005/06/13 06:54:58 prism - up to 0.9.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 12:28:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: php4-eaccelerator.ini (NEW) - original from eaccelerator-... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:28:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - original from eaccelerator-0.9.3 sources ---- Files affected: SOURCES: php4-eaccelerator.ini (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u /dev/null SOURCES/php4-eaccelerator.ini:1.1 --- /dev/null Wed Aug 24 12:28:29 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:28:24 2005 @@ -0,0 +1,114 @@ +[eaccelerator] + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; +; eAccelerator is compatible with Zend Optimizer's loader. Zend Optimizer +; must be installed after eAccelerator in php.ini. If you don't use scripts +; encoded with Zend Encoder then we do not recommend you install Zend Optimizer +; with eAccelerator. + + +; You must uncomment one (and only one) line from the following to load +; eAccelerator extension. +;extension="eaccelerator.so" +zend_extension="/usr/lib/php4/eaccelerator.so" +;zend_extension_ts="/usr/lib/php4/eaccelerator.so" +;extension="eaccelerator.dll" +;zend_extension_ts="c:\php4\eaccelerator.dll" +;zend_extension="c:\php4\eaccelerator.dll" + +; The amount of shared memory (in megabytes) that eAccelerator will use. +; "0" means OS default. Default value is "0". +eaccelerator.shm_size = "64" + +; The directory that is used for disk cache. eAccelerator stores precompiled +; code, session data, content and user entries here. The same data can be +; stored in shared memory also (for more quick access). Default value is +; "/tmp/eaccelerator". +eaccelerator.cache_dir = "/tmp/eaccelerator" + +; Enables or disables eAccelerator. Should be "1" for enabling or +; "0" for disabling. Default value is "1". +eaccelerator.enable = "1" + +; Enables or disables internal peephole optimizer which may speed up code +; execution. Should be "1" for enabling or "0" for disabling. +; Default value is "1". +eaccelerator.optimizer = "1" + +; Enables or disables debug logging. Should be "1" for enabling or +; "0" for disabling. Default value is "0". +eaccelerator.debug = "0" + +; Enables or disables PHP file modification checking. Should be "1" +; for enabling or "0" for disabling. You should set it to "1" if you want +; to recompile PHP files after modification. Default value is "1". +eaccelerator.check_mtime = "1" + +; Determine which PHP files must be cached. You may specify the number of +; patterns (for example "*.php *.phtml") which specifies to cache or +; not to cache. If pattern starts with the character "!", it means to ignore +; files which are matched by the following pattern. Default value is "" that +; means - all PHP scripts will be cached. +eaccelerator.filter = "" + +; Disables putting large values into shared memory by "eaccelerator_put()" +; function. +; It indicates the largest allowed size in bytes (10240, 10K, 1M). The "0" +; disables the limit. Default value is "0". +eaccelerator.shm_max = "0" + +; When eAccelerator fails to get shared memory for new script it removes +; all scripts which were not accessed at last "shm_ttl" seconds from shared +; memory. Default value is "0" that means - don't remove any files from +; shared memory. +eaccelerator.shm_ttl = "0" + +; When eAccelerator fails to get shared memory for new script it tryes to +; remove old script if the previous try was made more then "shm_prune_period" +; seconds ago. Default value is "0" that means - don't try to remove any +; files from shared memory. +eaccelerator.shm_prune_period = "0" + +; Enables or disables caching of compiled scripts on disk. It has no effect +; on session data and content caching. +; Default value is "0" that means - use disk and shared memory for caching. +eaccelerator.shm_only = "0" + +; Enables or disables cached content compression. Default value is "1" that +; means enable compression. +eaccelerator.compress = "1" + +; Compression level used for content caching. Default value is "9" which i +; is the maximum compression level +eaccelerator.compress_level = "9" + +; Determine where keys, session data and content will be cached. The possible +; values are: +; "shm_and_disk" - cache data in shared memory and on disk (default value) +; "shm" - cache data in shared memory or on disk if shared memory +; is full or data size greater then "eaccelerator.shm_max" +; "shm_only" - cache data in shared memory +; "disk_only" - cache data on disk +; "none" - don't cache data +eaccelerator.keys = "shm_and_disk" +eaccelerator.sessions = "shm_and_disk" +eaccelerator.content = "shm_and_disk" + +; eAccelerator can be managed through web interface script eaccelerator.php. So +; you need to put this file on your web site. For security reasons it is +; recommended to restrict the usage of this script by your local IP. +; +; To create the eAccelerator password type +; +; php -q eaccelerator_password.php +; Changing password for eAccelerator Web Interface (eaccelerator.php) +; +; Enter admin name: admin +; New admin password: eaccelerator +; Retype new admin password: eaccelerator + +eaccelerator.admin.name="yourusername" +eaccelerator.admin.password="yourpassword" ================================================================ From glen at pld-linux.org Wed Aug 24 12:32:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: php4-eaccelerator.ini - configured. NOTE: compression dis... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:32:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - configured. NOTE: compression disabled, as it will take more cpu, but what this accelerator is then about than accelerating? ---- Files affected: SOURCES: php4-eaccelerator.ini (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.1 SOURCES/php4-eaccelerator.ini:1.2 --- SOURCES/php4-eaccelerator.ini:1.1 Wed Aug 24 12:28:24 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:32:22 2005 @@ -12,12 +12,9 @@ ; You must uncomment one (and only one) line from the following to load ; eAccelerator extension. -;extension="eaccelerator.so" -zend_extension="/usr/lib/php4/eaccelerator.so" +extension="eaccelerator.so" +;zend_extension="/usr/lib/php4/eaccelerator.so" ;zend_extension_ts="/usr/lib/php4/eaccelerator.so" -;extension="eaccelerator.dll" -;zend_extension_ts="c:\php4\eaccelerator.dll" -;zend_extension="c:\php4\eaccelerator.dll" ; The amount of shared memory (in megabytes) that eAccelerator will use. ; "0" means OS default. Default value is "0". @@ -27,7 +24,7 @@ ; code, session data, content and user entries here. The same data can be ; stored in shared memory also (for more quick access). Default value is ; "/tmp/eaccelerator". -eaccelerator.cache_dir = "/tmp/eaccelerator" +eaccelerator.cache_dir = "/var/cache/eaccelerator" ; Enables or disables eAccelerator. Should be "1" for enabling or ; "0" for disabling. Default value is "1". @@ -79,7 +76,7 @@ ; Enables or disables cached content compression. Default value is "1" that ; means enable compression. -eaccelerator.compress = "1" +eaccelerator.compress = "0" ; Compression level used for content caching. Default value is "9" which i ; is the maximum compression level @@ -103,7 +100,7 @@ ; ; To create the eAccelerator password type ; -; php -q eaccelerator_password.php +; php4 -q eaccelerator_password.php ; Changing password for eAccelerator Web Interface (eaccelerator.php) ; ; Enter admin name: admin ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.1&r2=1.2&f=u From agaran at pld-linux.org Wed Aug 24 12:40:03 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec (NEW) - initial, for me ... In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, for me works rel 0.1 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u /dev/null SPECS/perl-POE-Component-DebugShell.spec:1.1 --- /dev/null Wed Aug 24 12:40:03 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:39:57 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DebugShell +Summary: POE::Component::DebugShell +Name: perl-POE-Component-DebugShell +Version: 1.0411 +Release: 0.1 +License: other, see LICENSE +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +perl-POE-Component-DebugShell module, see poe.perl.org + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc LICENSE +%{perl_vendorlib}/POE/Component/DebugShell.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:39:57 agaran +- initial, for me works rel 0.1 + ================================================================ From agaran at pld-linux.org Wed Aug 24 12:48:01 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - missing buildreq In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing buildreq ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.1 SPECS/perl-POE-Component-DebugShell.spec:1.2 --- SPECS/perl-POE-Component-DebugShell.spec:1.1 Wed Aug 24 12:39:57 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:47:55 2005 @@ -17,6 +17,7 @@ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: perl-POE +BuildRequires: perl-POE-API-Peek BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 10:47:55 agaran +- missing buildreq + Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 12:51:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: php4-eaccelerator.ini - use shm and fallback to disk for ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:51:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use shm and fallback to disk for speed ---- Files affected: SOURCES: php4-eaccelerator.ini (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.2 SOURCES/php4-eaccelerator.ini:1.3 --- SOURCES/php4-eaccelerator.ini:1.2 Wed Aug 24 12:32:22 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:51:43 2005 @@ -90,9 +90,9 @@ ; "shm_only" - cache data in shared memory ; "disk_only" - cache data on disk ; "none" - don't cache data -eaccelerator.keys = "shm_and_disk" -eaccelerator.sessions = "shm_and_disk" -eaccelerator.content = "shm_and_disk" +eaccelerator.keys = "shm" +eaccelerator.sessions = "shm" +eaccelerator.content = "shm" ; eAccelerator can be managed through web interface script eaccelerator.php. So ; you need to put this file on your web site. For security reasons it is ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.2&r2=1.3&f=u From agaran at pld-linux.org Wed Aug 24 12:53:35 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:53:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u /dev/null SPECS/perl-POE-Component-DirWatch.spec:1.1 --- /dev/null Wed Aug 24 12:53:35 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Wed Aug 24 12:53:29 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DirWatch +Summary: POE::Component::DirWatch +Name: perl-POE-Component-DirWatch +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +#BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback +as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as +an FTP upload directory. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/DirWatch.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:53:29 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 12:58:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: php4-eaccelerator.ini - kill trailing spaces In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:58:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - kill trailing spaces ---- Files affected: SOURCES: php4-eaccelerator.ini (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.3 SOURCES/php4-eaccelerator.ini:1.4 --- SOURCES/php4-eaccelerator.ini:1.3 Wed Aug 24 12:51:43 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:58:19 2005 @@ -57,13 +57,13 @@ ; disables the limit. Default value is "0". eaccelerator.shm_max = "0" -; When eAccelerator fails to get shared memory for new script it removes +; When eAccelerator fails to get shared memory for new script it removes ; all scripts which were not accessed at last "shm_ttl" seconds from shared ; memory. Default value is "0" that means - don't remove any files from ; shared memory. eaccelerator.shm_ttl = "0" -; When eAccelerator fails to get shared memory for new script it tryes to +; When eAccelerator fails to get shared memory for new script it tryes to ; remove old script if the previous try was made more then "shm_prune_period" ; seconds ago. Default value is "0" that means - don't try to remove any ; files from shared memory. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.3&r2=1.4&f=u From agaran at pld-linux.org Wed Aug 24 12:58:37 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: perl-POE-Component-Logger.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:58:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-Logger.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u /dev/null SPECS/perl-POE-Component-Logger.spec:1.1 --- /dev/null Wed Aug 24 12:58:37 2005 +++ SPECS/perl-POE-Component-Logger.spec Wed Aug 24 12:58:32 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-Logger +Summary: perl(POE::Component::Logger) +Name: perl-POE-Component-Logger +Version: 1.00 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-Log-Dispatch-Config +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _noautoreq 'perl(anything_fake_or_conditional)' + +%description +POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/Logger.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:58:32 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 13:00:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php4-eaccelerator.spec - add eaccelerator.ini - add cachedi... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add eaccelerator.ini - add cachedir - add more utility scripts ---- Files affected: SPECS: php4-eaccelerator.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.7 SPECS/php4-eaccelerator.spec:1.8 --- SPECS/php4-eaccelerator.spec:1.7 Wed Aug 24 12:25:10 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 13:00:24 2005 @@ -7,13 +7,14 @@ Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1.1 +Release: 1.5 Epoch: 0 License: GPL Vendor: Turck Software Group: Libraries Source0: http://dl.sourceforge.net/eaccelerator/%{_pkgname}-%{version}.tar.gz # Source0-md5: b17ddf953f18ee6df5c2c24ffccb37d9 +Source1: %{name}.ini URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool @@ -51,15 +52,13 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d,/var/cache/%{_name}} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} - -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini -; Enable %{_name} extension module -extension=%{_name}.so -EOF +install ./eaccelerator_password.php $RPM_BUILD_ROOT%{_bindir} +install ./eaccelerator.php $RPM_BUILD_ROOT%{_bindir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini %clean rm -rf $RPM_BUILD_ROOT @@ -69,15 +68,24 @@ [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %postun -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +fi + +%preun +if [ "$1" = 0 ]; then + # remove last pieces of cache + rm -f /var/cache/%{_name}/* +fi %files %defattr(644,root,root,755) %doc README %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so -%attr(755,root,root) %{_bindir}/encoder.php +%attr(755,root,root) %{_bindir}/* +%attr(770,root,http) /var/cache/%{_name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -85,6 +93,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 11:00:24 glen +- add eaccelerator.ini +- add cachedir +- add more utility scripts + Revision 1.7 2005/08/24 10:25:10 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.7&r2=1.8&f=u From agaran at pld-linux.org Wed Aug 24 13:00:53 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: perl-POE-Component-TSTP.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 11:00:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u /dev/null SPECS/perl-POE-Component-TSTP.spec:1.1 --- /dev/null Wed Aug 24 13:00:53 2005 +++ SPECS/perl-POE-Component-TSTP.spec Wed Aug 24 13:00:47 2005 @@ -0,0 +1,63 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-TSTP +Summary: POE::Component::TSTP - perl module +Name: perl-POE-Component-TSTP +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE component handling SIGTSTP, ctrl-z usually. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/TSTP.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 11:00:47 agaran +- initial, works for me + ================================================================ From paladine at pld-linux.org Wed Aug 24 13:02:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: hal.spec - changed pid file - commentedout pld_policy patch In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:02:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed pid file - commentedout pld_policy patch ---- Files affected: SPECS: hal.spec (1.81 -> 1.82) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.81 SPECS/hal.spec:1.82 --- SPECS/hal.spec:1.81 Tue Aug 23 16:58:25 2005 +++ SPECS/hal.spec Wed Aug 24 13:02:29 2005 @@ -114,7 +114,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build %{__libtoolize} @@ -129,7 +129,8 @@ --enable-selinux \ --with-hwdata=%{_sysconfdir} \ --enable-fstab-sync \ - --enable-verbose-mode + --enable-verbose-mode \ + --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install @@ -230,6 +231,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.82 2005/08/24 11:02:29 paladine +- changed pid file +- commentedout pld_policy patch + Revision 1.81 2005/08/23 14:58:25 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.81&r2=1.82&f=u From glen at pld-linux.org Wed Aug 24 13:16:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: web-cyradm.spec - %service requires rpmbuild(macros) >= 1.2... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:16:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ---- Files affected: SPECS: web-cyradm.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.3 SPECS/web-cyradm.spec:1.4 --- SPECS/web-cyradm.spec:1.3 Wed Aug 24 11:11:20 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:16:17 2005 @@ -19,6 +19,7 @@ Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ +BuildRequires: rpmbuild(macros) >= 1.228 Requires: apache Requires: php Requires: php-gettext @@ -106,9 +107,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi %preun @@ -117,9 +116,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi fi @@ -138,6 +135,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 11:16:17 glen +- %service requires rpmbuild(macros) >= 1.228 +- %service already includes check for sybsys lock + Revision 1.3 2005/08/24 09:11:20 kosmo - R & BR changes - better /etc/httpd/web-cyradm.conf ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Wed Aug 24 13:17:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: web-cyradm.spec - use %service reload, as it's only config ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:17:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service reload, as it's only config change (ie not modules update) ---- Files affected: SPECS: web-cyradm.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.4 SPECS/web-cyradm.spec:1.5 --- SPECS/web-cyradm.spec:1.4 Wed Aug 24 13:16:17 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:17:03 2005 @@ -135,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 11:17:03 glen +- use %service reload, as it's only config change (ie not modules update) + Revision 1.4 2005/08/24 11:16:17 glen - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 13:17:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: gnome-volume-manager-nonmountable_media.patch (NEW), gnom... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patches from ubuntu ---- Files affected: SOURCES: gnome-volume-manager-nonmountable_media.patch (NONE -> 1.1) (NEW), gnome-volume-manager-reconnect.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-volume-manager-nonmountable_media.patch diff -u /dev/null SOURCES/gnome-volume-manager-nonmountable_media.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-nonmountable_media.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:26:10.095406344 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:27:02.929374360 +0200 +@@ -1204,7 +1204,7 @@ + * Does this device support removable media? Note that we + * check storage_device and not our own UDI + */ +- if (mountable && libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { ++ if (libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { + /* we handle media change events separately */ + dbg ("Changed: %s\n", device); + gvm_media_changed (udi, storage_device, device); ================================================================ Index: SOURCES/gnome-volume-manager-reconnect.patch diff -u /dev/null SOURCES/gnome-volume-manager-reconnect.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-reconnect.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,118 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:27:33.904665400 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:34:21.984627816 +0200 +@@ -72,7 +72,8 @@ + #define NAUTILUS_COMMAND BIN_NAUTILUS" -n --no-desktop %m" + + static struct gvm_configuration config; +-static LibHalContext *hal_ctx; ++static LibHalContext *hal_ctx = NULL; ++static DBusConnection *dbus_connection = NULL; + + #ifndef ASSUME_SUBMOUNT + /** List of UDI's for volumes mounted by g-v-m that we need to apply policy to*/ +@@ -1356,6 +1357,75 @@ + { + } + ++static LibHalContext * gvm_do_hal_init (); ++ ++/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event. ++ * ++ * @param data Context pointer ++ * @return true if it should be tried again, false if success or failure. ++ */ ++static gboolean ++gvm_reconnect_to_hal (gpointer data __attribute__((__unused__))) ++{ ++ static unsigned int retries = 0; ++ DBusError error; ++ ++ dbg ("Trying a reconnect ...\n"); ++ hal_ctx = gvm_do_hal_init (); ++ if (hal_ctx != NULL) { ++ dbg ("Reconnected OK.\n"); ++ retries = 0; ++ return FALSE; ++ } else if (dbus_connection){ ++ /* shut down dbus connection to try it again */ ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ } ++ ++ /* Retry later if it failed. */ ++ if (retries++ < 6000) ++ return TRUE; ++ ++ /* Too many retries; clean up and bail. */ ++ warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n"); ++ if (hal_ctx) { ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ } ++ gtk_main_quit (); ++ return FALSE; ++} ++ ++/** Invoked by D-BUS to filter messages. ++ * ++ * @param connection D-BUS connection ++ * @param message D-BUS message ++ * @param user_data Context pointer ++ */ ++static DBusHandlerResult ++gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)), ++ DBusMessage *message, ++ void *user_data __attribute__((__unused__))) ++{ ++ DBusError error; ++ ++ if (dbus_message_is_signal (message, ++ DBUS_INTERFACE_LOCAL, ++ "Disconnected")) { ++ dbg("gvm_do_filter_dbus_msg: received Disconnected message\n"); ++ g_timeout_add(1000, gvm_reconnect_to_hal, NULL); ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ else ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} ++ + /** Integrate a dbus mainloop. + * + * @param ctx LibHal context +@@ -1366,14 +1436,15 @@ + static dbus_bool_t + hal_mainloop_integration (LibHalContext *ctx, DBusError *error) + { +- DBusConnection *dbus_connection; +- + dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error); + + if (dbus_error_is_set (error)) + return FALSE; ++ ++ dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE); + + dbus_connection_setup_with_g_main (dbus_connection, NULL); ++ dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL); + + libhal_ctx_set_dbus_connection (ctx, dbus_connection); + +@@ -1516,6 +1587,10 @@ + DBusError error; + GSList *l; + ++ if (ctx == NULL) { ++ warn("unmount_all: No hal connection! can't unmount volumes\n"); ++ return; ++ } + dbg ("unmounting all volumes that we saw mounted in our life\n"); + dbus_error_init (&error); + for (l = all_mounted_volumes; l != NULL; l = g_slist_next (l)) { ================================================================ From paladine at pld-linux.org Wed Aug 24 13:17:54 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: gnome-volume-manager.spec - added 2 patches from ubuntu - r... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added 2 patches from ubuntu - rel. 2 ---- Files affected: SPECS: gnome-volume-manager.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.30 SPECS/gnome-volume-manager.spec:1.31 --- SPECS/gnome-volume-manager.spec:1.30 Tue Aug 23 16:55:56 2005 +++ SPECS/gnome-volume-manager.spec Wed Aug 24 13:17:47 2005 @@ -3,13 +3,15 @@ Summary(pl): Zarz?dca wolumin?w dla GNOME Name: gnome-volume-manager Version: 1.3.2 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-volume-manager/1.3/%{name}-%{version}.tar.gz # Source0-md5: 85582b7bae862cffc72fa69098d5053c Patch0: %{name}-desktop.patch Patch1: %{name}-less_verbose.patch +Patch2: %{name}-nonmountable_media.patch +Patch3: %{name}-reconnect_on_dbus_exit.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 @@ -49,6 +51,8 @@ %patch0 -p1 # patch1 disabled until stable release #%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__glib_gettextize} @@ -59,7 +63,7 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ + --disable-schemas-install %{__make} %install @@ -96,6 +100,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/24 11:17:47 paladine +- added 2 patches from ubuntu +- rel. 2 + Revision 1.30 2005/08/23 14:55:56 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Wed Aug 24 13:18:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: web-cyradm.spec - use %apache_config triggers for linking a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %apache_config triggers for linking apache config ---- Files affected: SPECS: web-cyradm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.5 SPECS/web-cyradm.spec:1.6 --- SPECS/web-cyradm.spec:1.5 Wed Aug 24 13:17:03 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:18:46 2005 @@ -103,22 +103,11 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/httpd/%{name}.conf - %service -q httpd reload -fi - -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - - %service -q httpd reload - fi -fi +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %files -f %{name}.lang %defattr(644,root,root,755) @@ -135,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 11:18:46 glen +- use %apache_config triggers for linking apache config + Revision 1.5 2005/08/24 11:17:03 glen - use %service reload, as it's only config change (ie not modules update) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 13:19:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: web-cyradm.spec - require apache2 as the .spec doesn't supp... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:19:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require apache2 as the .spec doesn't support more ---- Files affected: SPECS: web-cyradm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.6 SPECS/web-cyradm.spec:1.7 --- SPECS/web-cyradm.spec:1.6 Wed Aug 24 13:18:46 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:19:49 2005 @@ -20,7 +20,7 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ BuildRequires: rpmbuild(macros) >= 1.228 -Requires: apache +Requires: apache >= 2.0 Requires: php Requires: php-gettext Requires: php-pear-DB @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 11:19:49 glen +- require apache2 as the .spec doesn't support more + Revision 1.6 2005/08/24 11:18:46 glen - use %apache_config triggers for linking apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 13:26:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS (AC-branch): rpm.spec, rpm-macros.spec, rpm.spec - rpm_macro... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:26:47 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - rpm_macros_rev 1.235 ---- Files affected: SPECS: rpm.spec (1.555.2.97 -> 1.555.2.98) SPECS: rpm-macros.spec (1.19 -> 1.20) , rpm.spec (1.684 -> 1.685) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.97 SPECS/rpm.spec:1.555.2.98 --- SPECS/rpm.spec:1.555.2.97 Sat Aug 20 21:03:55 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:41 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.2.52-10 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1113,6 +1113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.555.2.98 2005/08/24 11:26:41 glen +- rpm_macros_rev 1.235 + Revision 1.555.2.97 2005/08/20 19:03:55 glen - remove arch dependant %install macros from noarch macros file @@ -1613,7 +1616,7 @@ - current macros rev is 1.153 Revision 1.551 2004/05/27 20:30:13 pluto -- %%{_target_base_arch} macro added. +- %{_target_base_arch} macro added. - release 0.snap.23. Revision 1.550 2004/05/23 14:50:52 qboosh ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.19 SPECS/rpm-macros.spec:1.20 --- SPECS/rpm-macros.spec:1.19 Tue Aug 23 20:19:49 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:26:42 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.233 +%define rpm_macros_rev 1.235 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.19 2005/08/23 18:19:49 glen - rpm macros 1.233 ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.684 SPECS/rpm.spec:1.685 --- SPECS/rpm.spec:1.684 Tue Aug 16 01:26:22 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:42 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.3.27-1 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1104,6 +1104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.685 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.684 2005/08/15 23:26:22 glen - add posttrans debug patch, rel 2 (to be greater than ac) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.97&r2=1.555.2.98&f=u http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.19&r2=1.20&f=u http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.684&r2=1.685&f=u From glen at pld-linux.org Wed Aug 24 13:27:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: rpm-macros.spec - add builder help how to build for Ac In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:27:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add builder help how to build for Ac ---- Files affected: SPECS: rpm-macros.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.20 SPECS/rpm-macros.spec:1.21 --- SPECS/rpm-macros.spec:1.20 Wed Aug 24 13:26:42 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:27:11 2005 @@ -2,6 +2,7 @@ # NOTE # - AC-branch is TAG. please move the tag if rebuild needed: # $ cvs tag -F AC-branch rpm-macros.spec +# $ ./builder -r AC-branch -bb rpm-macros.spec # TODO # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. @@ -60,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 11:27:11 glen +- add builder help how to build for Ac + Revision 1.20 2005/08/24 11:26:42 glen - rpm_macros_rev 1.235 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Wed Aug 24 13:35:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: macromedia-flash.spec - split version to major and minor ve... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:35:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - split version to major and minor vers - macros not needed for installer package ---- Files affected: SPECS: macromedia-flash.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.35 SPECS/macromedia-flash.spec:1.36 --- SPECS/macromedia-flash.spec:1.35 Tue Aug 23 22:41:27 2005 +++ SPECS/macromedia-flash.spec Wed Aug 24 13:35:04 2005 @@ -1,8 +1,10 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package -# + +%define _ver_major 7 +%define _ver_minor 0 +%define _ver_patch 25 Summary: Flash plugin for Netscape-compatible WWW browsers Summary(pl): Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape %define base_name macromedia-flash @@ -11,18 +13,20 @@ %else Name: %{base_name}-installer %endif -Version: 7.0r25 -Release: 2.26%{?with_license_agreement:wla} +Version: %{_ver_major}.%{_ver_minor}.%{_ver_patch} +Release: 2.29%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} -Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz +Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{_ver_major}.%{_ver_minor}r%{_ver_patch}/install_flash_player_%{_ver_major}_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %else Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flashplayer/ +%if %{with license_agreement} BuildRequires: rpmbuild(macros) >= 1.235 +%endif Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: cpio @@ -146,6 +150,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 11:35:04 glen +- split version to major and minor vers +- macros not needed for installer package + Revision 1.35 2005/08/23 20:41:27 qboosh - updated pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.35&r2=1.36&f=u From aflinta at pld-linux.org Wed Aug 24 14:56:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: gnome-vfs-2.11.92.tar.bz2 Message-ID: <5472.1124888174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-2.11.92.tar.bz2 18c8c5127d1eebfd51c8b6d631f3c949 gnome-vfs-2.11.92.tar.bz2 Size: 1705543 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 14:56:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 12:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.12 -> 1.157.2.13) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.12 SPECS/gnome-vfs2.spec:1.157.2.13 --- SPECS/gnome-vfs2.spec:1.157.2.12 Tue Aug 23 16:51:55 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 14:56:00 2005 @@ -2,12 +2,12 @@ Summary: GNOME2 - virtual file system Summary(pl): GNOME2 - wirtualny system plik?w Name: gnome-vfs2 -Version: 2.11.90 -Release: 4 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: e6c55660c8190eb3c58c90c1a6988044 +# Source0-md5: 18c8c5127d1eebfd51c8b6d631f3c949 Source1: %{name}-defaults.list Patch0: %{name}-defaults-path.patch Patch1: %{name}-no_g_mime.patch @@ -98,7 +98,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p0 +#%patch4 -p0 %build # force rebuild @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.13 2005/08/24 12:56:00 aflinta +- 2.11.92 + Revision 1.157.2.12 2005/08/23 14:51:55 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.12&r2=1.157.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:22 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS (DEVEL): totem.spec - 1.1.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 13:22:22 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.1.5 ---- Files affected: SPECS: totem.spec (1.46.2.12 -> 1.46.2.13) ---- Diffs: ================================================================ Index: SPECS/totem.spec diff -u SPECS/totem.spec:1.46.2.12 SPECS/totem.spec:1.46.2.13 --- SPECS/totem.spec:1.46.2.12 Thu Aug 18 14:03:46 2005 +++ SPECS/totem.spec Wed Aug 24 15:22:15 2005 @@ -10,12 +10,12 @@ Summary: Movie player for GNOME 2 based on the gstreamer engine Summary(pl): Odtwarzacz film?w dla GNOME 2 oparty na silniku gstreamer Name: totem -Version: 1.1.4 -Release: 2 +Version: 1.1.5 +Release: 1 License: GPL Group: Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/%{name}-%{version}.tar.bz2 -# Source0-md5: 5b4e5216c2dc1fe06c8b7d83bae89a13 +# Source0-md5: cc203683cc2cf7e3585cd0b25de55c7f Patch0: %{name}-desktop.patch URL: http://www.hadess.net/totem.php3 BuildRequires: GConf2-devel @@ -204,6 +204,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.13 2005/08/24 13:22:15 aflinta +- 1.1.5 + Revision 1.46.2.12 2005/08/18 12:03:46 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/totem.spec?r1=1.46.2.12&r2=1.46.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: totem-1.1.5.tar.bz2 Message-ID: <22535.1124889749@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/totem-1.1.5.tar.bz2 cc203683cc2cf7e3585cd0b25de55c7f totem-1.1.5.tar.bz2 Size: 1623055 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 16:52:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES (DEVEL): gnome-vfs2-defaults-path.patch - up for 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 14:52:34 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 2.11.92 ---- Files affected: SOURCES: gnome-vfs2-defaults-path.patch (1.2 -> 1.2.2.1) ---- Diffs: ================================================================ Index: SOURCES/gnome-vfs2-defaults-path.patch diff -u SOURCES/gnome-vfs2-defaults-path.patch:1.2 SOURCES/gnome-vfs2-defaults-path.patch:1.2.2.1 --- SOURCES/gnome-vfs2-defaults-path.patch:1.2 Mon Mar 7 23:21:11 2005 +++ SOURCES/gnome-vfs2-defaults-path.patch Wed Aug 24 16:52:29 2005 @@ -1,19 +1,7 @@ -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2004-12-14 16:30:29.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2005-02-06 22:33:14.677240592 +0100 -@@ -150,7 +150,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c gnome-vfs-2.9.90/libgnomevfs/xdgmime.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2004-12-14 16:30:30.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2005-02-06 22:33:25.327621488 +0100 -@@ -207,7 +207,7 @@ +diff -urN gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c gnome-vfs-2.11.92/libgnomevfs/xdgmime.c +--- gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c 2005-08-24 14:42:16.910606480 +0200 ++++ gnome-vfs-2.11.92/libgnomevfs/xdgmime.c 2005-08-24 14:42:50.795455200 +0200 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-vfs2-defaults-path.patch?r1=1.2&r2=1.2.2.1&f=u From paladine at pld-linux.org Wed Aug 24 17:00:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES (DEVEL): gnome-vfs2-handle-drives-without-media-detection.... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:27 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed in sources ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:00:59 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - removed handle-drives-without-med... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - removed handle-drives-without-media-detection ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.13 -> 1.157.2.14) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.13 SPECS/gnome-vfs2.spec:1.157.2.14 --- SPECS/gnome-vfs2.spec:1.157.2.13 Wed Aug 24 14:56:00 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 17:00:54 2005 @@ -13,7 +13,6 @@ Patch1: %{name}-no_g_mime.patch Patch2: %{name}-fstab_edit_crash.patch Patch3: %{name}-disable_cdda.patch -Patch4: %{name}-handle-drives-without-media-detection.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -98,7 +97,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p0 %build # force rebuild @@ -195,6 +193,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.14 2005/08/24 15:00:54 paladine +- removed handle-drives-without-media-detection + Revision 1.157.2.13 2005/08/24 12:56:00 aflinta - 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.13&r2=1.157.2.14&f=u From paladine at pld-linux.org Wed Aug 24 17:02:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (R... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:02:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove it! ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: dbus-python_types.patch (REMOVED) - fixed in sources In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed in sources ---- Files affected: SOURCES: dbus-python_types.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: dbus.spec - updated to 0.36 - removed python_types patch (a... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36 - removed python_types patch (already in sources) ---- Files affected: SPECS: dbus.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.92 SPECS/dbus.spec:1.93 --- SPECS/dbus.spec:1.92 Tue Aug 23 16:39:33 2005 +++ SPECS/dbus.spec Wed Aug 24 17:08:15 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.35.2 -Release: 0.2 +Version: 0.36 +Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: 414680dddd3dec84cc3b0c45cdfaafbc +# Source0-md5: c969d0a11599e5950fb28eeed8b353ba Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -37,7 +37,6 @@ Patch2: %{name}-config.patch Patch3: %{name}-mint.patch Patch4: %{name}-python_fixes.patch -Patch5: %{name}-python_types.patch URL: http://www.freedesktop.org/Software/dbus BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.52 @@ -316,7 +315,6 @@ %patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in} %build @@ -537,6 +535,7 @@ %defattr(644,root,root,755) %dir %{py_sitedir}/%{name}/ %attr(755,root,root) %{py_sitedir}/%{name}/*.so +%{py_sitedir}/dbus.pth %{py_sitedir}/%{name}/*.py[co] %endif @@ -546,6 +545,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/24 15:08:15 paladine +- updated to 0.36 +- removed python_types patch (already in sources) + Revision 1.92 2005/08/23 14:39:33 paladine - added missing commit log - added BR: libselinux-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.92&r2=1.93&f=u From paladine at pld-linux.org Wed Aug 24 17:08:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: dbus-0.36.tar.gz Message-ID: <2655.1124896105@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.tar.gz c969d0a11599e5950fb28eeed8b353ba dbus-0.36.tar.gz Size: 1600854 bytes -- Virtually Yours: distfiles. From pascalek at pld-linux.org Wed Aug 24 17:17:25 2005 From: pascalek at pld-linux.org (pascalek) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: qt4.spec - typo In-Reply-To: References: Message-ID: Author: pascalek Date: Wed Aug 24 15:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: qt4.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.38 SPECS/qt4.spec:1.39 --- SPECS/qt4.spec:1.38 Tue Aug 23 12:46:45 2005 +++ SPECS/qt4.spec Wed Aug 24 17:17:17 2005 @@ -753,7 +753,7 @@ sub-examples-all-ordered %{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} -#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_mysql: %{__make} -C src/plugins/sqldrivers/mysql} %{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} %{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} %{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} @@ -1131,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/24 15:17:17 pascalek +- typo + Revision 1.38 2005/08/23 10:46:45 pluto - missed %dir %{_libdir}/qt4 added. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.38&r2=1.39&f=u From paladine at pld-linux.org Wed Aug 24 18:15:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NEW) - change c... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change cosmos theme dir ---- Files affected: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-screensaver-cosmos_theme_dir.patch diff -u /dev/null SOURCES/gnome-screensaver-cosmos_theme_dir.patch:1.1 --- /dev/null Wed Aug 24 18:15:34 2005 +++ SOURCES/gnome-screensaver-cosmos_theme_dir.patch Wed Aug 24 18:15:28 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-screensaver-0.0.9.orig/configure.ac gnome-screensaver-0.0.9/configure.ac +--- gnome-screensaver-0.0.9.orig/configure.ac 2005-08-24 17:44:41.294062536 +0200 ++++ gnome-screensaver-0.0.9/configure.ac 2005-08-24 17:44:55.933836952 +0200 +@@ -1372,7 +1372,7 @@ + AC_SUBST(LDFLAGS) + + # Saver engine stuff +-SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/pixmaps/backgrounds/cosmos" ++SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/gnome-screensaver/themes/cosmos" + + AC_SUBST(SLIDESHOW_COSMOS_DIR) + ================================================================ From paladine at pld-linux.org Wed Aug 24 18:15:46 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: gnome-screensaver.spec - updated to 0.0.9 (new themes) - ad... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.9 (new themes) - added cosmos_theme_dir patch - sorted %%files - itemize schemas ---- Files affected: SPECS: gnome-screensaver.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/gnome-screensaver.spec diff -u SPECS/gnome-screensaver.spec:1.4 SPECS/gnome-screensaver.spec:1.5 --- SPECS/gnome-screensaver.spec:1.4 Wed Jul 27 22:04:54 2005 +++ SPECS/gnome-screensaver.spec Wed Aug 24 18:15:41 2005 @@ -2,14 +2,15 @@ Summary: GNOME screensaver Summary(pl): Wygaszacz ekranu GNOME Name: gnome-screensaver -Version: 0.0.8 +Version: 0.0.9 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/%{name}-%{version}.tar.gz -# Source0-md5: 7f5b63f61aa7019dfd411054cf53916a +# Source0-md5: 3cd0458bfb1ae1bc96820157560042cc Source1: %{name}.pamd Patch0: %{name}-desktop.patch +Patch1: %{name}-cosmos_theme_dir.patch BuildRequires: GConf2-devel >= 2.6.1 BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -82,11 +84,11 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gnome-screensaver -%{_sysconfdir}/gconf/schemas/* %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/* %{_datadir}/%{name} %{_desktopdir}/*.desktop +%attr(755,root,root) %{_libdir}/* +%{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -94,6 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 16:15:41 paladine +- updated to 0.0.9 (new themes) +- added cosmos_theme_dir patch +- sorted %%files +- itemize schemas + Revision 1.4 2005/07/27 20:04:54 qboosh - sorted verify() flags, no need for default attr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 18:15:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: gnome-screensaver-0.0.9.tar.gz Message-ID: <3170.1124900147@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/gnome-screensaver-0.0.9.tar.gz 3cd0458bfb1ae1bc96820157560042cc gnome-screensaver-0.0.9.tar.gz Size: 1878783 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:19:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: lkcp.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 16:19:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: lkcp.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u /dev/null SPECS/lkcp.spec:1.1 --- /dev/null Wed Aug 24 18:19:03 2005 +++ SPECS/lkcp.spec Wed Aug 24 18:18:58 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +Summary: Live Kernel Configuration Panel +Name: lkcp +Version: 0.5.3 +Release: 1 +License: GPL v2 +Group: Applications +Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +# Source0-md5: 020f788b8c9ac52636b357e8929f7e30 +URL: http://webspace.utexas.edu/~hyoussef/ +BuildRequires: glib-devel +BuildRequires: ncurses-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Live Kernel Configuration Panel (LKCP) is an ncurses interface to the +run-time Linux kernel configuration data that can be accessed through +the /proc filesystem. It also generates a bash script of your recently +committed changes to the /proc/sys filesystem. + +%description -l pl +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do +konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy +ostatnie zmiany dokonane w systemie plik?w /proc/sys. + +%prep +%setup -q + +%build +%{__make} -C src \ + CC="%{__cc}" \ + FLAGS="%{rpmcflags} -I/usr/include/ncurses" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_bindir} +install src/lkcp $RPM_BUILD_ROOT%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc AUTHORS CREDITS Changelog README TODO Documentation/ +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 16:18:58 adamg +- new + + ================================================================ From adamg at pld-linux.org Wed Aug 24 18:19:00 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <5161.1124900340@distfiles.pld-linux.org> wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:23:32 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <7632.1124900612@distfiles.pld-linux.org> wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-24 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 snap ---- Files affected: SPECS: horde-passwd.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.21 SPECS/horde-passwd.spec:1.22 --- SPECS/horde-passwd.spec:1.21 Wed Aug 24 10:37:51 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:12 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-23 -%define _rel 2 +%define _snap 2005-08-24 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -9,14 +9,13 @@ Name: horde-passwd Version: 3.0 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: LGPL +License: ASL Vendor: The Horde Project Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz -# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 +# Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -49,8 +48,8 @@ modu?. %prep -%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} -%patch0 -p1 +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 16:58:12 glen +- updated to 2005-08-24 snap + Revision 1.21 2005/08/24 08:37:51 paszczus - ok, it is not a fake dep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 18:58:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: passwd-HEAD-2005-08-24.tar.gz Message-ID: <28419.1124902700@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-24/passwd-HEAD-2005-08-24.tar.gz 6638fad5170d5421bacf7e44868a7964 passwd-HEAD-2005-08-24.tar.gz Size: 903605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: horde-passwd.spec - license ASL In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license ASL ---- Files affected: SPECS: horde-passwd.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.22 SPECS/horde-passwd.spec:1.23 --- SPECS/horde-passwd.spec:1.22 Wed Aug 24 18:58:12 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:53 2005 @@ -141,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 16:58:53 glen +- license ASL + Revision 1.22 2005/08/24 16:58:12 glen - updated to 2005-08-24 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.22&r2=1.23&f=u From glen at pld-linux.org Wed Aug 24 19:04:37 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: horde-passwd.spec - cosmetics In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:04:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: horde-passwd.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.23 SPECS/horde-passwd.spec:1.24 --- SPECS/horde-passwd.spec:1.23 Wed Aug 24 18:58:53 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 19:04:32 2005 @@ -12,13 +12,14 @@ License: ASL Vendor: The Horde Project Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf URL: http://www.horde.org/passwd/ -BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) @@ -124,7 +125,7 @@ %attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php %attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/24 17:04:32 glen +- cosmetics + Revision 1.23 2005/08/24 16:58:53 glen - license ASL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Wed Aug 24 19:05:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: template-horde.spec - %{_hordeapp} macro, unify In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:05:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %{_hordeapp} macro, unify ---- Files affected: SPECS: template-horde.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/template-horde.spec diff -u SPECS/template-horde.spec:1.3 SPECS/template-horde.spec:1.4 --- SPECS/template-horde.spec:1.3 Wed Aug 3 19:49:12 2005 +++ SPECS/template-horde.spec Wed Aug 24 19:05:14 2005 @@ -8,23 +8,27 @@ # FIND .htaccess FILES AND MAKE SURE APACHE CONF DISABLES ACCESS TO # THOSE DIRS: find -name '.??*' IS EASY TO LOCATE. +%define _hordeapp skeleton %include /usr/lib/rpm/macros.php Summary: Template for horde projects Name: skeleton Version: 0.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL v2 (CHECK IT FIRST) +License: GPL v2 (CHECK IT FIRST, could be ASL) Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}.tar.gz +#Source0: ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}.tar.gz #Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}-%{_rc}.tar.gz -#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: - # COPY IN SOURCES ../SOURCES/ingo.conf AS SOURCE1 HERE: # cp ../SOURCES/{ingo,skeleton}.conf # DON'T FORGET TO :%s#ingo#skeleton#g in that file Source1: %{name}.conf +Patch0: %{name}-prefs.patch URL: http://www.horde.org/skeleton/ +BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -35,9 +39,9 @@ %define _noautocompressdoc CREDITS %define _noautoreq 'pear(Horde.*)' -%define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define hordedir /usr/share/horde +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} # GET DESCRIPTION FROM PROJECT URL %description @@ -55,40 +59,41 @@ Skeleton) mo?na znale?? na stronie . %prep -%setup -q -n %{?_snap:%{name}}%{!?_snap:%{name}-h3-%{version}%{?_rc:-%{_rc}}} +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 # considered harmful (horde/docs/SECURITY) rm -f test.php %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi # CHECK FIRST DOES IT HAVE SQL AND FILE THERE. @@ -102,13 +107,13 @@ fi %triggerin -- apache1 >= 1.3.33-2 -%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache1 >= 1.3.33-2 %apache_config_uninstall -v 1 %triggerin -- apache >= 2.0.0 -%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache >= 2.0.0 %apache_config_uninstall -v 2 @@ -116,12 +121,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -138,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 17:05:14 glen +- %{_hordeapp} macro, unify + Revision 1.3 2005/08/03 17:49:12 qboosh - pl desc skeleton ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.3&r2=1.4&f=u From adamg at pld-linux.org Wed Aug 24 19:07:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: Mail-1.1.8.tgz Message-ID: <1667.1124903225@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.8.tgz 69b1941019b686227123a879090241ab Mail-1.1.8.tgz Size: 16196 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:07 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.8 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.8 ---- Files affected: SPECS: php-pear-Mail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.22 SPECS/php-pear-Mail.spec:1.23 --- SPECS/php-pear-Mail.spec:1.22 Mon Aug 22 06:29:44 2005 +++ SPECS/php-pear-Mail.spec Wed Aug 24 19:07:02 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.7 +Version: 1.1.8 Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: f6307041810d18da6c6d04acdcc9b72a +# Source0-md5: 69b1941019b686227123a879090241ab URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 17:07:02 adamg +- updated to 1.1.8 + Revision 1.22 2005/08/22 04:29:44 adamg - updated to 1.1.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.22&r2=1.23&f=u From adamg at pld-linux.org Wed Aug 24 19:07:56 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: DB_DataObject_FormBuilder-0.18.1.tgz Message-ID: <2104.1124903276@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/DB_DataObject_FormBuilder-0.18.1.tgz 865fc02c5d596192e117e39a946719ca DB_DataObject_FormBuilder-0.18.1.tgz Size: 58383 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php-pear-DB_DataObject_FormBuilder.spec - updated to 0.18.1 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.18.1 ---- Files affected: SPECS: php-pear-DB_DataObject_FormBuilder.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-DB_DataObject_FormBuilder.spec diff -u SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.17 --- SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 Wed May 4 22:52:35 2005 +++ SPECS/php-pear-DB_DataObject_FormBuilder.spec Wed Aug 24 19:07:49 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - automatically build HTML_QuickForm object from a DB_DataObject derived class Summary(pl): %{_pearname} - automatyczne budowanie obiektu HTML_QuickForm pochodz?cego z DB_DataObject Name: php-pear-%{_pearname} -Version: 0.14.0 +Version: 0.18.1 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 830d1ef268f3e84f608be61ac12f194e +# Source0-md5: 865fc02c5d596192e117e39a946719ca URL: http://pear.php.net/package/DB_DataObject_FormBuilder/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/24 17:07:49 adamg +- updated to 0.18.1 + Revision 1.16 2005/05/04 20:52:35 adamg - updated to 0.14.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-DB_DataObject_FormBuilder.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Wed Aug 24 19:09:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php-pear-Net_Curl.spec - updated to 1.2.2 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:09:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.2 ---- Files affected: SPECS: php-pear-Net_Curl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_Curl.spec diff -u SPECS/php-pear-Net_Curl.spec:1.19 SPECS/php-pear-Net_Curl.spec:1.20 --- SPECS/php-pear-Net_Curl.spec:1.19 Sun Aug 21 20:10:26 2005 +++ SPECS/php-pear-Net_Curl.spec Wed Aug 24 19:09:44 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - an OO interface to the cURL extension Summary(pl): %{_pearname} - obiektowy interfejs do rozszerzenia cURL Name: php-pear-%{_pearname} -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 184d23b7054483dcb61fee5d1d6cc692 +# Source0-md5: 8b207ccf47795495b788034ef1049140 URL: http://pear.php.net/package/Net_Curl/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 17:09:44 adamg +- updated to 1.2.2 + Revision 1.19 2005/08/21 18:10:26 adamg - updated to 1.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_Curl.spec?r1=1.19&r2=1.20&f=u From adamg at pld-linux.org Wed Aug 24 19:09:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: Net_Curl-1.2.2.tgz Message-ID: <2977.1124903387@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_Curl-1.2.2.tgz 8b207ccf47795495b788034ef1049140 Net_Curl-1.2.2.tgz Size: 6729 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: PHPUnit-1.3.0.tgz Message-ID: <4469.1124903537@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/PHPUnit-1.3.0.tgz cd72efac3afe64c2499e643d53f3aba9 PHPUnit-1.3.0.tgz Size: 20898 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: php-pear-PHPUnit.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:12:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: php-pear-PHPUnit.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/php-pear-PHPUnit.spec diff -u SPECS/php-pear-PHPUnit.spec:1.24 SPECS/php-pear-PHPUnit.spec:1.25 --- SPECS/php-pear-PHPUnit.spec:1.24 Sat May 14 15:42:57 2005 +++ SPECS/php-pear-PHPUnit.spec Wed Aug 24 19:12:14 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - regression testing framework for unit tests Summary(pl): %{_pearname} - zestaw test?w regresyjnych Name: php-pear-%{_pearname} -Version: 1.2.3 +Version: 1.3.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 774238a3865f2c348c7450fa2df98ebb +# Source0-md5: cd72efac3afe64c2499e643d53f3aba9 URL: http://pear.php.net/package/PHPUnit/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 17:12:14 adamg +- updated to 1.3.0 + Revision 1.24 2005/05/14 13:42:57 adamg - updated to 1.2.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PHPUnit.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Wed Aug 24 19:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: ApacheJServ.spec - pl updates and fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:27:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl updates and fixes ---- Files affected: SPECS: ApacheJServ.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.39 SPECS/ApacheJServ.spec:1.40 --- SPECS/ApacheJServ.spec:1.39 Tue Aug 23 11:28:28 2005 +++ SPECS/ApacheJServ.spec Wed Aug 24 19:27:15 2005 @@ -53,8 +53,8 @@ in 100pc Java application, and listens for servlet requests using the Apache Java protocol (AJp). Typically, these requests will originate from the mod_jserv Apache module (DSO included). This package contains -a LGPL'ed implementation of sun's java servlet api version 2.0 by Paul -Siegmann +a LGPL'ed implementation of Sun's Java Servlet API version 2.0 by Paul +Siegmann . %description -l pl Apache JServ jest silnikiem serwletowym, rozwijanym przez Java Apache @@ -62,15 +62,15 @@ zosta? napisany od pocz?tku do ko?ca w Javie; nas?uchuje wywo?a? serwletu wykorzystuj?c protok?? Apache Java (AJp). Zazwyczaj wywo?ania te pochodz? z modu?u Apache mod_jservmodule (??cznie z DSO). Pakiet -ten zawiera sunowsk? implementacj? api serlet?w w javie w wersji 2.0 -(na licencji LGPL) napisana przez Paula Siegmanna - +ten zawiera implementacj? Java Servlet API Suna w wersji 2.0 napisan? +przez Paula Siegmanna (na licencji LGPL) +. %package init Summary: ApacheJServ initscript +Summary(pl): Skrypt startowy ApacheJServ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -BuildRequires: rpmbuild(macros) >= 1.202 Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/useradd @@ -79,13 +79,20 @@ %description init JServ initscript for standalone mode. +%description init -l pl +Skrypt startowy JServ dla trybu samodzielnego. + %package doc Summary: ApacheJServ documentation +Summary(pl): Dokumentacja do ApacheJServ Group: Development/Languages/Java %description doc ApacheJserv documentation. +%description doc -l pl +Dokumentacja do ApacheJServ. + %prep %setup -q -a1 %patch0 -p0 @@ -254,6 +261,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/24 17:27:15 qboosh +- pl updates and fixes + Revision 1.39 2005/08/23 09:28:28 glen - user/groupadd to init package - secret.key fill simplified ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.39&r2=1.40&f=u From adamg at pld-linux.org Wed Aug 24 19:37:31 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: DISTFILES: cgdb-0.5.3.tar.gz Message-ID: <22441.1124905051@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/cgdb/cgdb-0.5.3.tar.gz 51adf1db0307adaba24336ef3a18e0c3 cgdb-0.5.3.tar.gz Size: 527341 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:37:29 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: cgdb.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:37:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: cgdb.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.11 SPECS/cgdb.spec:1.12 --- SPECS/cgdb.spec:1.11 Sat Jul 23 16:52:22 2005 +++ SPECS/cgdb.spec Wed Aug 24 19:37:24 2005 @@ -2,12 +2,12 @@ Summary: A lightweight, but fully functional curses frontend to gdb Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb -Version: 0.5.2 +Version: 0.5.3 Release: 1 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz -# Source0-md5: 275be939017a3e2f24442dbe498c1de7 +# Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch URL: http://cgdb.sourceforge.net/ BuildRequires: automake @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/24 17:37:24 adamg +- updated to 0.5.3 + Revision 1.11 2005/07/23 14:52:22 jareq - updated to 0.5.2 - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Wed Aug 24 19:39:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:18 2005 Subject: SPECS: initng.spec - initng-0.1.9 codenamed "Hopefully Rebooting" In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:39:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initng-0.1.9 codenamed "Hopefully Rebooting" ---- Files affected: SPECS: initng.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/initng.spec diff -u SPECS/initng.spec:1.21 SPECS/initng.spec:1.22 --- SPECS/initng.spec:1.21 Sat Aug 13 12:11:17 2005 +++ SPECS/initng.spec Wed Aug 24 19:39:02 2005 @@ -1,19 +1,16 @@ # $Revision$, $Date$ -# TODO -# - plugins build doesn't pass CFLAGS Summary: A next generation init replacement Summary(pl): Zamiennik inita nast?pnej generacji Name: initng -Version: 0.1.8 +Version: 0.1.9 Release: 0.1 Epoch: 0 License: GPL v2 Group: Base Source0: http://initng.thinktux.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: c4a18ebc8d31875abffac3b5552c242e -Patch0: %{name}-PLD.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-utmpx.patch +# Source0-md5: b8c2117da50a1417deb3f3d4a3a1ab7f +Patch0: %{name}-lib64.patch +#Patch2: %{name}-utmpx.patch URL: http://jw.dyndns.org/initng/ BuildRequires: sed >= 4.0 BuildRequires: /etc/pld-release @@ -78,11 +75,11 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 #%patch2 -p1 %build %configure \ + --%{?debug:en}%{!?debug:dis}able-debug \ --sysconfdir=/etc \ --libdir=/%{_lib} \ @@ -121,18 +118,18 @@ %doc doc/empty.conf doc/hard.conf %doc doc/gentoo-chart.png doc/initng-chart.png %dir %{_sysconfdir} -%dir %{_sysconfdir}/conf +#%dir %{_sysconfdir}/conf %dir %{_sysconfdir}/daemon %dir %{_sysconfdir}/debug %dir %{_sysconfdir}/net %dir %{_sysconfdir}/system -%dir %{_sysconfdir}/plugin +#%dir %{_sysconfdir}/plugin %dir %{_libdir} %dir %{_libdir}/scripts %dir %{_libdir}/scripts/net -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i %attr(755,root,root) /%{_lib}/libinitng.so.*.*.* -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/lib*.so %attr(755,root,root) %{_sbindir}/install_service %attr(755,root,root) %{_sbindir}/initng %attr(755,root,root) %{_sbindir}/ng-update @@ -166,9 +163,11 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/net/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.runlevel -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml %attr(755,root,root) %{_sbindir}/gen_system_runlevel +%attr(755,root,root) %{_sbindir}/shutdown_script +%attr(755,root,root) %{_sbindir}/test_pidfile %attr(755,root,root) %{_libdir}/scripts/net/dhclient-wrapper %attr(755,root,root) %{_libdir}/scripts/net/dhcp %attr(755,root,root) %{_libdir}/scripts/net/dhcpcd-backgrounder @@ -189,6 +188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 17:39:02 glen +- initng-0.1.9 codenamed "Hopefully Rebooting" + Revision 1.21 2005/08/13 10:11:17 glen - updated to 0.1.8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 19:39:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: initng-0.1.9.tar.bz2 Message-ID: <23480.1124905152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://initng.thinktux.net/download/initng-0.1.9.tar.bz2 b8c2117da50a1417deb3f3d4a3a1ab7f initng-0.1.9.tar.bz2 Size: 603927 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Wed Aug 24 19:50:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: Sman.spec - pl, missing dir In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing dir ---- Files affected: SPECS: Sman.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.1 SPECS/Sman.spec:1.2 --- SPECS/Sman.spec:1.1 Sun Aug 21 13:00:10 2005 +++ SPECS/Sman.spec Wed Aug 24 19:50:07 2005 @@ -5,6 +5,7 @@ # %include /usr/lib/rpm/macros.perl Summary: Searcher for Man pages +Summary(pl): Wyszukiwarka stron Man Name: Sman Version: 0.95 Release: 0.1 @@ -14,19 +15,15 @@ Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz # Source0-md5: b786338eba068a4a110bf2bbda51e695 URL: http://joshr.com/src/sman/ -BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib BuildRequires: perl-FreezeThaw +BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: swish-e-perl -%if %{with tests} -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -#%%define _noautoreq 'perl(anything_fake_or_conditional)' - %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -52,6 +49,30 @@ - Performs 'stemming' so that a search for "searches" will match a document with the word "searching" +%description -l pl +Sman to wyszukiwarka stron Man. Jest to rozszerzona wersja 'apropos' i +'man -k' oparta na przyk?adzie o tej samej nazwie z artyku?u Josha +Rabinowitza "How To Index Anything" ("Jak indeksowa? cokolwiek") w +numerze Linux Journal z czerwca 2003 +. Sman dodaje kilka +kluczowych mo?liwo?ci, kt?rych nie maj? poprzednicy: + +- obs?uguje z?o?one wyszukiwania tekstu w j?zyku naturalnym, takie jak + "(linux and kernel) or (mach and microkernel)" + +- pokazuje wyniki w kolejno?ci punktacji i opcjonalnie wyci?g ze + strony (przy u?yciu -e) z pod?wietleniem wyszukiwanego tekstu + +- pozwala na wyszukiwanie po sekcji, tytule, ciele i nazwie pliku + strony (przy u?yciu 'nazwa-meta=szukane-s?owo') + +- indeksuje ca?? zawarto?? stron man, a nie tylko tytu? i opis + +- u?ywa wcze?niej zbudowanego indeksu w celu szybszego wyszukiwania + +- wykonuje "stemming", przez co np. wyszukiwanie s?owa "searches" + znajdzie dokument ze s?owem "searching" + %prep %setup -q @@ -83,6 +104,7 @@ %{perl_vendorlib}/Sman/Config.pm %dir %{perl_vendorlib}/Sman/Man %{perl_vendorlib}/Sman/Man/Cache.pm +%dir %{perl_vendorlib}/Sman/Man/Cache %{perl_vendorlib}/Sman/Man/Cache/DB_File.pm %{perl_vendorlib}/Sman/Man/Cache/FileCache.pm %{perl_vendorlib}/Sman/Man/Convert.pm @@ -99,6 +121,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 17:50:07 qboosh +- pl, missing dir + Revision 1.1 2005/08/21 11:00:10 twittner - added, not tested - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Wed Aug 24 20:04:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: X11-driver-evdev.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 18:04:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: X11-driver-evdev.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/X11-driver-evdev.spec diff -u SPECS/X11-driver-evdev.spec:1.1 SPECS/X11-driver-evdev.spec:1.2 --- SPECS/X11-driver-evdev.spec:1.1 Sun Aug 21 16:32:08 2005 +++ SPECS/X11-driver-evdev.spec Wed Aug 24 20:04:06 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: An input device driver for X +Summary(pl): Sterownik urz?dze? wej?ciowych dla X Name: X11-driver-evdev Version: 0.2 Release: 1 @@ -22,10 +23,16 @@ %define _prefix /usr/X11R6 %description -This driver uses the linux input layer directly and can handle both +This driver uses the Linux input layer directly and can handle both mice and keyboards. Please read and comment at: https://bugs.freedesktop.org/show_bug.cgi?id=968 +%description -l pl +Ten sterownik u?ywa bezpo?rednio warstwy wej?ciowej Linuksa i mo?e +obs?u?y? zar?wno myszy jak i klawiatury. Mo?na o nim przeczyta? i +napisa? komentarz pod adresem: +https://bugs.freedesktop.org/show_bug.cgi?id=968 + %prep %setup -q -n evdev-driver-%{version} %patch0 @@ -54,7 +61,7 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog README -%attr(644,root,root) %{_libdir}/modules/input/evdev_drv.o +%{_libdir}/modules/input/evdev_drv.o %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -62,5 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:04:06 qboosh +- pl + Revision 1.1 2005/08/21 14:32:08 pluto - evdev driver for input devices. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-evdev.spec?r1=1.1&r2=1.2&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: phpPgAdmin.spec - updated to 3.5.5 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.5.5 ---- Files affected: SPECS: phpPgAdmin.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/phpPgAdmin.spec diff -u SPECS/phpPgAdmin.spec:1.45 SPECS/phpPgAdmin.spec:1.46 --- SPECS/phpPgAdmin.spec:1.45 Sat Apr 16 15:36:29 2005 +++ SPECS/phpPgAdmin.spec Wed Aug 24 20:17:13 2005 @@ -2,12 +2,12 @@ Summary: phpPgAdmin - web-based PostgreSQL administration Summary(pl): phpPgAdmin - administracja bazami PostgreSQL przez WWW Name: phpPgAdmin -Version: 3.5.3 +Version: 3.5.5 Release: 1 License: GPL v2+ Group: Applications/Databases/Interfaces Source0: http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2 -# Source0-md5: 91a9e6bce537422febedc5666ad296d6 +# Source0-md5: 26ff10b0bc1c4a313ddcf6e679cb4adf Source1: %{name}.conf URL: http://sourceforge.net/projects/phppgadmin/ Requires: php >= 4.1 @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/24 18:17:13 adamg +- updated to 3.5.5 + Revision 1.45 2005/04/16 13:36:29 charles - updated to 3.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/phpPgAdmin.spec?r1=1.45&r2=1.46&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: phpPgAdmin-3.5.5.tar.bz2 Message-ID: <15638.1124907439@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/phppgadmin/phpPgAdmin-3.5.5.tar.bz2 26ff10b0bc1c4a313ddcf6e679cb4adf phpPgAdmin-3.5.5.tar.bz2 Size: 457450 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:19:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS (DEVEL): edb.spec - updated to 1.0.5.004 - new Source0 ("off... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:19:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.0.5.004 - new Source0 ("official" snapshots) - updated -ac_fix.patch ---- Files affected: SPECS: edb.spec (1.21.2.2 -> 1.21.2.3) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.2 SPECS/edb.spec:1.21.2.3 --- SPECS/edb.spec:1.21.2.2 Sat Jul 9 15:03:42 2005 +++ SPECS/edb.spec Wed Aug 24 20:19:40 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Database Access Library Summary(pl): Biblioteka Enlightementa dost?pu do baz danych Name: edb -Version: 1.0.5.003 -%define _snap 20050701 -Release: 1.%{_snap}.0.1 +Version: 1.0.5.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 870592c7ef67ae31abfe5f37861a689e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch URL: http://www.enlightement.org/ BuildRequires: autoconf @@ -64,13 +62,13 @@ Edytor baz danych w GTK+. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"; export CFLAGS %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -122,6 +120,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.3 2005/08/24 18:19:40 charles +- updated to 1.0.5.004 +- new Source0 ("official" snapshots) +- updated -ac_fix.patch + Revision 1.21.2.2 2005/07/09 13:03:42 sparky - new snapshot - correct license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.2&r2=1.21.2.3&f=u From charles at pld-linux.org Wed Aug 24 20:19:48 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: edb-1.0.5.004.tar.gz Message-ID: <17162.1124907588@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edb-1.0.5.004.tar.gz 2565467041d770240f93969c6055e35f edb-1.0.5.004.tar.gz Size: 631960 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:48 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: lkcp-0.5.3.tar.bz2 Message-ID: <18052.1124907648@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://lkcp-0.5.3.tar.bz2 020f788b8c9ac52636b357e8929f7e30 lkcp-0.5.3.tar.bz2 Size: 104394 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: lkcp.spec - distfiles workaround In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:20:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - distfiles workaround ---- Files affected: SPECS: lkcp.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.1 SPECS/lkcp.spec:1.2 --- SPECS/lkcp.spec:1.1 Wed Aug 24 18:18:58 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:20:46 2005 @@ -5,7 +5,8 @@ Release: 1 License: GPL v2 Group: Applications -Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +#Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 # Source0-md5: 020f788b8c9ac52636b357e8929f7e30 URL: http://webspace.utexas.edu/~hyoussef/ BuildRequires: glib-devel @@ -19,8 +20,8 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do -konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -51,7 +52,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:20:46 adamg +- distfiles workaround + Revision 1.1 2005/08/24 16:18:58 adamg - new - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.1&r2=1.2&f=u From charles at pld-linux.org Wed Aug 24 20:22:29 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SOURCES (DEVEL): edb-ac_fix.patch - updated to 1.0.5.004 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:22:29 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated to 1.0.5.004 ---- Files affected: SOURCES: edb-ac_fix.patch (1.3.2.1 -> 1.3.2.2) ---- Diffs: ================================================================ Index: SOURCES/edb-ac_fix.patch diff -u SOURCES/edb-ac_fix.patch:1.3.2.1 SOURCES/edb-ac_fix.patch:1.3.2.2 --- SOURCES/edb-ac_fix.patch:1.3.2.1 Thu Mar 31 00:01:54 2005 +++ SOURCES/edb-ac_fix.patch Wed Aug 24 20:22:24 2005 @@ -1,6 +1,6 @@ ---- edb/configure.in~ 2005-03-04 01:11:17.000000000 +0100 -+++ edb/configure.in 2005-03-30 17:05:38.000000000 +0200 -@@ -25,55 +25,6 @@ +--- edb-1.0.5.004/configure.in.orig 2005-07-30 08:03:20.000000000 +0200 ++++ edb-1.0.5.004/configure.in 2005-08-24 13:54:09.000000000 +0200 +@@ -24,55 +24,6 @@ dnl AC_PROG_INSTALL() dnl AC_ARG_PROGRAM() @@ -56,7 +56,16 @@ dnl There are additional libraries we need for some compiler/architecture dnl combinations. AC_SUBST(LIBS) -@@ -457,7 +408,6 @@ +@@ -404,7 +355,7 @@ + ncurses_ok=no + gtk_ok=no + +-GTK_CONFIG=`which gtk-config` ++GTK_CONFIG=/usr/bin/gtk-config + if test -x "$GTK_CONFIG"; then + AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) + fi +@@ -456,7 +407,6 @@ edb-native.oe edb.bb edbXnative.bb ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/edb-ac_fix.patch?r1=1.3.2.1&r2=1.3.2.2&f=u From charles at pld-linux.org Wed Aug 24 20:25:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: ERRORS: eet-0.9.10.013.tar.gz Message-ID: <21647.1124907927@distfiles.pld-linux.org> FATAL: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz md5 mismatch, needed 82a7680c4eedf3c4a073fcdf7134cc91, got 875802e243e37e2eb954d3580cb19678 Files fetched: 0 -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:25:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: eet.spec - updated to 0.9.10.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.10.013 - new Source0 ("official" snapshots) - -devel R: libjpeg-devel, zlib-devel ---- Files affected: SPECS: eet.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.5 SPECS/eet.spec:1.6 --- SPECS/eet.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/eet.spec Wed Aug 24 20:25:23 2005 @@ -2,13 +2,11 @@ Summary: Library for speedy data storage, retrieval, and compression Summary(pl): Biblioteka do szybkiego zapisywania, odtwarzania i kompresji danych Name: eet -Version: 0.9.10.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.9 +Version: 0.9.10.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 URL: http://enlightenment.org/ BuildRequires: autoconf @@ -50,6 +48,8 @@ Summary(pl): Pliki nag??wkowe biblioteki Eet Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libjpeg-devel +Requires: zlib-devel %description devel Header files for Eet library. @@ -70,11 +70,11 @@ Statyczna biblioteka Eet. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -118,6 +118,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:25:23 charles +- updated to 0.9.10.013 +- new Source0 ("official" snapshots) +- -devel R: libjpeg-devel, zlib-devel + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:28:04 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: ecore-0.9.9.013.tar.gz Message-ID: <23249.1124908084@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ecore-0.9.9.013.tar.gz ef3dcedf00e18c6449e744edf4a50c50 ecore-0.9.9.013.tar.gz Size: 1074990 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:28:03 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: ecore.spec - updated to 0.9.9.013 - new Source0 ("official"... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:28:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ecore.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.5 SPECS/ecore.spec:1.6 --- SPECS/ecore.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ecore.spec Wed Aug 24 20:27:57 2005 @@ -2,20 +2,19 @@ Summary: Enlightened Core X interface library Summary(pl): Biblioteka interfejsu X Enlightened Core Name: ecore -Version: 0.9.9.010 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: dda96a94cab2fd5d485757b76f0c4775 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel BuildRequires: libtool BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,12 +57,22 @@ Statyczne biblioteki Ecore. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -123,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:27:57 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 20:29:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: lkcp.spec - disable "tset -Q -r", fixes build on my amd64 c... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 18:29:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable "tset -Q -r", fixes build on my amd64 chroot under screen ---- Files affected: SPECS: lkcp.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.2 SPECS/lkcp.spec:1.3 --- SPECS/lkcp.spec:1.2 Wed Aug 24 20:20:46 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:29:34 2005 @@ -30,6 +30,7 @@ %build %{__make} -C src \ + RESET=true \ CC="%{__cc}" \ FLAGS="%{rpmcflags} -I/usr/include/ncurses" @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 18:29:34 glen +- disable "tset -Q -r", fixes build on my amd64 chroot under screen + Revision 1.2 2005/08/24 18:20:46 adamg - distfiles workaround ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.2&r2=1.3&f=u From charles at pld-linux.org Wed Aug 24 20:30:15 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: edje.spec - updated to 0.5.0.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:30:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.0.013 - new Source0 ("official" snapshots) - BR/R imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: edje.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.7 SPECS/edje.spec:1.8 --- SPECS/edje.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/edje.spec Wed Aug 24 20:30:10 2005 @@ -2,21 +2,18 @@ Summary: Complex Graphical Design/Layout Engine Summary(pl): Z?o?ony silnik graficznego projektowania/planowania Name: edje -Version: 0.5.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.5.0.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 94cd1aabb9fc7785123fb4d92255f85e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 1e5829e8c784770da2ccbd57ef55714c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: embryo-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -60,7 +57,7 @@ Requires: %{name} = %{version}-%{release} Requires: ecore-devel Requires: embryo-devel -Requires: imlib2-devel +Requires: imlib2-devel >= 1.2.1 %description devel Header files for Edje. @@ -81,11 +78,11 @@ Statyczna biblioteka Edje. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -131,6 +128,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:30:10 charles +- updated to 0.5.0.013 +- new Source0 ("official" snapshots) +- BR/R imlib2-devel up to >= 1.2.1 + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:30:23 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: edje-0.5.0.013.tar.gz Message-ID: <24704.1124908223@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edje-0.5.0.013.tar.gz 1e5829e8c784770da2ccbd57ef55714c edje-0.5.0.013.tar.gz Size: 3161902 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:32:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: eet.spec - updated md5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:32:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 ---- Files affected: SPECS: eet.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.6 SPECS/eet.spec:1.7 --- SPECS/eet.spec:1.6 Wed Aug 24 20:25:23 2005 +++ SPECS/eet.spec Wed Aug 24 20:32:54 2005 @@ -7,7 +7,7 @@ License: BSD Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz -# Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 +# Source0-md5: 875802e243e37e2eb954d3580cb19678 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:32:54 charles +- updated md5 + Revision 1.6 2005/08/24 18:25:23 charles - updated to 0.9.10.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:33:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: eet-0.9.10.013.tar.gz Message-ID: <26416.1124908382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz 875802e243e37e2eb954d3580cb19678 eet-0.9.10.013.tar.gz Size: 317271 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:57 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: embryo-0.9.1.013.tar.gz Message-ID: <26952.1124908437@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/embryo-0.9.1.013.tar.gz e1140446f243445ad8b987becb975d3d embryo-0.9.1.013.tar.gz Size: 436231 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:56 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: embryo.spec - updated to 0.9.1.013 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:33:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.1.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: embryo.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.5 SPECS/embryo.spec:1.6 --- SPECS/embryo.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/embryo.spec Wed Aug 24 20:33:50 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Embryo Summary(pl): Podstawowe biblioteki Enlightenmenta - Embryo Name: embryo -Version: 0.9.1.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.1.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: d28dd1aadd155d78c42d2bbde48405e9 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: e1140446f243445ad8b987becb975d3d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -49,11 +47,11 @@ Statyczna biblioteka Embryo. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -98,6 +96,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:33:50 charles +- updated to 0.9.1.013 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: emotion-0.0.1.004.tar.gz Message-ID: <27629.1124908499@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/emotion-0.0.1.004.tar.gz 3be5850cf23afeff8976e45a9861b7c4 emotion-0.0.1.004.tar.gz Size: 410793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: emotion.spec - updated to 0.0.1.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:34:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.1.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: emotion.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.5 SPECS/emotion.spec:1.6 --- SPECS/emotion.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/emotion.spec Wed Aug 24 20:34:53 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Emotion Summary(pl): Podstawowe biblioteki Enlightenmenta - Emotion Name: emotion -Version: 0.0.1.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.0.1.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b93da3ce3da37483ad4721facb050744 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Emotion. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -105,6 +103,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:34:53 charles +- updated to 0.0.1.004 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:36:01 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: epeg.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:36:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: epeg.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.4 SPECS/epeg.spec:1.5 --- SPECS/epeg.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epeg.spec Wed Aug 24 20:35:56 2005 @@ -2,14 +2,12 @@ Summary: JPEG Scaling Library Summary(pl): Biblioteka do skalowania JPEG-?w Name: epeg -Version: 0.9.0.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 2d7073b33eb39d447d2c3cb6db5c1391 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ad8505bed8deb7049dfa6322ce908f99 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Epeg. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -96,6 +94,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:35:56 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:36:07 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: epeg-0.9.0.004.tar.gz Message-ID: <28437.1124908567@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epeg-0.9.0.004.tar.gz ad8505bed8deb7049dfa6322ce908f99 epeg-0.9.0.004.tar.gz Size: 2363701 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:37:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: epsilon.spec - updated to 0.3.0.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.0.004 - new Source0 ("official" snapshots) - updates BRs ---- Files affected: SPECS: epsilon.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.4 SPECS/epsilon.spec:1.5 --- SPECS/epsilon.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epsilon.spec Wed Aug 24 20:37:42 2005 @@ -2,22 +2,17 @@ Summary: Enlightened Thumbnail Generator Summary(pl): O?wiecony generator miniaturek obraz?w Name: epsilon -Version: 0.3.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.3.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b86833bb0c6190b93b99234d9d3a5311 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 10118c712b42d00b332c6fe1d9257661 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: edje-devel BuildRequires: epeg-devel -BuildRequires: freetype-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel -BuildRequires: libpng-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +66,7 @@ Statyczna biblioteka Epsilon. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -117,6 +112,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:37:42 charles +- updated to 0.3.0.004 +- new Source0 ("official" snapshots) +- updates BRs + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:37:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: epsilon-0.3.0.004.tar.gz Message-ID: <29465.1124908666@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epsilon-0.3.0.004.tar.gz 10118c712b42d00b332c6fe1d9257661 epsilon-0.3.0.004.tar.gz Size: 335128 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: esmart-0.9.0.004.tar.gz Message-ID: <30925.1124908827@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/esmart-0.9.0.004.tar.gz 23605a2ff7e90c8b28e934f6a1fbfc4d esmart-0.9.0.004.tar.gz Size: 374791 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: esmart.spec - updated to 0.9.0.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:40:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR libltdl-devel ---- Files affected: SPECS: esmart.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmart.spec diff -u SPECS/esmart.spec:1.4 SPECS/esmart.spec:1.5 --- SPECS/esmart.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/esmart.spec Wed Aug 24 20:40:23 2005 @@ -2,21 +2,18 @@ Summary: Evas "smart objects" Summary(pl): "Inteligentne obiekty" Evas Name: esmart -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: fd426d6d36dc57c857f5e91f8950b5d7 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 23605a2ff7e90c8b28e934f6a1fbfc4d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: epeg-devel BuildRequires: epsilon-devel -BuildRequires: libltdl-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,7 +53,7 @@ Statyczne biblioteki Esmart. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:40:23 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR libltdl-devel + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmart.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:37 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: etox.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:41:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR pkgconfig ---- Files affected: SPECS: etox.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.4 SPECS/etox.spec:1.5 --- SPECS/etox.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/etox.spec Wed Aug 24 20:41:32 2005 @@ -2,20 +2,17 @@ Summary: Enlightened Text Object Library Summary(pl): O?wiecona biblioteka obiekt?w tekstowych (Enlightened Text Object Library) Name: etox -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 6f0241bb8021744f8e081e3739441644 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ffb6de465dfc9a9b2802b414dd432932 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: libtool -BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -61,7 +58,7 @@ Statyczna biblioteka Etox. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:41:32 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR pkgconfig + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: etox-0.9.0.004.tar.gz Message-ID: <31771.1124908900@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/etox-0.9.0.004.tar.gz ffb6de465dfc9a9b2802b414dd432932 etox-0.9.0.004.tar.gz Size: 1046396 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: evas-0.9.9.013.tar.gz Message-ID: <32597.1124908963@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/evas-0.9.9.013.tar.gz 6d888cc6427d783ae517185c1e446e38 evas-0.9.9.013.tar.gz Size: 1404665 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: evas.spec - updated to 0.9.9.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:42:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: evas.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.7 SPECS/evas.spec:1.8 --- SPECS/evas.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/evas.spec Wed Aug 24 20:42:34 2005 @@ -17,14 +17,12 @@ Summary: Multi-platform Canvas Library Summary(pl): Wieloplatformowa biblioteka do rysowania Name: evas -Version: 0.9.9.010 -%define _snap 20050706 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: a798480eacc9437d84ed12d64f789fc5 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 6d888cc6427d783ae517185c1e446e38 URL: http://enlightenment.org/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel @@ -82,12 +80,11 @@ Statyczna biblioteka Evas. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -167,6 +164,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:42:34 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:44:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: ewl.spec - updated to 0.0.4.004 - new Source0 ("official" s... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:44:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.4.004 - new Source0 ("official" snapshots) - removed redundant BR etox-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ewl.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.5 SPECS/ewl.spec:1.6 --- SPECS/ewl.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ewl.spec Wed Aug 24 20:44:33 2005 @@ -2,20 +2,17 @@ Summary: Enlightenment Widget Library Summary(pl): Biblioteka widget?w Enlightenmenta (Enlightenment Widget Library) Name: ewl -Version: 0.0.4.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.0.4.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 008c998c511e424165abdfbf319eaa00 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: emotion-devel -BuildRequires: etox-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,11 +48,22 @@ Statyczna biblioteka EWL. %prep -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -107,6 +115,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:44:33 charles +- updated to 0.0.4.004 +- new Source0 ("official" snapshots) +- removed redundant BR etox-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:44:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: ewl-0.0.4.004.tar.gz Message-ID: <1355.1124909080@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ewl-0.0.4.004.tar.gz aed8f9eaf06ed5f0120d6f9ce2dc985c ewl-0.0.4.004.tar.gz Size: 1222523 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:45:50 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: enlightenmentDR17.spec - updated to 0.16.999.013 - new Sour... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:45:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.16.999.013 - new Source0 ("official" snapshots) - BR gettext-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: enlightenmentDR17.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.5 SPECS/enlightenmentDR17.spec:1.6 --- SPECS/enlightenmentDR17.spec:1.5 Thu Aug 4 13:06:18 2005 +++ SPECS/enlightenmentDR17.spec Wed Aug 24 20:45:44 2005 @@ -1,20 +1,20 @@ # $Revision$, $Date$ +%define _src_name enlightenment Summary: Enlightenment Window Manager Summary(pl): Zarz?dca okien X - Enlightenment Name: enlightenmentDR17 -Version: 0.16.999.010 -%define _snap 20050708 -Release: 0.%{_snap}.0.1 +Version: 0.16.999.013 +Release: 1 License: BSD Group: X11/Window Managers -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/e-%{_snap}.tar.gz -# Source0-md5: 66f01dd81c2cc2b06e47fd11cc4c6d29 +Source0: http://enlightenment.freedesktop.org/files/%{_src_name}-%{version}.tar.gz +# Source0-md5: d8dd1ab454cc08e33905bb03f6d480cf Source1: %{name}-xsession.desktop URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel +BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,7 +41,19 @@ Pliki nag??wkowe dla Enlightenmenta. %prep -%setup -q -n e +%setup -q -n %{_src_name}-%{version} +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 + #name change: sed -e '/AM_INIT_AUTOMAKE/s/enlightenment/%{name}/' \ -i configure.in @@ -55,7 +67,7 @@ %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -108,6 +120,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:45:44 charles +- updated to 0.16.999.013 +- new Source0 ("official" snapshots) +- BR gettext-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/08/04 11:06:18 darekr - BR: sed 4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:46:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: entice.spec - updated to 0.9.3.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entice.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/entice.spec diff -u SPECS/entice.spec:1.4 SPECS/entice.spec:1.5 --- SPECS/entice.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/entice.spec Wed Aug 24 20:46:47 2005 @@ -2,14 +2,12 @@ Summary: Image viewer using Enlightenment libraries Summary(pl): Przegl?darka obrazk?w u?ywaj?ca bibliotek Enlightenmenta Name: entice -Version: 0.9.1 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.3.004 +Release: 1 License: BSD Group: X11/Window Managers/Tools -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 3b1d9e40558ebc803efc7b2fd9e7df42 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: c5ffa01f6327b59b4fbbb3729e1e0867 Patch0: %{name}-no_buildtime_gimp.patch URL: http://enlightenment.org/ BuildRequires: autoconf @@ -37,12 +35,12 @@ z tego katalogu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -70,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:46:47 charles +- updated to 0.9.3.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entice.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:46:54 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: entice-0.9.3.004.tar.gz Message-ID: <2835.1124909213@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entice-0.9.3.004.tar.gz c5ffa01f6327b59b4fbbb3729e1e0867 entice-0.9.3.004.tar.gz Size: 881544 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: enlightenment-0.16.999.013.tar.gz Message-ID: <2106.1124909258@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/enlightenment-0.16.999.013.tar.gz d8dd1ab454cc08e33905bb03f6d480cf enlightenment-0.16.999.013.tar.gz Size: 41558793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: entrance.spec - updated to 0.9.0.004 - new Source0 ("offici... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:47:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entrance.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/entrance.spec diff -u SPECS/entrance.spec:1.6 SPECS/entrance.spec:1.7 --- SPECS/entrance.spec:1.6 Sun Jul 10 09:17:59 2005 +++ SPECS/entrance.spec Wed Aug 24 20:47:34 2005 @@ -2,14 +2,12 @@ Summary: Enlightened display manager Summary(pl): O?wiecony zarz?dca ekranu Name: entrance -Version: 0.9.0.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.2 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Applications -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 4f1747d588dcb4ed1f0f613966519ca4 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 48d8999a5be31e4b089e0faf40bf9fd9 Source1: %{name}.init Source2: %{name}.Xsession Source3: %{name}.gen-conf @@ -44,7 +42,7 @@ jakich KDM czy GDM mog? tylko pomarzy?... i to bez narzutu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 sed '/PACKAGE_CFG_DIR/s@"${sysconfdir}"@"${localstatedir}/lib/${PACKAGE}"@' \ @@ -119,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:47:34 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.6 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entrance.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:48:24 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: entrance-0.9.0.004.tar.gz Message-ID: <3393.1124909304@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entrance-0.9.0.004.tar.gz 48d8999a5be31e4b089e0faf40bf9fd9 entrance-0.9.0.004.tar.gz Size: 16901820 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 21:01:08 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.2 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 19:01:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.2 ---- Files affected: SPECS: gtk+2.spec (1.179.2.9 -> 1.179.2.10) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.9 SPECS/gtk+2.spec:1.179.2.10 --- SPECS/gtk+2.spec:1.179.2.9 Wed Aug 24 10:00:08 2005 +++ SPECS/gtk+2.spec Wed Aug 24 21:01:00 2005 @@ -14,13 +14,13 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.1 +Version: 2.8.2 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 +# Source0-md5: 5b8b6d24f9f24469f96934b6efcc34b9 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.10 2005/08/24 19:01:00 aflinta +- 2.8.2 + Revision 1.179.2.9 2005/08/24 08:00:08 aflinta - 2.8.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.9&r2=1.179.2.10&f=u From aflinta at pld-linux.org Wed Aug 24 21:01:47 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: gtk+-2.8.2.tar.bz2 Message-ID: <12173.1124910107@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.2.tar.bz2 5b8b6d24f9f24469f96934b6efcc34b9 gtk+-2.8.2.tar.bz2 Size: 11802646 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 21:08:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: horde-passwd.spec - fix for broken ldap::_userDN() In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 19:08:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for broken ldap::_userDN() ---- Files affected: SPECS: horde-passwd.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.24 SPECS/horde-passwd.spec:1.25 --- SPECS/horde-passwd.spec:1.24 Wed Aug 24 19:04:32 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 21:08:52 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-24 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -16,6 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -51,6 +52,7 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 +%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 19:08:52 glen +- fix for broken ldap::_userDN() + Revision 1.24 2005/08/24 17:04:32 glen - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.24&r2=1.25&f=u From charles at pld-linux.org Wed Aug 24 21:12:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: imlib2_loaders-1.2.1.004.tar.gz Message-ID: <19449.1124910766@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2_loaders-1.2.1.004.tar.gz 554e93eefef26a00bc63aec15d0f913d imlib2_loaders-1.2.1.004.tar.gz Size: 309782 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 21:12:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: imlib2_loaders.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 19:12:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: imlib2_loaders.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/imlib2_loaders.spec diff -u SPECS/imlib2_loaders.spec:1.3 SPECS/imlib2_loaders.spec:1.4 --- SPECS/imlib2_loaders.spec:1.3 Tue Jul 12 21:08:41 2005 +++ SPECS/imlib2_loaders.spec Wed Aug 24 21:12:37 2005 @@ -2,20 +2,18 @@ Summary: Additional Loaders for Imlib2 Summary(pl): Dodatkowe biblioteki wczytuj?ce dla Imlib2 Name: imlib2_loaders -Version: 1.2.1.001 -%define _snap 20050704 -Release: 0.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: Mixed (BSD and GPL) Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: ff63cea4860ae7c085895ab452cac179 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 554e93eefef26a00bc63aec15d0f913d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: edb-devel +BuildRequires: edb-devel >= 1.0.5 BuildRequires: eet-devel -BuildRequires: imlib2-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool Requires: imlib2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,7 +29,7 @@ rozprowadzane bezpo?rednio z bibliotek? Imlib2. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -66,6 +64,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 19:12:37 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 + Revision 1.3 2005/07/12 19:08:41 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2_loaders.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Wed Aug 24 22:17:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: lkcp.spec - typo, pl summary In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 20:17:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, pl summary ---- Files affected: SPECS: lkcp.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.3 SPECS/lkcp.spec:1.4 --- SPECS/lkcp.spec:1.3 Wed Aug 24 20:29:34 2005 +++ SPECS/lkcp.spec Wed Aug 24 22:17:29 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Live Kernel Configuration Panel +Summary(pl): Live Kernel Configuration Panel - panel do konfiguracji j?dra w czasie pracy Name: lkcp Version: 0.5.3 Release: 1 @@ -20,7 +21,7 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +Live Kernel Configuration Panel (LKCP) to oparty na ncurses interfejs do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -53,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 20:17:29 qboosh +- typo, pl summary + Revision 1.3 2005/08/24 18:29:34 glen - disable "tset -Q -r", fixes build on my amd64 chroot under screen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Wed Aug 24 22:52:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: confdir.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 20:52:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: confdir.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/confdir.spec diff -u SPECS/confdir.spec:1.12 SPECS/confdir.spec:1.13 --- SPECS/confdir.spec:1.12 Wed Nov 10 14:32:59 2004 +++ SPECS/confdir.spec Wed Aug 24 22:51:57 2005 @@ -30,7 +30,7 @@ Summary: Header files for confdir library Summary(pl): Pliki nag??wkowe biblioteki confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description devel Header files for confdir library. @@ -42,7 +42,7 @@ Summary: Static confdir library Summary(pl): Biblioteka statyczna confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description static Static confdir library. @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 20:51:57 darekr +- strict deps + Revision 1.12 2004/11/10 13:32:59 paladine - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/confdir.spec?r1=1.12&r2=1.13&f=u From darekr at pld-linux.org Wed Aug 24 23:08:00 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: gpppkill.spec - cosmetics In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 21:08:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: gpppkill.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.17 SPECS/gpppkill.spec:1.18 --- SPECS/gpppkill.spec:1.17 Tue Aug 31 11:00:58 2004 +++ SPECS/gpppkill.spec Wed Aug 24 23:07:55 2005 @@ -14,8 +14,8 @@ Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba URL: http://www.pla.net.py/home/oliver/gpppkill/ -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Provides: gpppkill +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,16 +39,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -install -d ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin -%{__make} install DESTDIR=${RPM_BUILD_ROOT} +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README CHANGELOG +%doc CHANGELOG README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/24 21:07:55 darekr +- cosmetics + Revision 1.17 2004/08/31 09:00:58 snurf - typos / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Wed Aug 24 23:24:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: initng-initscripts-20050825.tar.bz2 Message-ID: <2600.1124918644@distfiles.pld-linux.org> Files fetched: 1 STORED: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-20050825.tar.bz2 8aee8e9866b90b2910d06027767a6a5a initng-initscripts-20050825.tar.bz2 Size: 6870 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 23:24:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: initng-pld.spec - 20050825 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 21:24:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 20050825 snap ---- Files affected: SPECS: initng-pld.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/initng-pld.spec diff -u SPECS/initng-pld.spec:1.4 SPECS/initng-pld.spec:1.5 --- SPECS/initng-pld.spec:1.4 Wed Aug 3 12:09:38 2005 +++ SPECS/initng-pld.spec Wed Aug 24 23:24:00 2005 @@ -3,12 +3,12 @@ Summary(pl): Skrypty inicjalizuj?ce initng dla PLD Name: initng-pld Version: 0.0.1 -%define _snap 20050803 +%define _snap 20050825 Release: 0.%{_snap}.1 License: GPL Group: Base Source0: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-%{_snap}.tar.bz2 -# Source0-md5: 17a08c9107517ef4ba034df472bbac4a +# Source0-md5: 8aee8e9866b90b2910d06027767a6a5a Requires: initng Requires: module-init-tools Requires: mount @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 21:24:00 glen +- 20050825 snap + Revision 1.4 2005/08/03 10:09:38 glen - fix md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng-pld.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 23:35:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: mkvtoolnix.spec - fixed help files, added -help.patch In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:35:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed help files, added -help.patch ---- Files affected: SPECS: mkvtoolnix.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.6 SPECS/mkvtoolnix.spec:1.7 --- SPECS/mkvtoolnix.spec:1.6 Wed Aug 24 02:00:08 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 23:35:42 2005 @@ -6,11 +6,12 @@ Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix Version: 1.5.5 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 # Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 +Patch0: %{name}-help.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -32,26 +33,34 @@ %prep %setup -q +%patch0 -p1 %build %{__sed} -i 's,wx-config,wx-gtk2-ansi-config,g' configure -%configure +%{__sed} -i 's,$INSTDIR,%{_datadir}/%{name},' src/mmg/mmg.cpp +%configure %{__make} %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# help files +install doc/*.h* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc +install doc/images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO doc/*.html doc/images/* +%doc AUTHORS ChangeLog README TODO %attr(755,root,root) %{_bindir}/* +%{_datadir}/%{name} %{_mandir}/man1/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -60,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 21:35:42 charles +- fixed help files, added -help.patch + Revision 1.6 2005/08/24 00:00:08 charles - updated to 1.5.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 23:36:58 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:19 2005 Subject: SOURCES: mkvtoolnix-help.patch (NEW) - fixed path to help files In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:36:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed path to help files ---- Files affected: SOURCES: mkvtoolnix-help.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mkvtoolnix-help.patch diff -u /dev/null SOURCES/mkvtoolnix-help.patch:1.1 --- /dev/null Wed Aug 24 23:36:58 2005 +++ SOURCES/mkvtoolnix-help.patch Wed Aug 24 23:36:53 2005 @@ -0,0 +1,10 @@ +--- mkvtoolnix-1.5.5/src/mmg/mmg.cpp.orig 2005-08-21 15:04:48.000000000 +0200 ++++ mkvtoolnix-1.5.5/src/mmg/mmg.cpp 2005-08-24 22:54:38.000000000 +0200 +@@ -2002,6 +2002,7 @@ + cfg = new wxConfig(wxT("mkvmergeGUI")); + wxConfigBase::Set(cfg); + cfg->SetPath(wxT("/GUI")); ++ cfg->Write(wxT("installation_path"), wxT("$INSTDIR")); + cfg->Read(wxT("last_directory"), &last_open_dir, wxT("")); + for (i = 0; i < 4; i++) { + k.Printf(wxT("last_settings %u"), i); ================================================================ From twittner at pld-linux.org Thu Aug 25 00:06:12 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:19 2005 Subject: SOURCES: cgdb-am_no_debug.patch (NEW) - don't force `-g' debug flag In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:06:12 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't force `-g' debug flag ---- Files affected: SOURCES: cgdb-am_no_debug.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-am_no_debug.patch diff -u /dev/null SOURCES/cgdb-am_no_debug.patch:1.1 --- /dev/null Thu Aug 25 00:06:12 2005 +++ SOURCES/cgdb-am_no_debug.patch Thu Aug 25 00:06:07 2005 @@ -0,0 +1,90 @@ +diff -Nur cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am 2005-08-24 23:58:38.751560968 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libkui.a +diff -Nur cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am 2005-08-24 23:58:38.758559904 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libwm.a +diff -Nur cgdb-0.5.3~/cgdb/src/Makefile.am cgdb-0.5.3/cgdb/src/Makefile.am +--- cgdb-0.5.3~/cgdb/src/Makefile.am 2005-08-03 04:24:11.000000000 +0200 ++++ cgdb-0.5.3/cgdb/src/Makefile.am 2005-08-24 23:58:38.761559448 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am +--- cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am 2005-08-24 23:58:38.740562640 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include \ ++AM_CFLAGS = -Wall -I$(srcdir)/../include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/util/include + +diff -Nur cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am +--- cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am 2005-08-24 23:58:38.715566440 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/rlctx/include \ +diff -Nur cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am +--- cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am 2005-08-24 23:58:38.722565376 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ +diff -Nur cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am +--- cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am 2005-08-03 04:24:15.000000000 +0200 ++++ cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am 2005-08-24 23:58:38.730564160 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/various/adt/src/Makefile.am cgdb-0.5.3/various/adt/src/Makefile.am +--- cgdb-0.5.3~/various/adt/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/various/adt/src/Makefile.am 2005-08-24 23:58:38.690570240 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include + + noinst_LIBRARIES = libadt.a + +diff -Nur cgdb-0.5.3~/various/rlctx/src/Makefile.am cgdb-0.5.3/various/rlctx/src/Makefile.am +--- cgdb-0.5.3~/various/rlctx/src/Makefile.am 2005-08-03 04:24:16.000000000 +0200 ++++ cgdb-0.5.3/various/rlctx/src/Makefile.am 2005-08-24 23:58:38.698569024 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(srcdir)/../include +diff -Nur cgdb-0.5.3~/various/util/src/Makefile.am cgdb-0.5.3/various/util/src/Makefile.am +--- cgdb-0.5.3~/various/util/src/Makefile.am 2004-09-08 21:41:44.000000000 +0200 ++++ cgdb-0.5.3/various/util/src/Makefile.am 2005-08-24 23:58:38.669573432 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(srcdir)/../include + noinst_LIBRARIES = libutil.a + + libutil_a_SOURCES = \ ================================================================ From twittner at pld-linux.org Thu Aug 25 00:07:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:19 2005 Subject: SOURCES: cgdb-missing_includes.patch (NEW) - add missing #include ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:07:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add missing #include (it appears after am/ac regeneration) ---- Files affected: SOURCES: cgdb-missing_includes.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-missing_includes.patch diff -u /dev/null SOURCES/cgdb-missing_includes.patch:1.1 --- /dev/null Thu Aug 25 00:07:49 2005 +++ SOURCES/cgdb-missing_includes.patch Thu Aug 25 00:07:44 2005 @@ -0,0 +1,13 @@ +--- cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c~ 2005-08-24 23:39:47.693507928 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c 2005-08-24 23:48:35.060335984 +0200 +@@ -14,6 +14,10 @@ + #include /* for getenv */ + #endif /* HAVE_STDLIB_H */ + ++#if HAVE_STDIO_H ++#include ++#endif /* HAVE_STDIO_H */ ++ + /* term.h prototypes */ + extern int tgetent(); + extern int tgetflag(); ================================================================ From cvs at pld-linux.org Thu Aug 25 00:08:14 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 09:39:19 2005 Subject: rc-scripts/trunk/rc.d/init.d: cpusets functions Message-ID: <6333@svn.pld-linux.org> Author: arekm Date: Thu Aug 25 00:08:11 2005 New Revision: 6333 Modified: rc-scripts/trunk/rc.d/init.d/cpusets rc-scripts/trunk/rc.d/init.d/functions Log: Fix is_yes in cpuset stuff. Quote file paths when doing echo > something. Modified: rc-scripts/trunk/rc.d/init.d/cpusets ============================================================================== --- rc-scripts/trunk/rc.d/init.d/cpusets (original) +++ rc-scripts/trunk/rc.d/init.d/cpusets Thu Aug 25 00:08:11 2005 @@ -18,7 +18,7 @@ # Source function library. . /etc/rc.d/init.d/functions -if is_yes ${CPUSETS} ; then +if is_yes "${CPUSETS}" ; then if ! grep -q "/dev/cpuset" /proc/mounts ; then nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 fi Modified: rc-scripts/trunk/rc.d/init.d/functions ============================================================================== --- rc-scripts/trunk/rc.d/init.d/functions (original) +++ rc-scripts/trunk/rc.d/init.d/functions Thu Aug 25 00:08:11 2005 @@ -498,7 +498,7 @@ # And start it up. busy cd / - is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks + is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then if [ -n "$waitname" -a -n "$waittime" ]; then # Save basename. @@ -690,8 +690,8 @@ if [ "$pid" != "" ]; then cpuset_msg="..." - if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then - if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then + if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then + if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") else cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") @@ -706,8 +706,8 @@ # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` # if [ "$pid" != "" ]; then # cpuset_msg="..." -# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then -# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then +# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then +# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") # else # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") From twittner at pld-linux.org Thu Aug 25 00:13:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: cgdb.spec - get rid of debug flag (-g) during normal build ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:13:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - get rid of debug flag (-g) during normal build (-am_no_debug.patch) - added missing #include (build failed after am/ac regeneration, -missing_includes.patch - regenerate am/ac (CPPFLAGS hack is still needed) - rel. 2 ---- Files affected: SPECS: cgdb.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.12 SPECS/cgdb.spec:1.13 --- SPECS/cgdb.spec:1.12 Wed Aug 24 19:37:24 2005 +++ SPECS/cgdb.spec Thu Aug 25 00:13:11 2005 @@ -3,13 +3,16 @@ Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb Version: 0.5.3 -Release: 1 +Release: 2 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz # Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch +Patch1: %{name}-missing_includes.patch +Patch2: %{name}-am_no_debug.patch URL: http://cgdb.sourceforge.net/ +BuildRequires: autoconf BuildRequires: automake BuildRequires: readline-devel Requires: gdb @@ -35,10 +38,16 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -CPPFLAGS="-I/usr/include/ncurses" -cp -f /usr/share/automake/config.sub config +CPPFLAGS=" -I/usr/include/ncurses " +%{__aclocal} -I config +%{__autoconf} +%{__autoheader} +%{__automake} + %configure %{__make} @@ -65,6 +74,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 22:13:11 twittner +- get rid of debug flag (-g) during normal build (-am_no_debug.patch) +- added missing #include (build failed after am/ac regeneration, + -missing_includes.patch +- regenerate am/ac (CPPFLAGS hack is still needed) +- rel. 2 + Revision 1.12 2005/08/24 17:37:24 adamg - updated to 0.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Thu Aug 25 00:30:07 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: syslinux.spec - 3.10 In-Reply-To: References: Message-ID: Author: areq Date: Wed Aug 24 22:30:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.10 ---- Files affected: SPECS: syslinux.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: SPECS/syslinux.spec diff -u SPECS/syslinux.spec:1.65 SPECS/syslinux.spec:1.66 --- SPECS/syslinux.spec:1.65 Fri Jul 8 09:52:11 2005 +++ SPECS/syslinux.spec Thu Aug 25 00:30:01 2005 @@ -4,12 +4,12 @@ Summary(pt_BR): Carregador de boot simples Summary(zh_CN): Linux???????????????????? Name: syslinux -Version: 3.09 +Version: 3.10 Release: 1 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 -# Source0-md5: dd403b15ef18bb0e5d78d3f552f822a5 +# Source0-md5: 777d868eef7619ce971bfbc0c3ad4245 URL: http://syslinux.zytor.com/ BuildRequires: perl-base BuildRequires: nasm @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66 2005/08/24 22:30:01 areq +- 3.10 + Revision 1.65 2005/07/08 07:52:11 arekm - add all readme files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslinux.spec?r1=1.65&r2=1.66&f=u From areq at pld-linux.org Thu Aug 25 00:30:13 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: syslinux-3.10.tar.bz2 Message-ID: <2652.1124922613@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.10.tar.bz2 777d868eef7619ce971bfbc0c3ad4245 syslinux-3.10.tar.bz2 Size: 1245565 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 00:50:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: gnome-icons-graphite.spec - updated to 1.2 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 22:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2 ---- Files affected: SPECS: gnome-icons-graphite.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-graphite.spec diff -u SPECS/gnome-icons-graphite.spec:1.2 SPECS/gnome-icons-graphite.spec:1.3 --- SPECS/gnome-icons-graphite.spec:1.2 Thu Jul 28 14:41:30 2005 +++ SPECS/gnome-icons-graphite.spec Thu Aug 25 00:50:16 2005 @@ -4,12 +4,12 @@ Summary: Graphite GNOME Icons Summary(pl): Zestaw ikonek graphite dla GNOME Name: gnome-icons-graphite -Version: 1.1 +Version: 1.2 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/graphite/%{realname}-%{version}.tar.bz2 -# Source0-md5: 6348f0acd4ba04bf6c02cfe39cfdbbea +# Source0-md5: 7ab77bcce941fcf0f09f19d56d93811f URL: http://gnome-look.org/content/show.php?content=26757 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 22:50:16 paladine +- updated to 1.2 + Revision 1.2 2005/07/28 12:41:30 freetz - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-graphite.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 00:51:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: graphite-1.2.tar.bz2 Message-ID: <11493.1124923865@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/graphite/graphite-1.2.tar.bz2 7ab77bcce941fcf0f09f19d56d93811f graphite-1.2.tar.bz2 Size: 3861068 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: eGroupWare-1.0.0.009.tar.bz2 Message-ID: <5986.1124924655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/egroupware/eGroupWare-1.0.0.009.tar.bz2 2ed2f3041ab4ff235f56ed23dfa7274b eGroupWare-1.0.0.009.tar.bz2 Size: 11042609 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: egroupware.spec - 1.0.0.009, security fixes In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 23:04:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.0.0.009, security fixes ---- Files affected: SPECS: egroupware.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.2 SPECS/egroupware.spec:1.3 --- SPECS/egroupware.spec:1.2 Thu Jul 21 19:23:32 2005 +++ SPECS/egroupware.spec Thu Aug 25 01:04:00 2005 @@ -5,14 +5,13 @@ Summary: eGroupWare - a web-based groupware suite written in PHP Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware -Version: 1.0.0.008 -%define _rel 2 -Release: 0.%{_rel}.1 +Version: 1.0.0.009 +Release: 0.1 Epoch: 0 License: GPL Group: Applications/WWW -Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}-%{_rel}.tar.bz2 -# Source0-md5: 30984ed46fa064632a3f3a1137786cbd +Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 +# Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 BuildArch: noarch @@ -70,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 23:04:00 glen +- 1.0.0.009, security fixes + Revision 1.2 2005/07/21 17:23:32 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 01:10:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: gnome-icons-gperfection2.spec - updated to 2.3 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 23:10:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3 ---- Files affected: SPECS: gnome-icons-gperfection2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-gperfection2.spec diff -u SPECS/gnome-icons-gperfection2.spec:1.9 SPECS/gnome-icons-gperfection2.spec:1.10 --- SPECS/gnome-icons-gperfection2.spec:1.9 Fri Jul 29 14:33:00 2005 +++ SPECS/gnome-icons-gperfection2.spec Thu Aug 25 01:10:11 2005 @@ -5,12 +5,12 @@ Summary: Gperfection2 GNOME Icons Summary(pl): Zestaw ikonek Gperfection2 dla GNOME Name: gnome-icons-gperfection2 -Version: 2.1 +Version: 2.3 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/%{realname}-%{version}.tar.bz2 -# Source0-md5: 75677c02d32c35be0fbbc653d217a966 +# Source0-md5: d986acad9835c14e5c6bcbd4e1119f62 URL: http://gnome-look.org/content/show.php?content=22989 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/24 23:10:11 paladine +- updated to 2.3 + Revision 1.9 2005/07/29 12:33:00 freetz - 2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-gperfection2.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Thu Aug 25 01:11:19 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: gperfection2-2.3.tar.bz2 Message-ID: <8378.1124925079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/gperfection2-2.3.tar.bz2 d986acad9835c14e5c6bcbd4e1119f62 gperfection2-2.3.tar.bz2 Size: 3889073 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Thu Aug 25 03:51:33 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: egroupware.spec - add R In-Reply-To: References: Message-ID: Author: wolvverine Date: Thu Aug 25 01:51:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add R ---- Files affected: SPECS: egroupware.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.3 SPECS/egroupware.spec:1.4 --- SPECS/egroupware.spec:1.3 Thu Aug 25 01:04:00 2005 +++ SPECS/egroupware.spec Thu Aug 25 03:51:28 2005 @@ -14,6 +14,11 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 +Requires: php-mysql +Requires: php-pgsql +Requires: php-pcre +Requires: php-gd +Requires: php-mbstring BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 01:51:28 wolvverine +- add R + Revision 1.3 2005/08/24 23:04:00 glen - 1.0.0.009, security fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Thu Aug 25 06:55:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: gpppkill.spec - fixed build, use optflags In-Reply-To: References: Message-ID: Author: qboosh Date: Thu Aug 25 04:55:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed build, use optflags ---- Files affected: SPECS: gpppkill.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.18 SPECS/gpppkill.spec:1.19 --- SPECS/gpppkill.spec:1.18 Wed Aug 24 23:07:55 2005 +++ SPECS/gpppkill.spec Thu Aug 25 06:55:11 2005 @@ -8,16 +8,16 @@ License: GPL Vendor: The gpppkill Team Group: X11/Applications/Networking -Patch0: %{name}-warning.patch # Native URL is http: only, but we prefer ftp: # Source0: http://www.pla.net.py/home/oliver/gpppkill/archive/%{name}-%{version}.tar.gz Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba +Patch0: %{name}-warning.patch URL: http://www.pla.net.py/home/oliver/gpppkill/ -Provides: gpppkill +BuildRequires: gtk+-devel +BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - %description gpppkill is a X11 program for Linux that finishes the ppp connection if it not receive a minimal amount of bytes during certain time. It @@ -27,7 +27,7 @@ %description -l pl gpppkill to program dla X, kt?ry ko?czy po??czenie ppp je?li w danym okresie czasu nie otrzyma minimalnej ilo?ci bajt?w. Ukazuje on r?wnie? -ruch ppp w formie grafu. Konfiguruje si? go za pomoc? GUI. Wykrywa +ruch ppp w formie wykresu. Konfiguruje si? go za pomoc? GUI. Wykrywa wszystkie pppd i pyta, kt?rego u?y?. %prep @@ -35,21 +35,22 @@ %patch0 -p1 %build -%{__make} +%{__make} \ + CC="%{__cxx}" \ + CFLAGS="%{rpmcxxflags} -Wall -Wno-unused -Wno-deprecated -fpermissive -DGTK_DISABLE_COMPAT_H" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -d $RPM_BUILD_ROOT%{_bindir} -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT +install gpppkill $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGELOG README +%doc CHANGELOG CONTRIBUTORS README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 04:55:11 qboosh +- fixed build, use optflags + Revision 1.18 2005/08/24 21:07:55 darekr - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.18&r2=1.19&f=u From aredridel at pld-linux.org Thu Aug 25 07:34:05 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:19 2005 Subject: DISTFILES: logjam-4.5.1.tar.bz2 Message-ID: <11975.1124948045@distfiles.pld-linux.org> Files fetched: 1 STORED: http://neugierig.org/software/logjam/download/logjam-4.5.1.tar.bz2 ccae70dc36644cd1529c581443484ebe logjam-4.5.1.tar.bz2 Size: 748283 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Thu Aug 25 07:34:01 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: logjam.spec - up to 4.5.1 In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 05:34:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.5.1 ---- Files affected: SPECS: logjam.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/logjam.spec diff -u SPECS/logjam.spec:1.19 SPECS/logjam.spec:1.20 --- SPECS/logjam.spec:1.19 Wed Jun 8 16:40:34 2005 +++ SPECS/logjam.spec Thu Aug 25 07:33:56 2005 @@ -2,14 +2,13 @@ Summary: The GTK+2-client for LiveJournal Summary(pl): Oparty na GTK+2 klient do LiveJournala Name: logjam -Version: 4.4.1 -Release: 3 +Version: 4.5.1 +Release: 1 License: GPL Group: X11/Applications -Source0: http://logjam.danga.com/download/%{name}-%{version}.tar.bz2 -# Source0-md5: f16f68a4a6b15fb5bb650614f3ff081c +Source0: http://neugierig.org/software/logjam/download/%{name}-%{version}.tar.bz2 +# Source0-md5: ccae70dc36644cd1529c581443484ebe Source1: %{name}.desktop -Patch0: %{name}-sync-url.patch Patch1: %{name}-locale_names.patch URL: http://logjam.danga.com/ BuildRequires: automake @@ -21,6 +20,7 @@ BuildRequires: intltool BuildRequires: librsvg-devel >= 2.2.3 BuildRequires: libxml2-devel >= 2.0 +BuildRequires: sqlite3-devel BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -34,7 +34,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 mv -f po/{uk_UA,uk}.po mv -f po/{ru_RU,ru}.po @@ -43,7 +42,8 @@ %build cp -f /usr/share/automake/config.sub . %configure \ - --with-xmms=runtime + --with-xmms=runtime \ + --with-sqlite3 %{__make} %install @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/25 05:33:56 aredridel +- up to 4.5.1 + Revision 1.19 2005/06/08 14:40:34 zbyniu - BR: pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/logjam.spec?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Thu Aug 25 08:09:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: apache.spec - todo security In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 06:09:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - todo security ---- Files affected: SPECS: apache.spec (1.403 -> 1.404) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.403 SPECS/apache.spec:1.404 --- SPECS/apache.spec:1.403 Sun Jul 10 01:41:05 2005 +++ SPECS/apache.spec Thu Aug 25 08:09:20 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ # TODO: +# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -1828,6 +1829,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.404 2005/08/25 06:09:20 glen +- todo security + Revision 1.403 2005/07/09 23:41:05 glen - rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.403&r2=1.404&f=u From arekm at pld-linux.org Thu Aug 25 08:14:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:19 2005 Subject: SPECS: rc-scripts.spec - rel 2; fix cpuset parts In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:14:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; fix cpuset parts ---- Files affected: SPECS: rc-scripts.spec (1.197 -> 1.198) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.197 SPECS/rc-scripts.spec:1.198 --- SPECS/rc-scripts.spec:1.197 Tue Aug 23 19:55:17 2005 +++ SPECS/rc-scripts.spec Thu Aug 25 08:14:53 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 1 +Release: 2 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -19,6 +19,7 @@ # Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch +Patch2: %{name}-cpuset.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -99,6 +100,7 @@ %ifarch sparc sparc64 %patch1 -p1 %endif +%patch2 -p0 %build %{__aclocal} @@ -305,6 +307,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.198 2005/08/25 06:14:53 arekm +- rel 2; fix cpuset parts + Revision 1.197 2005/08/23 17:55:17 baggins - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.197&r2=1.198&f=u From arekm at pld-linux.org Thu Aug 25 08:15:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: rc-scripts-cpuset.patch (NEW) - new; cpuset fixes In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:15:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new; cpuset fixes ---- Files affected: SOURCES: rc-scripts-cpuset.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-cpuset.patch diff -u /dev/null SOURCES/rc-scripts-cpuset.patch:1.1 --- /dev/null Thu Aug 25 08:15:14 2005 +++ SOURCES/rc-scripts-cpuset.patch Thu Aug 25 08:15:09 2005 @@ -0,0 +1,48 @@ +Index: rc.d/init.d/cpusets +=================================================================== +--- rc.d/init.d/cpusets (wersja 6332) ++++ rc.d/init.d/cpusets (kopia robocza) +@@ -18,7 +18,7 @@ + # Source function library. + . /etc/rc.d/init.d/functions + +-if is_yes ${CPUSETS} ; then ++if is_yes "${CPUSETS}" ; then + if ! grep -q "/dev/cpuset" /proc/mounts ; then + nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 + fi +Index: rc.d/init.d/functions +=================================================================== +--- rc.d/init.d/functions (wersja 6332) ++++ rc.d/init.d/functions (kopia robocza) +@@ -498,7 +498,7 @@ + # And start it up. + busy + cd / +- is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks ++ is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" + if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then + if [ -n "$waitname" -a -n "$waittime" ]; then + # Save basename. +@@ -690,8 +690,8 @@ + + if [ "$pid" != "" ]; then + cpuset_msg="..." +- if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +- if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++ if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++ if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + else + cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") +@@ -706,8 +706,8 @@ + # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` + # if [ "$pid" != "" ]; then + # cpuset_msg="..." +-# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +-# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + # else + # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:39:55 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: lighttpd-openssl.patch (NEW) - fixes infinite loop on slo... In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:39:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes infinite loop on slow connection over SSL ---- Files affected: SOURCES: lighttpd-openssl.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-openssl.patch diff -u /dev/null SOURCES/lighttpd-openssl.patch:1.1 --- /dev/null Thu Aug 25 08:39:54 2005 +++ SOURCES/lighttpd-openssl.patch Thu Aug 25 08:39:49 2005 @@ -0,0 +1,67 @@ +--- branches/lighttpd-merge-1.4.x/src/connections.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/connections.c (revision 621) +@@ -213,7 +213,7 @@ + + #ifdef USE_OPENSSL + if (srv_sock->is_ssl) { +- int r; ++ int r, ssl_err; + + switch ((r = SSL_get_error(con->ssl, len))) { + case SSL_ERROR_WANT_READ: +@@ -237,8 +237,15 @@ + + /* fall thourgh */ + default: +- log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", +- r, ERR_error_string(ERR_get_error(), NULL)); ++ ssl_err = ERR_get_error(); ++ switch(ssl_err) { ++ case SSL_F_SSL23_GET_CLIENT_HELLO: ++ /* a unencrypted HTTP request on a HTTPS socket. Do a redirect to the right location */ ++ default: ++ log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", ++ r, ERR_error_string(ERR_get_error(), NULL)); ++ break; ++ } + break; + } + } else { +--- branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 621) +@@ -357,7 +357,7 @@ + + if (-1 == mkdir(p->b->ptr, 0700)) { + if (errno != EEXIST) { +- log_error_write(srv, __FILE__, __LINE__, "ssss", "creating cache-directory", p->b->ptr, "failed", strerror(errno)); ++ log_error_write(srv, __FILE__, __LINE__, "sbss", "creating cache-directory", p->b, "failed", strerror(errno)); + + return -1; + } +--- branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 621) +@@ -123,6 +123,7 @@ + size_t toSend; + stat_cache_entry *sce = NULL; + int ifd; ++ int write_wait = 0; + + if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->data.file.name, &sce)) { + log_error_write(srv, __FILE__, __LINE__, "sb", +@@ -162,6 +163,7 @@ + if ((r = SSL_write(con->ssl, s, toSend)) <= 0) { + switch ((ssl_r = SSL_get_error(con->ssl, r))) { + case SSL_ERROR_WANT_WRITE: ++ write_wait = 1; + break; + case SSL_ERROR_SYSCALL: + switch(errno) { +@@ -196,7 +198,7 @@ + if (c->offset == c->data.file.length) { + chunk_finished = 1; + } +- } while(!chunk_finished); ++ } while(!chunk_finished && !write_wait); + + break; + } ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:40:38 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: lighttpd.spec - add openssl fix (Changeset 621) In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:40:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add openssl fix (Changeset 621) ---- Files affected: SPECS: lighttpd.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.122 SPECS/lighttpd.spec:1.123 --- SPECS/lighttpd.spec:1.122 Mon Aug 22 17:18:39 2005 +++ SPECS/lighttpd.spec Thu Aug 25 08:40:33 2005 @@ -57,6 +57,7 @@ Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch Patch3: %{name}-lua-pkgconfig.patch +Patch4: %{name}-openssl.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -199,6 +200,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p2 %build %{__libtoolize} @@ -350,6 +352,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/25 06:40:33 aredridel +- add openssl fix (Changeset 621) + Revision 1.122 2005/08/22 15:18:39 glen - add pkgconfig support for locating lua libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.122&r2=1.123&f=u From glen at pld-linux.org Thu Aug 25 09:11:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: egroupware.conf (NEW) - getting started In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:11:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - getting started ---- Files affected: SOURCES: egroupware.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u /dev/null SOURCES/egroupware.conf:1.1 --- /dev/null Thu Aug 25 09:11:21 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:11:16 2005 @@ -0,0 +1,8 @@ +# vim:syn=apache + +Alias /egroupware /usr/share/egroupware + + php_value memory_limit 16M + + +# vim: filetype=apache ts=4 sw=4 et ================================================================ From glen at pld-linux.org Thu Aug 25 09:27:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: egroupware.conf - need mbstring.func_overload In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:27:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - need mbstring.func_overload ---- Files affected: SOURCES: egroupware.conf (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u SOURCES/egroupware.conf:1.1 SOURCES/egroupware.conf:1.2 --- SOURCES/egroupware.conf:1.1 Thu Aug 25 09:11:16 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:27:53 2005 @@ -3,6 +3,7 @@ Alias /egroupware /usr/share/egroupware php_value memory_limit 16M + php_value mbstring.func_overload 7 # vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/egroupware.conf?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 09:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: egroupware.spec - added apache config In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:28:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added apache config ---- Files affected: SPECS: egroupware.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.4 SPECS/egroupware.spec:1.5 --- SPECS/egroupware.spec:1.4 Thu Aug 25 03:51:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 09:28:25 2005 @@ -6,16 +6,18 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.1 +Release: 0.4 Epoch: 0 License: GPL Group: Applications/WWW Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b +Source1: %{name}.conf URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 Requires: php-mysql Requires: php-pgsql +#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -23,6 +25,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _appdir %{_datadir}/%{name} +%define _sysconfdir /etc/%{name} %description eGroupWare is a multi-user, web-based groupware suite developed on a @@ -51,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_appdir} +install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}} cp -a *.php $RPM_BUILD_ROOT%{_appdir} cp -a addressbook admin backup bookmarks calendar comic developer_tools \ @@ -60,11 +63,27 @@ phpsysinfo polls preferences projects registration setup sitemgr stocks tts \ wiki $RPM_BUILD_ROOT%{_appdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf + %clean rm -rf $RPM_BUILD_ROOT +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %files %defattr(644,root,root,755) +%attr(710,root,http) %dir %{_sysconfdir} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* %{_appdir} @@ -74,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 07:28:25 glen +- added apache config + Revision 1.4 2005/08/25 01:51:28 wolvverine - add R ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.4&r2=1.5&f=u From aflinta at pld-linux.org Thu Aug 25 10:05:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: cairo.spec - avoid to link with external libpixman, rel 3. In-Reply-To: References: Message-ID: Author: aflinta Date: Thu Aug 25 08:05:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - avoid to link with external libpixman, rel 3. ---- Files affected: SPECS: cairo.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.32 SPECS/cairo.spec:1.33 --- SPECS/cairo.spec:1.32 Wed Aug 17 19:19:41 2005 +++ SPECS/cairo.spec Thu Aug 25 10:04:57 2005 @@ -3,21 +3,20 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 0.9.2 -Release: 2 +Release: 3 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz # Source0-md5: 992095a5db597384a89b41e93737105d Patch0: %{name}-bug4110.patch URL: http://cairographics.org/ +BuildConflicts: libpixman-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.1.0 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 -# libpixman incorporated (explanation in NEWS) -#BuildRequires: libpixman-devel >= 0.1.6 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -26,7 +25,6 @@ BuildRequires: zlib-devel Requires: freetype >= 2.1.0 Requires: glitz >= 0.4.4 -#Requires: libpixman >= 0.1.6 Requires: xrender >= 0.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,9 +76,9 @@ Requires: fontconfig-devel Requires: freetype-devel >= 2.1.0 Requires: glitz-devel >= 0.4.4 -#Requires: libpixman-devel >= 0.1.6 Requires: libpng-devel Requires: xrender-devel >= 0.6 +Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -151,6 +149,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/25 08:04:57 aflinta +- avoid to link with external libpixman, rel 3. + Revision 1.32 2005/08/17 17:19:41 paladine - added bug4110 patch (thx freetz) - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.32&r2=1.33&f=u From adamg at pld-linux.org Thu Aug 25 10:05:46 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: APC-3.0.8.tgz Message-ID: <27796.1124957146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/APC-3.0.8.tgz a70a14a00275e551e8085f742322433f APC-3.0.8.tgz Size: 75541 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 10:05:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: php-pecl-APC.spec, php4-pecl-APC.spec - updated to 3.0.8 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 08:05:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.8 ---- Files affected: SPECS: php-pecl-APC.spec (1.8 -> 1.9) , php4-pecl-APC.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-APC.spec diff -u SPECS/php-pecl-APC.spec:1.8 SPECS/php-pecl-APC.spec:1.9 --- SPECS/php-pecl-APC.spec:1.8 Sun Aug 21 20:54:41 2005 +++ SPECS/php-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php-devel @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.8 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.3 SPECS/php4-pecl-APC.spec:1.4 --- SPECS/php4-pecl-APC.spec:1.3 Sun Aug 21 20:54:41 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.3 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-APC.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 10:22:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: template-php4-pecl.spec (NEW) - copy of template-php-pecl.spec In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:22:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy of template-php-pecl.spec ---- Files affected: SPECS: template-php4-pecl.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u /dev/null SPECS/template-php4-pecl.spec:1.1 --- /dev/null Thu Aug 25 10:22:30 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:22:25 2005 @@ -0,0 +1,100 @@ +# $Revision$, $Date$ +%define _modname - +%define _status - + +Summary: %{_modname} - +Summary(pl): %{_modname} - +Name: php-pecl-%{_modname} +Version: 1.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +URL: http://pecl.php.net/package/Modname/ +BuildRequires: libtool +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description + +In PECL status of this extension is: %{_status}. + +%description -l pl + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 08:22:25 glen +- copy of template-php-pecl.spec + +Revision 1.10 2004/08/07 17:47:11 adamg +- ok, let's force php5 for pecl extensions + +Revision 1.9 2004/05/30 16:13:15 adamg +- fixed english information about status of the package; cosmetics + +Revision 1.8 2003/10/21 11:17:28 adamg +- added default doc files + +Revision 1.7 2003/10/15 17:37:05 adamg +- it finally happened - PECL separated from PEAR and moved to its own + repository, thus changes in urls (s/pear/pecl/) + +Revision 1.6 2003/10/07 20:50:01 adamg +- do not use macros in URL + +Revision 1.5 2003/08/31 20:49:12 adamg +- more specific URL + +Revision 1.4 2003/08/18 08:09:35 gotar +- mass commit: cosmetics (removed trailing white spaces) + +Revision 1.3 2003/06/12 12:31:48 qboosh +- cosmetics + +Revision 1.2 2003/06/11 23:09:37 adamg +- fixed package status information + +Revision 1.1 2003/06/11 17:18:49 adamg +- initial import of PECL template ================================================================ From paladine at pld-linux.org Thu Aug 25 10:25:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: gnome-keyring-manager-desktop.patch - updated for 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:25:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: gnome-keyring-manager-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gnome-keyring-manager-desktop.patch diff -u SOURCES/gnome-keyring-manager-desktop.patch:1.1 SOURCES/gnome-keyring-manager-desktop.patch:1.2 --- SOURCES/gnome-keyring-manager-desktop.patch:1.1 Wed Nov 17 13:37:44 2004 +++ SOURCES/gnome-keyring-manager-desktop.patch Thu Aug 25 10:25:27 2005 @@ -1,6 +1,6 @@ -diff -urN gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in ---- gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:07.517253736 +0100 -+++ gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:32.275489912 +0100 +diff -urN gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in +--- gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in 2005-03-25 16:41:46.000000000 +0100 ++++ gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in 2005-08-24 21:16:15.760210344 +0200 @@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Product=gnome-keyring-manager X-GNOME-Bugzilla-Component=general ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-keyring-manager-desktop.patch?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Thu Aug 25 10:26:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: gnome-keyring-manager-2.11.92.tar.bz2 Message-ID: <7395.1124958366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/gnome-keyring-manager-2.11.92.tar.bz2 73ad2540e61970442f880eb24b595d74 gnome-keyring-manager-2.11.92.tar.bz2 Size: 386900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:26:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: gnome-keyring-manager.spec - updated to 2.11.92 - gnome-doc... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:26:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.11.92 - gnome-doc-utils for omf files - sorted %%files ---- Files affected: SPECS: gnome-keyring-manager.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.7 SPECS/gnome-keyring-manager.spec:1.8 --- SPECS/gnome-keyring-manager.spec:1.7 Mon Apr 25 11:47:57 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 10:26:02 2005 @@ -2,23 +2,24 @@ Summary: Keyring manager for GNOME Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager -Version: 0.0.4 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/0.0/%{name}-%{version}.tar.bz2 -# Source0-md5: 6c44751e9d5fa25559a751fc9751606f +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 73ad2540e61970442f880eb24b595d74 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.8.1 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-keyring-devel >= 0.4.1 -BuildRequires: gtk+2-devel >= 2:2.4.4 +BuildRequires: gtk+2-devel >= 2:2.6.0 BuildRequires: intltool >= 0.23 BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: gtk+2 >= 2:2.4.4 +Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,8 +34,11 @@ %patch0 -p1 %build +gnome-doc-prepare --copy --force +%{__gnome_doc_common} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} %install @@ -46,7 +50,7 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no -%find_lang %{name} +%find_lang %{name} --with-gnome %clean rm -rf $RPM_BUILD_ROOT @@ -61,8 +65,9 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/* %{_desktopdir}/* +%{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 08:26:02 paladine +- updated to 2.11.92 +- gnome-doc-utils for omf files +- sorted %%files + Revision 1.7 2005/04/25 09:47:57 paladine - new style macros - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Thu Aug 25 10:26:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: template-php4-pecl.spec - use confdir based php In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:26:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir based php ---- Files affected: SPECS: template-php4-pecl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.1 SPECS/template-php4-pecl.spec:1.2 --- SPECS/template-php4-pecl.spec:1.1 Thu Aug 25 10:22:25 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:26:49 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php4 Summary: %{_modname} - Summary(pl): %{_modname} - @@ -12,13 +13,13 @@ Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool -BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +BuildRequires: php4-devel +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -42,21 +43,29 @@ install -d $RPM_BUILD_ROOT%{extensionsdir} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/25 08:26:49 glen +- use confdir based php + Revision 1.1 2005/08/25 08:22:25 glen - copy of template-php-pecl.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 10:31:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: template-php4-pecl.spec - typo, merge installs In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:31:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, merge installs ---- Files affected: SPECS: template-php4-pecl.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.2 SPECS/template-php4-pecl.spec:1.3 --- SPECS/template-php4-pecl.spec:1.2 Thu Aug 25 10:26:49 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:31:34 2005 @@ -40,11 +40,10 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini ; Enable %{_modname} extension module extension=%{_modname}.so EOF @@ -74,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 08:31:34 glen +- typo, merge installs + Revision 1.2 2005/08/25 08:26:49 glen - use confdir based php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Thu Aug 25 10:37:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: php4-pecl-APC.spec - use confdir php, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:37:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir php, rel 2 ---- Files affected: SPECS: php4-pecl-APC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.4 SPECS/php4-pecl-APC.spec:1.5 --- SPECS/php4-pecl-APC.spec:1.4 Thu Aug 25 10:05:42 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:36:56 2005 @@ -1,12 +1,13 @@ # $Revision$, $Date$ %define _modname APC %define _status stable +%define _sysconfdir /etc/php4 Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} Version: 3.0.8 -Release: 1 +Release: 2 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz @@ -14,12 +15,11 @@ URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description APC is the Alternative PHP Cache. It was conceived of to provide a @@ -46,24 +46,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/apc.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CHANGELOG,INSTALL,NOTICE} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -72,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 08:36:56 glen +- use confdir php, rel 2 + Revision 1.4 2005/08/25 08:05:42 adamg - updated to 3.0.8 @@ -83,4 +93,3 @@ Revision 1.1 2005/07/27 11:09:41 adamg - new (cp from php-pecl-APC.spec) - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Thu Aug 25 10:37:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: yelp-2.11.92.tar.bz2 Message-ID: <14578.1124959047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/yelp-2.11.92.tar.bz2 0458ead502d20d69ec96397da792f285 yelp-2.11.92.tar.bz2 Size: 649041 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:37:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): yelp.spec - updated to 2.11.92 - use style macros -... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:37:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - use style macros - sorted %%files ---- Files affected: SPECS: yelp.spec (1.66.2.10 -> 1.66.2.11) ---- Diffs: ================================================================ Index: SPECS/yelp.spec diff -u SPECS/yelp.spec:1.66.2.10 SPECS/yelp.spec:1.66.2.11 --- SPECS/yelp.spec:1.66.2.10 Thu Aug 18 14:24:16 2005 +++ SPECS/yelp.spec Thu Aug 25 10:37:22 2005 @@ -11,12 +11,12 @@ Summary: A system documentation reader from the GNOME project Summary(pl): Czytnik dokumentacji z projektu GNOME Name: yelp -Version: 2.11.1 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: f133a46fb20eb4733e5d5078a7c93ece +# Source0-md5: 0458ead502d20d69ec96397da792f285 Patch0: %{name}-desktop-categories.patch Patch1: %{name}-MOZILLA_HOME.patch URL: http://www.gnome.org/ @@ -40,9 +40,9 @@ %endif BuildRequires: pkgconfig >= 1:0.15.0 BuildRequires: popt-devel -BuildRequires: rpm-build >= 4.1-10 +BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: zlib-devel -Requires(post): GConf2 +Requires(post,preun): GConf2 Requires: docbook-style-xsl >= 1.55.0 Requires: gnome-doc-utils >= 0.3.1 Requires: gnome-vfs2 >= 2.11.0 @@ -93,17 +93,20 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install +%gconf_schema_install yelp.schemas + +%preun +%gconf_schema_uninstall yelp.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc README ChangeLog NEWS TODO AUTHORS %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/%{name} -%{_libdir}/bonobo/servers/* -%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png %{_desktopdir}/* +%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png +%{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/yelp.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -111,6 +114,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.11 2005/08/25 08:37:22 paladine +- updated to 2.11.92 +- use style macros +- sorted %%files + Revision 1.66.2.10 2005/08/18 12:24:16 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/yelp.spec?r1=1.66.2.10&r2=1.66.2.11&f=u From adamg at pld-linux.org Thu Aug 25 11:08:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: apache.spec - fix for a byterange handling bug that could c... In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 09:08:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for a byterange handling bug that could cause a DoS - release 5 ---- Files affected: SPECS: apache.spec (1.404 -> 1.405) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.404 SPECS/apache.spec:1.405 --- SPECS/apache.spec:1.404 Thu Aug 25 08:09:20 2005 +++ SPECS/apache.spec Thu Aug 25 11:08:30 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ # TODO: -# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -37,7 +36,7 @@ Summary(tr): Lider WWW taray?c? Name: apache Version: 2.0.54 -Release: 4 +Release: 5 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -91,6 +90,8 @@ Patch23: %{name}-normalize-path.patch # http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre Patch24: %{name}2-pcre-patch.diff +# http://issues.apache.org/bugzilla/attachment.cgi?id=16102 DoS +Patch25: %{name}2-byterange.patch URL: http://httpd.apache.org/ BuildRequires: automake BuildRequires: apr-devel >= 1:1.0.0 @@ -775,6 +776,7 @@ %patch22 -p1 %patch23 -p1 %{?with_external_pcre:%patch24 -p2} +%patch25 -p0 %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *) %{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in @@ -1829,6 +1831,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.405 2005/08/25 09:08:30 adamg +- fix for a byterange handling bug that could cause a DoS +- release 5 + Revision 1.404 2005/08/25 06:09:20 glen - todo security ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.404&r2=1.405&f=u From paladine at pld-linux.org Thu Aug 25 11:09:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: gnubiff-2.1.5.tar.gz Message-ID: <1518.1124960976@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnubiff/gnubiff-2.1.5.tar.gz 5b8c406042028558a0cd3d24ec2cf199 gnubiff-2.1.5.tar.gz Size: 757377 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:09:39 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: gnubiff.spec - updated to 2.1.5 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:09:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.5 - sorted %%files ---- Files affected: SPECS: gnubiff.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/gnubiff.spec diff -u SPECS/gnubiff.spec:1.23 SPECS/gnubiff.spec:1.24 --- SPECS/gnubiff.spec:1.23 Wed Jun 1 22:06:44 2005 +++ SPECS/gnubiff.spec Thu Aug 25 11:09:33 2005 @@ -6,12 +6,12 @@ Summary: Mail notification program Summary(pl): Program powiadamiaj?cy o nowej poczcie Name: gnubiff -Version: 2.1.3 +Version: 2.1.5 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/gnubiff/%{name}-%{version}.tar.gz -# Source0-md5: 4832f7d100b8f476082191a4c66a772f +# Source0-md5: 5b8c406042028558a0cd3d24ec2cf199 URL: http://gnubiff.sourceforge.net/ %{?with_gnome:BuildRequires: GConf2-devel >= 2.4.0} BuildRequires: autoconf >= 2.53 @@ -81,8 +81,8 @@ %{_pixmapsdir}/*.png %if %{with gnome} -%{_libdir}/bonobo/servers/*.server %{_datadir}/gnome-*/ui/*.xml +%{_libdir}/bonobo/servers/*.server %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +91,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/25 09:09:33 paladine +- updated to 2.1.5 +- sorted %%files + Revision 1.23 2005/06/01 20:06:44 zbyniu - BR: fam-devel, gettext-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnubiff.spec?r1=1.23&r2=1.24&f=u From paladine at pld-linux.org Thu Aug 25 11:13:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: python-pygtk-pangocairo.defs (REMOVED) - already in sources In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:13:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - already in sources ---- Files affected: SOURCES: python-pygtk-pangocairo.defs (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Thu Aug 25 11:14:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: pygtk-2.7.4.tar.bz2 Message-ID: <4419.1124961241@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/pygtk-2.7.4.tar.bz2 103670cb22c6cb65375dbd68aa727315 pygtk-2.7.4.tar.bz2 Size: 752672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:14:03 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): python-pygtk.spec - updated to 2.7.4 - removed pang... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:14:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.7.4 - removed pangocairo.defs (already in sources) - fixed/updated BRs/Rs - sorted %%files ---- Files affected: SPECS: python-pygtk.spec (1.113.2.6 -> 1.113.2.7) ---- Diffs: ================================================================ Index: SPECS/python-pygtk.spec diff -u SPECS/python-pygtk.spec:1.113.2.6 SPECS/python-pygtk.spec:1.113.2.7 --- SPECS/python-pygtk.spec:1.113.2.6 Thu Aug 18 23:44:43 2005 +++ SPECS/python-pygtk.spec Thu Aug 25 11:13:58 2005 @@ -10,16 +10,15 @@ Summary: Python bindings for GTK+ 2.x libraries Summary(pl): Wi?zania Pythona do bibliotek GTK+ 2.x Name: python-%{module} -Version: 2.7.3 -Release: 2 +Version: 2.7.4 +Release: 1 Epoch: 2 License: LGPL Group: Libraries/Python Source0: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/%{module}-%{version}.tar.bz2 -# Source0-md5: 17986ed00ce4b3fb3e699c7f3735942c +# Source0-md5: 103670cb22c6cb65375dbd68aa727315 Source1: %{name}-python.m4 Source2: %{name}-jhflags.m4 -Source3: %{name}-pangocairo.defs Patch0: %{name}-pyc.patch URL: http://www.pygtk.org/ BuildRequires: atk-devel >= 1:1.8.1 @@ -29,10 +28,10 @@ BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.1 BuildRequires: libtool -BuildRequires: pango-devel >= 1:1.9.0 +BuildRequires: pango-devel >= 1:1.10.0 BuildRequires: python-devel >= 1:2.3.2 %{?with_numpy:BuildRequires: python-numpy-devel} -BuildRequires: python-pycairo-devel +BuildRequires: python-pycairo-devel >= 0.5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -81,7 +80,7 @@ Summary(pl): Wi?zania Pythona do biblioteki GObject Group: Libraries/Python %pyrequires_eq python-modules -Requires: glib2 >= 1:2.7.4 +Requires: glib2 >= 1:2.8.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -97,8 +96,8 @@ Group: Libraries/Python Requires: %{name}-atk = %{epoch}:%{version}-%{release} Requires: %{name}-pango = %{epoch}:%{version}-%{release} -Requires: gtk+2 >= 2:2.7.4 -Requires: python-pycairo +Requires: gtk+2 >= 2:2.8.0 +Requires: python-pycairo >= 0.5.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -113,7 +112,7 @@ Summary(pl): Wi?zania Pythona do biblioteki ATK Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: atk >= 1.8.0 +Requires: atk >= 1:1.8.0 %description atk Python bindings for ATK library. @@ -126,7 +125,7 @@ Summary(pl): Wi?zania Pythona do biblioteki Pango Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: pango > 1.9.0 +Requires: pango >= 1:1.10.0 Requires: python-pycairo %description pango @@ -156,7 +155,6 @@ mkdir m4 cp %{SOURCE1} m4/python.m4 cp %{SOURCE2} m4/jhflags.m4 -cp %{SOURCE3} pangocairo.defs %build %{__libtoolize} @@ -189,15 +187,12 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -%{_includedir}/pygtk-2.0 - %dir %{_datadir}/%{module} %dir %{_datadir}/%{module}/2.0 %dir %{_datadir}/%{module}/2.0/codegen %{_datadir}/%{module}/2.0/codegen/*.py[co] - %{_datadir}/%{module}/2.0/defs - +%{_includedir}/pygtk-2.0 %{_pkgconfigdir}/*.pc %files examples @@ -237,6 +232,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113.2.7 2005/08/25 09:13:58 paladine +- updated to 2.7.4 +- removed pangocairo.defs (already in sources) +- fixed/updated BRs/Rs +- sorted %%files + Revision 1.113.2.6 2005/08/18 21:44:43 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pygtk.spec?r1=1.113.2.6&r2=1.113.2.7&f=u From glen at pld-linux.org Thu Aug 25 11:45:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: egroupware.spec - splitting dirs for fine tune of permissions In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 09:45:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - splitting dirs for fine tune of permissions ---- Files affected: SPECS: egroupware.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.5 SPECS/egroupware.spec:1.6 --- SPECS/egroupware.spec:1.5 Thu Aug 25 09:28:25 2005 +++ SPECS/egroupware.spec Thu Aug 25 11:45:28 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.4 +Release: 0.7 Epoch: 0 License: GPL Group: Applications/WWW @@ -85,7 +85,42 @@ %attr(710,root,http) %dir %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* -%{_appdir} +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/addressbook +%{_appdir}/admin +%{_appdir}/backup +%{_appdir}/bookmarks +%{_appdir}/calendar +%{_appdir}/comic +%{_appdir}/developer_tools +%{_appdir}/email +%{_appdir}/emailadmin +%{_appdir}/etemplate +%{_appdir}/felamimail +%{_appdir}/filemanager +%{_appdir}/forum +%{_appdir}/ftp +%{_appdir}/fudforum +%{_appdir}/headlines +%{_appdir}/infolog +%{_appdir}/jinn +%{_appdir}/manual +%{_appdir}/messenger +%{_appdir}/news_admin +%{_appdir}/phpbrain +%{_appdir}/phpgwapi +%{_appdir}/phpldapadmin +%{_appdir}/phpsysinfo +%{_appdir}/polls +%{_appdir}/preferences +%{_appdir}/projects +%{_appdir}/registration +%{_appdir}/setup +%{_appdir}/sitemgr +%{_appdir}/stocks +%{_appdir}/tts +%{_appdir}/wiki %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -93,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:45:28 glen +- splitting dirs for fine tune of permissions + Revision 1.5 2005/08/25 07:28:25 glen - added apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.5&r2=1.6&f=u From heretyk at pld-linux.org Thu Aug 25 11:55:09 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: jude-icon.png (NEW), jude.desktop - added icon for Jude In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:55:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added icon for Jude ---- Files affected: SOURCES: jude-icon.png (NONE -> 1.1) (NEW), jude.desktop (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/jude-icon.png <> ================================================================ Index: SOURCES/jude.desktop diff -u SOURCES/jude.desktop:1.2 SOURCES/jude.desktop:1.3 --- SOURCES/jude.desktop:1.2 Wed Nov 17 00:20:43 2004 +++ SOURCES/jude.desktop Thu Aug 25 11:55:04 2005 @@ -3,6 +3,7 @@ Name=Jude Comment=Jude Comment[pl]=Jude +Icon=jude.png Exec=jude Terminal=false MultipleArgs=false ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jude.desktop?r1=1.2&r2=1.3&f=u From heretyk at pld-linux.org Thu Aug 25 11:58:57 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: jude.spec - up to 1.6.2 - icon added In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:58:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.2 - icon added ---- Files affected: SPECS: jude.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.5 SPECS/jude.spec:1.6 --- SPECS/jude.spec:1.5 Wed Nov 17 00:20:56 2004 +++ SPECS/jude.spec Thu Aug 25 11:58:52 2005 @@ -3,12 +3,13 @@ Summary: A New Java/UML Object-Oriented Design Tool Summary(pl): ?rodowisko obiektowo zorientowanego projektowania narz?dzi UML Name: jude -Version: 1.4 -Release: 2 +Version: 1.6.2 +Release: 1 License: Freeware Group: Applications/Engineering -Source0: http://objectclub.esm.co.jp/Jude/com%(echo %{version} |tr -d .)/%{name}-%{codename}-%(echo %{version} |tr . _).zip +Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop +Source2: %{name}-icon.png URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch @@ -29,7 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}} cat < $RPM_BUILD_ROOT%{_bindir}/%{name} #!/bin/sh @@ -38,6 +39,7 @@ install jude-%{codename}.jar JudeDefaultModel.jude $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png %clean rm -rf $RPM_BUILD_ROOT @@ -48,6 +50,7 @@ %attr(755,root,root) %{_bindir}/* %{_datadir}/%{name} %{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +58,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:58:52 heretyk +- up to 1.6.2 +- icon added + Revision 1.5 2004/11/16 23:20:56 paladine - rel 2 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Thu Aug 25 12:04:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - commit my last change... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:04:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commit my last changes, dated 2005-06-19 ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.5 -> 1.11.2.6) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 Sun Jun 19 19:04:13 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:04:42 2005 @@ -14,7 +14,7 @@ Name: php-pear-%{_pearname} Version: 1.3.0 %define _rc RC3 -Release: 0.%{_rc}.4 +Release: 0.%{_rc}.5 License: PHP 3.00 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz @@ -192,6 +192,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -x /usr/bin/pear ]; then + umask 002 + # this builds the pear registry depdb + /usr/bin/pear list > /dev/null +fi + %files %defattr(644,root,root,755) %doc %{_pearname}-%{version}%{_rc}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*,poweredbyphpdoc.gif} @@ -210,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.6 2005/08/25 10:04:42 glen +- commit my last changes, dated 2005-06-19 + Revision 1.11.2.5 2005/06/19 17:04:13 glen - missing dir - NOTE: it doesn't work non-root now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.5&r2=1.11.2.6&f=u From paladine at pld-linux.org Thu Aug 25 12:06:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: gnome-keyring-manager.spec - fixed %%files - added missing ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 10:06:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %%files - added missing BR/R: scrollkeeper - run %%scrollkeeper_update_post{,un} - rel. 2 ---- Files affected: SPECS: gnome-keyring-manager.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.8 SPECS/gnome-keyring-manager.spec:1.9 --- SPECS/gnome-keyring-manager.spec:1.8 Thu Aug 25 10:26:02 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 12:06:45 2005 @@ -3,7 +3,7 @@ Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager Version: 2.11.92 -Release: 1 +Release: 2 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 @@ -18,7 +18,9 @@ BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,preun): GConf2 +Requires(post,postun): scrollkeeper Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,16 +59,22 @@ %post %gconf_schema_install gnome-keyring-manager.schemas +%scrollkeeper_update_post %preun %gconf_schema_uninstall gnome-keyring-manager.schemas +%postun +%scrollkeeper_update_postun + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_datadir}/* +%{_datadir}/%{name} %{_desktopdir}/* +%{_mandir}/man1/* +%{_omf_dest_dir}/%{name} %{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -75,6 +83,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 10:06:45 paladine +- fixed %%files +- added missing BR/R: scrollkeeper +- run %%scrollkeeper_update_post{,un} +- rel. 2 + Revision 1.8 2005/08/25 08:26:02 paladine - updated to 2.11.92 - gnome-doc-utils for omf files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Thu Aug 25 12:10:36 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:20 2005 Subject: SOURCES: dev-list - fix grsec In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:10:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix grsec ---- Files affected: SOURCES: dev-list (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.29 SOURCES/dev-list:1.30 --- SOURCES/dev-list:1.29 Mon Aug 22 10:46:10 2005 +++ SOURCES/dev-list Thu Aug 25 12:10:31 2005 @@ -2640,7 +2640,7 @@ %dev(b,2,37) %attr(660,root,floppy) /dev/fd1CompaQ %dev(c,1,7) %attr(644,root,root) /dev/full %dev(c,10,229) %attr(660,root,fsctrl) /dev/fuse -%dev(c,1,10) %attr(622,root,root) /dev/grsec +%dev(c,1,12) %attr(622,root,root) /dev/grsec %dev(b,3,0) %attr(660,root,disk) /dev/hda %dev(b,3,1) %attr(660,root,disk) /dev/hda1 %dev(b,3,10) %attr(660,root,disk) /dev/hda10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.29&r2=1.30&f=u From glen at pld-linux.org Thu Aug 25 12:11:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: egroupware.spec - permission changes, check_install.php passed In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:11:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - permission changes, check_install.php passed ---- Files affected: SPECS: egroupware.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.6 SPECS/egroupware.spec:1.7 --- SPECS/egroupware.spec:1.6 Thu Aug 25 11:45:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 12:11:52 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.7 +Release: 0.9 Epoch: 0 License: GPL Group: Applications/WWW @@ -101,7 +101,6 @@ %{_appdir}/filemanager %{_appdir}/forum %{_appdir}/ftp -%{_appdir}/fudforum %{_appdir}/headlines %{_appdir}/infolog %{_appdir}/jinn @@ -109,7 +108,6 @@ %{_appdir}/messenger %{_appdir}/news_admin %{_appdir}/phpbrain -%{_appdir}/phpgwapi %{_appdir}/phpldapadmin %{_appdir}/phpsysinfo %{_appdir}/polls @@ -122,12 +120,33 @@ %{_appdir}/tts %{_appdir}/wiki +%dir %{_appdir}/phpgwapi +%{_appdir}/phpgwapi/*.php +%{_appdir}/phpgwapi/cron +%{_appdir}/phpgwapi/doc +%{_appdir}/phpgwapi/inc +%{_appdir}/phpgwapi/js +%{_appdir}/phpgwapi/setup +%{_appdir}/phpgwapi/templates +%{_appdir}/phpgwapi/themes +%dir %attr(775,root,http) %{_appdir}/phpgwapi/images +%{_appdir}/phpgwapi/images/* + +%dir %attr(775,root,http) %{_appdir}/fudforum +%{_appdir}/fudforum/*.php +%{_appdir}/fudforum/inc +%{_appdir}/fudforum/setup +%{_appdir}/fudforum/templates + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 10:11:52 glen +- permission changes, check_install.php passed + Revision 1.6 2005/08/25 09:45:28 glen - splitting dirs for fine tune of permissions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.6&r2=1.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:13:13 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: horde-passwd.spec - unification In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:13:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unification ---- Files affected: SPECS: horde-passwd.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.25 SPECS/horde-passwd.spec:1.26 --- SPECS/horde-passwd.spec:1.25 Wed Aug 24 21:08:52 2005 +++ SPECS/horde-passwd.spec Thu Aug 25 12:13:07 2005 @@ -16,7 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/25 10:13:07 paszczus +- unification + Revision 1.25 2005/08/24 19:08:52 glen - fix for broken ldap::_userDN() ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.25&r2=1.26&f=u From paszczus at pld-linux.org Thu Aug 25 12:15:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: l7-protocols-2005-08-24.tar.gz Message-ID: <9113.1124964928@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/l7-filter/l7-protocols-2005-08-24.tar.gz d6529a1483678b8b7969fc55dcd3f294 l7-protocols-2005-08-24.tar.gz Size: 65328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:15:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: l7-protocols.spec - updated to 2005-08-24 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:15:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 ---- Files affected: SPECS: l7-protocols.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/l7-protocols.spec diff -u SPECS/l7-protocols.spec:1.10 SPECS/l7-protocols.spec:1.11 --- SPECS/l7-protocols.spec:1.10 Fri Jul 29 15:16:35 2005 +++ SPECS/l7-protocols.spec Thu Aug 25 12:15:22 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define dashver 2005-07-28 +%define dashver 2005-08-24 # Summary: Protocol definitions files for l7-filter Summary(pl): Pliki definicji protoko??w dla l7-filter Name: l7-protocols -Version: 2005_07_28 +Version: 2005_08_24 Release: 1 License: GPL Group: Applications/Networking Source0: http://dl.sourceforge.net/l7-filter/%{name}-%{dashver}.tar.gz -# Source0-md5: 9020a5bf60175ba7194d3f718cf6585f +# Source0-md5: d6529a1483678b8b7969fc55dcd3f294 URL: http://l7-filter.sourceforge.net/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 10:15:22 paszczus +- updated to 2005-08-24 + Revision 1.10 2005/07/29 13:16:35 paszczus - updated to 2005_07_28 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/l7-protocols.spec?r1=1.10&r2=1.11&f=u From arekm at pld-linux.org Thu Aug 25 12:17:21 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - fix br In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:17:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix br ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.6 -> 1.11.2.7) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 SPECS/php-pear-PhpDocumentor.spec:1.11.2.7 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 Thu Aug 25 12:04:42 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:17:16 2005 @@ -22,7 +22,7 @@ Patch0: %{name}-includes_fix.patch Patch1: %{name}-html_treemenu_includes_fix.patch URL: http://pear.php.net/package/PhpDocumentor/ -BuildRequires: php-pear-PEAR >= 1.4.0-0.a11.5 +BuildRequires: php-pear-PEAR >= 1:1.4.0-0.a11.5 BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: sed >= 4.0 Requires(post): php-pear-PEAR @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.7 2005/08/25 10:17:16 arekm +- fix br + Revision 1.11.2.6 2005/08/25 10:04:42 glen - commit my last changes, dated 2005-06-19 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.6&r2=1.11.2.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: kmplayer-0.9.1-pre1.tar.bz2 Message-ID: <25276.1124966469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xs4all.nl/~jjvrieze/kmplayer-0.9.1-pre1.tar.bz2 b82f729fc99967cf76d92a78f241e164 kmplayer-0.9.1-pre1.tar.bz2 Size: 740728 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): kmplayer.spec - updated to 0.9.1-pre1 - adaptarized In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:41:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.9.1-pre1 - adaptarized ---- Files affected: SPECS: kmplayer.spec (1.48.2.2 -> 1.48.2.3) ---- Diffs: ================================================================ Index: SPECS/kmplayer.spec diff -u SPECS/kmplayer.spec:1.48.2.2 SPECS/kmplayer.spec:1.48.2.3 --- SPECS/kmplayer.spec:1.48.2.2 Fri Jul 29 12:44:26 2005 +++ SPECS/kmplayer.spec Thu Aug 25 12:41:03 2005 @@ -1,21 +1,23 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without gstreamer # Do not build kgstplayer +%bcond_with koffice # Build koffice plugin +%bcond_without xine # Do not build kxineplayer -%bcond_without gstreamer # Do not build kgstplayer -%bcond_with koffice # Build koffice plugin -%bcond_without xine # Do not build kxineplayer - +%define _pre pre1 Summary: A KDE MPlayer/Xine/ffmpeg/ffserver/VDR frontend Summary(pl): Frontend dla program?w MPlayer/Xine/ffmpeg/ffserver/VDR pod KDE Name: kmplayer -Version: 0.9.0a -Release: 0.1 +Version: 0.9.1 +Release: 0.%{_pre}.1 Epoch: 2 License: GPL Group: X11/Applications/Multimedia # From kdeextragear-2 kde cvs module #Source0: ftp://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2 -Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}.tar.bz2 -# Source0-md5: c6d5203bf1bfe5d2f1a5fb9f3b048c74 +Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}-%{_pre}.tar.bz2 +# Source0-md5: b82f729fc99967cf76d92a78f241e164 #Patch0: %{name}-mimetypes.patch URL: http://www.xs4all.nl/~jjvrieze/kmplayer.html BuildRequires: arts-qt-devel @@ -23,7 +25,7 @@ %{?with_gstreamer:BuildRequires: gstreamer-plugins-devel} BuildRequires: kdelibs-devel >= 9:3.1.92 %{?with_koffice:BuildRequires: koffice-devel} -BuildRequires: rpmbuild(macros) >= 1.129 +BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 %{?with_xine:BuildRequires: xine-lib-devel >= 1:1.0} #BuildRequires: unsermake @@ -53,7 +55,7 @@ Integracja kmplayera z koffice. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{_pre} %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ src/kmplayer.desktop \ @@ -65,7 +67,7 @@ #export UNSERMAKE=/usr/share/unsermake/unsermake -#%{__make} -f admin/Makefile.common cvs +#%{__make} -f admin/Makefile.common cvs %configure \ --disable-rpath \ @@ -87,7 +89,7 @@ # remove bogus translation rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx -#%find_lang %{name} --with-kde +#%find_lang %{name} --with-kde %clean rm -rf $RPM_BUILD_ROOT @@ -130,6 +132,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.3 2005/08/25 10:41:03 paszczus +- updated to 0.9.1-pre1 +- adaptarized + Revision 1.48.2.2 2005/07/29 10:44:26 paszczus - updated to 0.9.0a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kmplayer.spec?r1=1.48.2.2&r2=1.48.2.3&f=u From trojan at pld-linux.org Thu Aug 25 12:47:22 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (GCC4): gcc.spec - updated to 4.0.1 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 10:47:22 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - updated to 4.0.1 ---- Files affected: SPECS: gcc.spec (1.308 -> 1.308.2.1) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308 SPECS/gcc.spec:1.308.2.1 --- SPECS/gcc.spec:1.308 Mon May 23 12:30:55 2005 +++ SPECS/gcc.spec Thu Aug 25 12:47:16 2005 @@ -25,14 +25,12 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -%define _snap 20050521 -Release: 0.%{_snap}.2 +Release: 0.1 Epoch: 5 License: GPL v2+ Group: Development/Languages -#Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/gcc-4.0-%{_snap}.tar.bz2 -# Source0-md5: 7f45e29a00590ce57a001a9294e8184e +Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 947416e825a877a0d69489be1be43be1 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -40,12 +38,6 @@ Patch3: %{name}-ada-link-new-libgnat.patch Patch4: %{name}-ada-link.patch Patch5: %{name}-alpha-ada_fix.patch -# PRs -Patch10: %{name}-pr19664.patch -Patch11: %{name}-pr20218.patch -Patch12: %{name}-pr20297.patch -Patch14: %{name}-push-pop-visibility.patch -Patch15: %{name}-pr21704.patch URL: http://gcc.gnu.org/ BuildRequires: autoconf BuildRequires: automake @@ -676,8 +668,7 @@ Statyczne biblioteki Obiektowego C. %prep -#setup -q -n gcc-%{version} -%setup -q -n gcc-4.0-%{_snap} +%setup -q -n gcc-%{version} %patch0 -p1 %patch1 -p1 @@ -686,13 +677,6 @@ %patch4 -p1 %patch5 -p1 -# PRs -%patch10 -p1 -%patch11 -p0 -%patch12 -p1 -%patch14 -p0 -%patch15 -p1 - # because we distribute modified version of gcc... perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c perl -pi -e 's@(bug_report_url.*";@' gcc/version.c @@ -1204,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.1 2005/08/25 10:47:16 trojan +- updated to 4.0.1 + Revision 1.308 2005/05/23 10:30:55 pluto - fix handling #pragma gcc visibility for builtins. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308&r2=1.308.2.1&f=u From paszczus at pld-linux.org Thu Aug 25 13:03:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: adapter.awk - do not be so humble ; added one more author In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 11:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - do not be so humble ; added one more author ---- Files affected: SPECS: adapter.awk (1.172 -> 1.173) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.172 SPECS/adapter.awk:1.173 --- SPECS/adapter.awk:1.172 Tue Aug 23 22:34:51 2005 +++ SPECS/adapter.awk Thu Aug 25 13:03:07 2005 @@ -9,6 +9,7 @@ # Tomasz K?oczko # Artur Frysiak # Michal Kochanowicz +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.172&r2=1.173&f=u From paladine at pld-linux.org Thu Aug 25 13:04:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): gnome-media.spec - missing dir - rel. 3 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dir - rel. 3 ---- Files affected: SPECS: gnome-media.spec (1.122.2.5 -> 1.122.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-media.spec diff -u SPECS/gnome-media.spec:1.122.2.5 SPECS/gnome-media.spec:1.122.2.6 --- SPECS/gnome-media.spec:1.122.2.5 Thu Aug 18 12:56:42 2005 +++ SPECS/gnome-media.spec Thu Aug 25 13:04:01 2005 @@ -4,7 +4,7 @@ Summary(pl): Programy multimedialne dla GNOME Name: gnome-media Version: 2.11.91 -Release: 2 +Release: 3 License: GPL v2+/LGPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-media/2.11/%{name}-%{version}.tar.bz2 @@ -295,6 +295,7 @@ %dir %{_datadir}/gnome-media/pixmaps %{_datadir}/gnome-media/glade %{_datadir}/gstreamer-properties +%dir %{_omf_dest_dir}/%{name} %{_omf_dest_dir}/%{name}/gstreamer-properties-C.omf %{_pixmapsdir}/gstreamer-properties.png %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas @@ -393,6 +394,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122.2.6 2005/08/25 11:04:01 paladine +- missing dir +- rel. 3 + Revision 1.122.2.5 2005/08/18 10:56:42 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-media.spec?r1=1.122.2.5&r2=1.122.2.6&f=u From paladine at pld-linux.org Thu Aug 25 13:04:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): gnome-applets.spec - missing dirs - rel. 2 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dirs - rel. 2 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.8 -> 1.152.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.8 SPECS/gnome-applets.spec:1.152.2.9 --- SPECS/gnome-applets.spec:1.152.2.8 Wed Aug 24 08:54:24 2005 +++ SPECS/gnome-applets.spec Thu Aug 25 13:04:44 2005 @@ -8,7 +8,7 @@ Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets Version: 2.11.92.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2, FDL Group: X11/Applications @@ -533,6 +533,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml %{_pixmapsdir}/accessx-status-applet %{_iconsdir}/hicolor/48x48/apps/ax-applet.png +%dir %{_omf_dest_dir}/accessx-status %{_omf_dest_dir}/accessx-status/accessx-status-C.omf %lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf @@ -545,6 +546,7 @@ %{_datadir}/%{name}/glade/battstat_applet.glade %{_sysconfdir}/gconf/schemas/battstat.schemas %{_sysconfdir}/sound/events/battstat_applet.soundlist +%dir %{_omf_dest_dir}/battstat %{_omf_dest_dir}/battstat/battstat-C.omf %files charpicker -f char-palette.lang @@ -555,6 +557,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas +%dir %{_omf_dest_dir}/char-palette %{_omf_dest_dir}/char-palette/char-palette-C.omf %lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf @@ -570,6 +573,7 @@ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png +%dir %{_omf_dest_dir}/cpufreq-applet %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf %lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf @@ -580,6 +584,7 @@ %{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas +%dir %{_omf_dest_dir}/drivemount %{_omf_dest_dir}/drivemount/drivemount-C.omf %lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf @@ -592,6 +597,7 @@ %{_datadir}/%{name}/geyes %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas +%dir %{_omf_dest_dir}/geyes %{_omf_dest_dir}/geyes/geyes-C.omf %lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf @@ -603,6 +609,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GtikApplet.xml %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas +%dir %{_omf_dest_dir}/gtik2_applet2 %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf %lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf @@ -614,6 +621,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml %{_datadir}/%{name}/gweather %{_sysconfdir}/gconf/schemas/gweather.schemas +%dir %{_omf_dest_dir}/gweather %{_omf_dest_dir}/gweather/gweather-C.omf %lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf @@ -673,6 +681,7 @@ %{_datadir}/%{name}/glade/gswitchit*.glade %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas +%dir %{_omf_dest_dir}/gswitchit %{_omf_dest_dir}/gswitchit/gswitchit-C.omf %lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf @@ -687,6 +696,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas +%dir %{_omf_dest_dir}/command-line %{_omf_dest_dir}/command-line/command-line-C.omf %lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf @@ -697,6 +707,7 @@ %{_libdir}/bonobo/servers/GNOME_MixerApplet.server %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas +%dir %{_omf_dest_dir}/mixer_applet2 %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf %lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf @@ -716,6 +727,7 @@ %{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas +%dir %{_omf_dest_dir}/multiload %{_omf_dest_dir}/multiload/multiload-C.omf %lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf @@ -728,6 +740,7 @@ %{_datadir}/%{name}/glade/stickynotes.glade %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas +%dir %{_omf_dest_dir}/stickynotes_applet %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf %lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf @@ -738,6 +751,7 @@ %{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +%dir %{_omf_dest_dir}/trashapplet %{_omf_dest_dir}/trashapplet/trashapplet-C.omf %lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf %lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf @@ -748,6 +762,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.9 2005/08/25 11:04:44 paladine +- missing dirs +- rel. 2 + Revision 1.152.2.8 2005/08/24 06:54:24 paladine - updated to 2.11.92.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.8&r2=1.152.2.9&f=u From havner at pld-linux.org Thu Aug 25 13:12:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:20 2005 Subject: fortunes-pl: pld-offensive - glen's polish course continues In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 11:12:26 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - glen's polish course continues ---- Files affected: fortunes-pl: pld-offensive (1.6 -> 1.7) ---- Diffs: ================================================================ Index: fortunes-pl/pld-offensive diff -u fortunes-pl/pld-offensive:1.6 fortunes-pl/pld-offensive:1.7 --- fortunes-pl/pld-offensive:1.6 Fri Feb 4 11:54:52 2005 +++ fortunes-pl/pld-offensive Thu Aug 25 13:12:21 2005 @@ -55,3 +55,12 @@ 11:36 <@cieciwa> Panowie... 11:37 <@cieciwa> komu przyjebac ??? tak od serca ? % +[13:08:17] < mmazur> 'kurwa mac' is short for 'kurwa twoja mac' which means (literally) 'whore your mother' [IN] +[13:08:27] < mmazur> So it's kind of heavy for a curse :) [IN] +[13:08:46] < glen> we have saying here in estonia, after one anectote [IN] +[13:08:48] < gausus> mmazur: nalezy Ci sie medal KEN i uscisk reki miodka za promocje poprawnie rozumianej polszczyzny na obczyznie [IN] +[13:08:54] < glen> "suck your own mother's dick" :) [IN] +[13:09:00] < gausus> mmazur: ale ucz ich ucz, jak ich podbijemy to beda nas rozumiec [IN] +[13:09:20] < gausus> glen: afair nobodys mother has a dick of her own [IN] +[13:09:27] < gausus> at least where i come from [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld-offensive?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:24:35 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS (DEVEL): imlib2.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:24:35 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - added URL ---- Files affected: SPECS: imlib2.spec (1.51.2.1 -> 1.51.2.2) ---- Diffs: ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.51.2.1 SPECS/imlib2.spec:1.51.2.2 --- SPECS/imlib2.spec:1.51.2.1 Thu Mar 31 01:38:47 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:24:30 2005 @@ -2,14 +2,13 @@ Summary: Powerful image loading and rendering library Summary(pl): Pot??na biblioteka wczytuj?ca i renderuj?ca obrazki Name: imlib2 -Version: 1.2.0 -%define _snap 20050329 -Release: 1.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: LGPL Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/pub/e17/%{name}-%{_snap}.tar.gz -# Source0-md5: cd77568626e5212ffcdbb881e407d8c6 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 9130e1b016eb392700c51baaa35c76cd +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -71,13 +70,13 @@ Biblioteki statyczne imlib2. %prep -%setup -q -n %{name} +%setup -q sed -i -e 's@/lib -lX11@/%{_lib} -lX11@' configure.in %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -137,6 +136,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51.2.2 2005/08/25 11:24:30 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- added URL + Revision 1.51.2.1 2005/03/30 23:38:47 sparky - updated to 20050329 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.51.2.1&r2=1.51.2.2&f=u From charles at pld-linux.org Thu Aug 25 13:24:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:20 2005 Subject: DISTFILES: imlib2-1.2.1.004.tar.gz Message-ID: <26548.1124969079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2-1.2.1.004.tar.gz 9130e1b016eb392700c51baaa35c76cd imlib2-1.2.1.004.tar.gz Size: 902236 bytes -- Virtually Yours: distfiles. From trojan at pld-linux.org Thu Aug 25 13:31:29 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:39:20 2005 Subject: SPECS: binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 11:31:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: binutils.spec (1.219 -> 1.220) ---- Diffs: ================================================================ Index: SPECS/binutils.spec diff -u SPECS/binutils.spec:1.219 SPECS/binutils.spec:1.220 --- SPECS/binutils.spec:1.219 Thu Jul 21 20:56:00 2005 +++ SPECS/binutils.spec Thu Aug 25 13:31:23 2005 @@ -14,13 +14,13 @@ Summary(tr): GNU geli?tirme ara?lar? Summary(uk): ????? ???????????? GNU ??? ???????? ??????????? ??????? Name: binutils -Version: 2.16.91.0.2 -Release: 2 +Version: 2.16.91.0.3 +Release: 1 Epoch: 2 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6 Patch0: %{name}-gasp.patch @@ -248,6 +248,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.220 2005/08/25 11:31:23 trojan +- updated to 2.16.91.0.3 + Revision 1.219 2005/07/21 18:56:00 arekm - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/binutils.spec?r1=1.219&r2=1.220&f=u From trojan at pld-linux.org Thu Aug 25 13:32:13 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: binutils-2.16.91.0.3.tar.bz2 binutils-non-english-man-pages.tar.bz2 Message-ID: <31455.1124969533@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.3.tar.bz2 c737a5787927f60758b4960f10e44f93 binutils-2.16.91.0.3.tar.bz2 Size: 12214719 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/binutils-non-english-man-pages.tar.bz2 a717d9707ec77d82acb6ec9078c472d6 binutils-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From charles at pld-linux.org Thu Aug 25 13:36:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: enlightenmentDR17.spec - external vera fonts (req. fonts-TT... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:36:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) ---- Files affected: SPECS: enlightenmentDR17.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.6 SPECS/enlightenmentDR17.spec:1.7 --- SPECS/enlightenmentDR17.spec:1.6 Wed Aug 24 20:45:44 2005 +++ SPECS/enlightenmentDR17.spec Thu Aug 25 13:36:42 2005 @@ -83,6 +83,14 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop +cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts +VERA=$(ls Vera*.ttf) +for FONT in $VERA; do + rm -f $FONT + ln -s %{_fontsdir}/TTF/$FONT . +done +cd - + %find_lang %{name} %clean @@ -120,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:36:42 charles +- external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) + Revision 1.6 2005/08/24 18:45:44 charles - updated to 0.16.999.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.6&r2=1.7&f=u From paladine at pld-linux.org Thu Aug 25 13:43:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: netspeed_applet-0.13.tar.gz Message-ID: <5915.1124970193@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/netspeed_applet-0.13.tar.gz b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Size: 647081 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 13:43:11 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: gnome-applet-netspeed.spec - updated to 0.13 - missing dir ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:43:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.13 - missing dir - missing BRs - use more macros ---- Files affected: SPECS: gnome-applet-netspeed.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applet-netspeed.spec diff -u SPECS/gnome-applet-netspeed.spec:1.6 SPECS/gnome-applet-netspeed.spec:1.7 --- SPECS/gnome-applet-netspeed.spec:1.6 Mon Apr 25 11:09:08 2005 +++ SPECS/gnome-applet-netspeed.spec Thu Aug 25 13:43:06 2005 @@ -3,19 +3,22 @@ Summary: Show how much traffic occurs on a network device Summary(pl): Pokazywanie wielko?ci ruchu wyst?puj?cego na urz?dzeniu sieciowym Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 2 +Version: 0.13 +Release: 1 License: GPL Group: X11/Applications Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/%{_realname}-%{version}.tar.gz -# Source0-md5: 7a651eab80c1a10654595fcfd4832463 +# Source0-md5: b5c5332993ed779c3653433c6f3b6a9a URL: http://mfcn.ilo.de/netspeed_applet/ BuildRequires: automake BuildRequires: gnome-desktop-devel >= 2.4.0 BuildRequires: gnome-panel-devel >= 2.4.0 BuildRequires: intltool >= 0.21 BuildRequires: libglade2-devel >= 2.0.1 -BuildRequires: libgnomeui-devel >= 2.4.0 +BuildRequires: libgnomeui-devel >= 2.8.0 +BuildRequires: libgtop-devel >= 2.10.0 +BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,postun): scrollkeeper BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,9 +59,10 @@ %files -f netspeed-applet.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO -%attr(755,root,root) %{_libdir}/netspeed_applet2 +%attr(755,root,root) %{_libdir}/%{_realname}2 %{_libdir}/bonobo/servers/*.server -%{_datadir}/omf/netspeed_applet/*.omf +%{_omf_dest_dir}/%{_realname} +%{_pixmapsdir}/%{_realname} %{_pixmapsdir}/*.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -67,6 +71,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:43:06 paladine +- updated to 0.13 +- missing dir +- missing BRs +- use more macros + Revision 1.6 2005/04/25 09:09:08 paladine - run %%scrollkeeper_update_post{,un} - removed redundant BR: libgtop-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applet-netspeed.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:50:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: ecore.spec, edje.spec, eet.spec, embryo.spec, emotion.spec, ... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: ecore.spec (1.6 -> 1.7) , edje.spec (1.8 -> 1.9) , eet.spec (1.7 -> 1.8) , embryo.spec (1.6 -> 1.7) , emotion.spec (1.6 -> 1.7) , epeg.spec (1.5 -> 1.6) , epsilon.spec (1.5 -> 1.6) , etox.spec (1.5 -> 1.6) , evas.spec (1.8 -> 1.9) , ewl.spec (1.6 -> 1.7) , imlib2.spec (1.52 -> 1.53) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.6 SPECS/ecore.spec:1.7 --- SPECS/ecore.spec:1.6 Wed Aug 24 20:27:57 2005 +++ SPECS/ecore.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ecore/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel @@ -132,6 +132,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:27:57 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.8 SPECS/edje.spec:1.9 --- SPECS/edje.spec:1.8 Wed Aug 24 20:30:10 2005 +++ SPECS/edje.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 1e5829e8c784770da2ccbd57ef55714c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Edje/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -128,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:30:10 charles - updated to 0.5.0.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.7 SPECS/eet.spec:1.8 --- SPECS/eet.spec:1.7 Wed Aug 24 20:32:54 2005 +++ SPECS/eet.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 875802e243e37e2eb954d3580cb19678 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Eet/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 11:50:22 charles +- proper URL + Revision 1.7 2005/08/24 18:32:54 charles - updated md5 ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.6 SPECS/embryo.spec:1.7 --- SPECS/embryo.spec:1.6 Wed Aug 24 20:33:50 2005 +++ SPECS/embryo.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: e1140446f243445ad8b987becb975d3d -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Embryo/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -96,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:33:50 charles - updated to 0.9.1.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.6 SPECS/emotion.spec:1.7 --- SPECS/emotion.spec:1.6 Wed Aug 24 20:34:53 2005 +++ SPECS/emotion.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Emotion/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:34:53 charles - updated to 0.0.1.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.5 SPECS/epeg.spec:1.6 --- SPECS/epeg.spec:1.5 Wed Aug 24 20:35:56 2005 +++ SPECS/epeg.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ad8505bed8deb7049dfa6322ce908f99 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epeg/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:35:56 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.5 SPECS/epsilon.spec:1.6 --- SPECS/epsilon.spec:1.5 Wed Aug 24 20:37:42 2005 +++ SPECS/epsilon.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 10118c712b42d00b332c6fe1d9257661 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epsilon/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:37:42 charles - updated to 0.3.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.5 SPECS/etox.spec:1.6 --- SPECS/etox.spec:1.5 Wed Aug 24 20:41:32 2005 +++ SPECS/etox.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ffb6de465dfc9a9b2802b414dd432932 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Etox/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:41:32 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.8 SPECS/evas.spec:1.9 --- SPECS/evas.spec:1.8 Wed Aug 24 20:42:34 2005 +++ SPECS/evas.spec Thu Aug 25 13:50:22 2005 @@ -23,7 +23,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 6d888cc6427d783ae517185c1e446e38 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Evas/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel BuildRequires: autoconf @@ -164,6 +164,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:42:34 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.6 SPECS/ewl.spec:1.7 --- SPECS/ewl.spec:1.6 Wed Aug 24 20:44:33 2005 +++ SPECS/ewl.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ewl/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:44:33 charles - updated to 0.0.4.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.52 SPECS/imlib2.spec:1.53 --- SPECS/imlib2.spec:1.52 Thu Jun 16 23:55:02 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: e32970d03d8aee2885782312d0a7f15f -URL: http://enlightenment.org/Libraries/Imlib2.html +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -136,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.53 2005/08/25 11:50:22 charles +- proper URL + Revision 1.52 2005/06/16 21:55:02 charles - updated to 1.2.1 - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.52&r2=1.53&f=u From charles at pld-linux.org Thu Aug 25 13:52:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (DEVEL): edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:52:02 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21.2.3 -> 1.21.2.4) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.3 SPECS/edb.spec:1.21.2.4 --- SPECS/edb.spec:1.21.2.3 Wed Aug 24 20:19:40 2005 +++ SPECS/edb.spec Thu Aug 25 13:51:57 2005 @@ -9,7 +9,7 @@ Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.4 2005/08/25 11:51:57 charles +- proper URL + Revision 1.21.2.3 2005/08/24 18:19:40 charles - updated to 1.0.5.004 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.3&r2=1.21.2.4&f=u From charles at pld-linux.org Thu Aug 25 13:56:55 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:56:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21 SPECS/edb.spec:1.22 --- SPECS/edb.spec:1.21 Thu Oct 28 11:58:30 2004 +++ SPECS/edb.spec Thu Aug 25 13:56:50 2005 @@ -9,7 +9,7 @@ Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: c8ee165f92dbc6e6fd9c9114e90e338c Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/25 11:56:50 charles +- proper URL + Revision 1.21 2004/10/28 09:58:30 paladine - "GTK+" unification (hope thats all) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21&r2=1.22&f=u From paszczus at pld-linux.org Thu Aug 25 15:00:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: horde.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:00:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: horde.spec (1.96 -> 1.97) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.96 SPECS/horde.spec:1.97 --- SPECS/horde.spec:1.96 Tue Aug 23 22:23:55 2005 +++ SPECS/horde.spec Thu Aug 25 14:59:58 2005 @@ -15,7 +15,7 @@ Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde Version: 3.0.5 -Release: 0.1 +Release: 1 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -311,6 +311,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.97 2005/08/25 12:59:58 paszczus +- release 1 + Revision 1.96 2005/08/23 20:23:55 glen - merged from DEVEL, updated to 3.0.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.96&r2=1.97&f=u From paszczus at pld-linux.org Thu Aug 25 15:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: gollem.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:04:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: gollem.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.10 SPECS/gollem.spec:1.11 --- SPECS/gollem.spec:1.10 Tue Aug 23 22:32:23 2005 +++ SPECS/gollem.spec Thu Aug 25 15:04:41 2005 @@ -5,7 +5,7 @@ Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.1 +Release: 1 License: GPL Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz @@ -129,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 13:04:41 paszczus +- release 1 + Revision 1.10 2005/08/23 20:32:23 paszczus - updated to FINAL 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.10&r2=1.11&f=u From adamg at pld-linux.org Thu Aug 25 15:13:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:21 2005 Subject: SOURCES: apache2-byterange.patch (NEW) - forgotten In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:13:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - forgotten ---- Files affected: SOURCES: apache2-byterange.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/apache2-byterange.patch diff -u /dev/null SOURCES/apache2-byterange.patch:1.1 --- /dev/null Thu Aug 25 15:13:51 2005 +++ SOURCES/apache2-byterange.patch Thu Aug 25 15:13:46 2005 @@ -0,0 +1,81 @@ +--- modules/http/http_protocol.c (revision 226972) ++++ modules/http/http_protocol.c (working copy) +@@ -2856,18 +2856,35 @@ + #define MIN_LENGTH(len1, len2) ((len1 > len2) ? len2 : len1) + request_rec *r = f->r; + conn_rec *c = r->connection; +- byterange_ctx *ctx = f->ctx; ++ byterange_ctx *ctx; + apr_bucket *e; + apr_bucket_brigade *bsend; + apr_off_t range_start; + apr_off_t range_end; + char *current; +- apr_off_t bb_length; + apr_off_t clength = 0; + apr_status_t rv; + int found = 0; + +- if (!ctx) { ++ /* Iterate through the brigade until reaching EOS or a bucket with ++ * unknown length. */ ++ for (e = APR_BRIGADE_FIRST(bb); ++ (e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e) ++ && e->length != (apr_size_t)-1); ++ e = APR_BUCKET_NEXT(e)) { ++ clength += e->length; ++ } ++ ++ /* Don't attempt to do byte range work if this brigade doesn't ++ * contain an EOS, or if any of the buckets has an unknown length; ++ * this avoids the cases where it is expensive to perform ++ * byteranging (i.e. may require arbitrary amounts of memory). */ ++ if (!APR_BUCKET_IS_EOS(e) || clength <= 0) { ++ ap_remove_output_filter(f); ++ return ap_pass_brigade(f->next, bb); ++ } ++ ++ { + int num_ranges = ap_set_byterange(r); + + /* We have nothing to do, get out of the way. */ +@@ -2876,7 +2893,7 @@ + return ap_pass_brigade(f->next, bb); + } + +- ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx)); ++ ctx = apr_pcalloc(r->pool, sizeof(*ctx)); + ctx->num_ranges = num_ranges; + /* create a brigade in case we never call ap_save_brigade() */ + ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc); +@@ -2903,29 +2920,6 @@ + } + } + +- /* We can't actually deal with byte-ranges until we have the whole brigade +- * because the byte-ranges can be in any order, and according to the RFC, +- * we SHOULD return the data in the same order it was requested. +- * +- * XXX: We really need to dump all bytes prior to the start of the earliest +- * range, and only slurp up to the end of the latest range. By this we +- * mean that we should peek-ahead at the lowest first byte of any range, +- * and the highest last byte of any range. +- */ +- if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { +- ap_save_brigade(f, &ctx->bb, &bb, r->pool); +- return APR_SUCCESS; +- } +- +- /* Prepend any earlier saved brigades. */ +- APR_BRIGADE_PREPEND(bb, ctx->bb); +- +- /* It is possible that we won't have a content length yet, so we have to +- * compute the length before we can actually do the byterange work. +- */ +- apr_brigade_length(bb, 1, &bb_length); +- clength = (apr_off_t)bb_length; +- + /* this brigade holds what we will be sending */ + bsend = apr_brigade_create(r->pool, c->bucket_alloc); + + ================================================================ From baggins at pld-linux.org Thu Aug 25 15:32:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SOURCES: linux-2.6-atm-vbr.patch (NEW) - ported to 2.6 from ftp://... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:32:17 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported to 2.6 from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs ---- Files affected: SOURCES: linux-2.6-atm-vbr.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atm-vbr.patch diff -u /dev/null SOURCES/linux-2.6-atm-vbr.patch:1.1 --- /dev/null Thu Aug 25 15:32:17 2005 +++ SOURCES/linux-2.6-atm-vbr.patch Thu Aug 25 15:32:12 2005 @@ -0,0 +1,162 @@ +Index: linux/include/linux/atm.h +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/include/linux/atm.h,v +retrieving revision 1.2 +diff -u -r1.2 atm.h +--- linux/include/linux/atm.h 12 Feb 2003 20:56:33 -0000 1.2 ++++ linux/include/linux/atm.h 9 Apr 2003 12:08:38 -0000 +@@ -72,7 +72,7 @@ + /* connection identifier range; socket must be + bound or connected */ + #define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos) +- /* Quality of Service setting */ ++ /* Quality of Service setting (with vbr support) */ + #define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap) + /* Service Access Point */ + #define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc) +@@ -127,9 +127,11 @@ + #define ATM_NONE 0 /* no traffic */ + #define ATM_UBR 1 + #define ATM_CBR 2 +-#define ATM_VBR 3 ++#define ATM_VBR_NRT 3 ++#define ATM_VBR ATM_VBR_NRT /* for backward compatibility */ + #define ATM_ABR 4 + #define ATM_ANYCLASS 5 /* compatible with everything */ ++#define ATM_VBR_RT 6 + + #define ATM_MAX_PCR -1 /* maximum available PCR */ + +@@ -140,6 +142,11 @@ + int min_pcr; /* minimum PCR in cells per second */ + int max_cdv; /* maximum CDV in microseconds */ + int max_sdu; /* maximum SDU in bytes */ ++ ++ /* extra params for VBR */ ++ int scr; /* sustained rate in cells per second */ ++ int mbs; /* maximum burst size (MBS) in cells */ ++ + /* extra params for ABR */ + unsigned int icr; /* Initial Cell Rate (24-bit) */ + unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ +@@ -243,4 +251,37 @@ + }; + + typedef unsigned short atm_backend_t; ++struct atm_trafprm_compat { ++ unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */ ++ int max_pcr; /* maximum PCR in cells per second */ ++ int pcr; /* desired PCR in cells per second */ ++ int min_pcr; /* minimum PCR in cells per second */ ++ int max_cdv; /* maximum CDV in microseconds */ ++ int max_sdu; /* maximum SDU in bytes */ ++ /* extra params for ABR */ ++ unsigned int icr; /* Initial Cell Rate (24-bit) */ ++ unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ ++ unsigned int frtt : 24; /* Fixed Round Trip Time (24-bit) */ ++ unsigned int rif : 4; /* Rate Increment Factor (4-bit) */ ++ unsigned int rdf : 4; /* Rate Decrease Factor (4-bit) */ ++ unsigned int nrm_pres :1; /* nrm present bit */ ++ unsigned int trm_pres :1; /* rm present bit */ ++ unsigned int adtf_pres :1; /* adtf present bit */ ++ unsigned int cdf_pres :1; /* cdf present bit*/ ++ unsigned int nrm :3; /* Max # of Cells for each forward RM cell (3-bit) */ ++ unsigned int trm :3; /* Time between forward RM cells (3-bit) */ ++ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */ ++ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */ ++ unsigned int spare :9; /* spare bits */ ++}; ++ ++struct atm_qos_compat { ++ struct atm_trafprm_compat txtp; /* parameters in TX direction */ ++ struct atm_trafprm_compat rxtp __ATM_API_ALIGN; ++ /* parameters in RX direction */ ++ unsigned char aal __ATM_API_ALIGN; ++}; ++ ++#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat) ++ /* Quality of Service setting (no vbr support) */ + #endif +Index: linux/net/atm/common.c +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/net/atm/common.c,v +retrieving revision 1.13 +diff -u -r1.13 common.c +--- linux/net/atm/common.c 17 Mar 2003 16:13:12 -0000 1.13 ++++ linux/net/atm/common.c 9 Apr 2003 12:10:28 -0000 +@@ -1085,6 +1085,43 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ struct atm_qos qos; ++ ++ if (copy_from_user(&qos_compat,optval,sizeof(qos_compat))) ++ return -EFAULT; ++ ++ /* convert old atm_qos to new atm_qos */ ++ qos.aal = qos_compat.aal; ++ qos.rxtp.traffic_class = qos_compat.rxtp.traffic_class; ++ qos.rxtp.max_pcr = qos_compat.rxtp.max_pcr; ++ qos.rxtp.pcr = qos_compat.rxtp.pcr; ++ qos.rxtp.min_pcr = qos_compat.rxtp.min_pcr; ++ qos.rxtp.max_cdv = qos_compat.rxtp.max_cdv; ++ qos.rxtp.max_sdu = qos_compat.rxtp.max_sdu; ++ qos.rxtp.scr = 0; ++ qos.rxtp.mbs = 0; ++ qos.txtp.traffic_class = qos_compat.txtp.traffic_class; ++ qos.txtp.max_pcr = qos_compat.txtp.max_pcr; ++ qos.txtp.pcr = qos_compat.txtp.pcr; ++ qos.txtp.min_pcr = qos_compat.txtp.min_pcr; ++ qos.txtp.max_cdv = qos_compat.txtp.max_cdv; ++ qos.txtp.max_sdu = qos_compat.txtp.max_sdu; ++ qos.txtp.scr = 0; ++ qos.txtp.mbs = 0; ++ ++ error = check_qos(&qos); ++ if (error) return error; ++ if (sock->state == SS_CONNECTED) ++ return atm_change_qos(vcc,&qos); ++ if (sock->state != SS_UNCONNECTED) ++ return -EBADFD; ++ vcc->qos = qos; ++ set_bit(ATM_VF_HASQOS,&vcc->flags); ++ return 0; ++ } + case SO_ATMQOS: + { + struct atm_qos qos; +@@ -1132,6 +1169,31 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ ++ if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) ++ return -EINVAL; ++ ++ /* convert new atm_qos to old atm_qos */ ++ qos_compat.aal = vcc->qos.aal; ++ qos_compat.rxtp.traffic_class = vcc->qos.rxtp.traffic_class; ++ qos_compat.rxtp.max_pcr = vcc->qos.rxtp.max_pcr; ++ qos_compat.rxtp.pcr = vcc->qos.rxtp.pcr; ++ qos_compat.rxtp.min_pcr = vcc->qos.rxtp.min_pcr; ++ qos_compat.rxtp.max_cdv = vcc->qos.rxtp.max_cdv; ++ qos_compat.rxtp.max_sdu = vcc->qos.rxtp.max_sdu; ++ qos_compat.txtp.traffic_class = vcc->qos.txtp.traffic_class; ++ qos_compat.txtp.max_pcr = vcc->qos.txtp.max_pcr; ++ qos_compat.txtp.pcr = vcc->qos.txtp.pcr; ++ qos_compat.txtp.min_pcr = vcc->qos.txtp.min_pcr; ++ qos_compat.txtp.max_cdv = vcc->qos.txtp.max_cdv; ++ qos_compat.txtp.max_sdu = vcc->qos.txtp.max_sdu; ++ ++ return copy_to_user(optval,&qos_compat,sizeof(qos_compat)) ? ++ -EFAULT : 0; ++ } + case SO_ATMQOS: + if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) + return -EINVAL; ================================================================ From havner at pld-linux.org Thu Aug 25 15:33:32 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:21 2005 Subject: fortunes-pl: pld - madrosci gaususa (ale to mu sie calkiem udalo m... In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:33:32 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - madrosci gaususa (ale to mu sie calkiem udalo musze przyznac) ---- Files affected: fortunes-pl: pld (1.425 -> 1.426) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.425 fortunes-pl/pld:1.426 --- fortunes-pl/pld:1.425 Wed Jul 13 22:44:38 2005 +++ fortunes-pl/pld Thu Aug 25 15:33:27 2005 @@ -3559,3 +3559,6 @@ Mariusz Mazur @ pld-devel-pl % +[15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] +[15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.425&r2=1.426&f=u From baggins at pld-linux.org Thu Aug 25 15:34:11 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM VBR is baaaaack! In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:34:11 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM VBR is baaaaack! ---- Files affected: SPECS: kernel.spec (1.441.2.1161 -> 1.441.2.1162) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1161 SPECS/kernel.spec:1.441.2.1162 --- SPECS/kernel.spec:1.441.2.1161 Tue Aug 23 15:06:36 2005 +++ SPECS/kernel.spec Thu Aug 25 15:34:05 2005 @@ -253,6 +253,8 @@ Patch112: linux-2.6-via82c586-irq-routing.patch Patch113: linux-2.6-3Com_IBM-fix.patch Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch +# Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs +Patch115: linux-2.6-atm-vbr.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -688,6 +690,7 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 +%patch115 -p1 %ifarch %{ix86} %if %{with abi} @@ -1481,6 +1484,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1162 2005/08/25 13:34:05 baggins +- ATM VBR is baaaaack! + Revision 1.441.2.1161 2005/08/23 13:06:36 baggins - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1161&r2=1.441.2.1162&f=u From adamg at pld-linux.org Thu Aug 25 15:37:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: File_Find-1.0.0.tgz Message-ID: <26311.1124977077@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/File_Find-1.0.0.tgz fa77a8b791c5a56c08336e8e2debad34 File_Find-1.0.0.tgz Size: 4871 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 15:37:58 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: php-pear-File_Find.spec - updated to 1.0.0 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.0 ---- Files affected: SPECS: php-pear-File_Find.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-File_Find.spec diff -u SPECS/php-pear-File_Find.spec:1.18 SPECS/php-pear-File_Find.spec:1.19 --- SPECS/php-pear-File_Find.spec:1.18 Fri Jan 14 08:30:22 2005 +++ SPECS/php-pear-File_Find.spec Thu Aug 25 15:37:53 2005 @@ -2,18 +2,18 @@ %include /usr/lib/rpm/macros.php %define _class File %define _subclass Find -%define _status beta +%define _status stable %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - a class that facillitates the search of filesystems Summary(pl): %{_pearname} - klasa z narz?dziami do przeszukiwania systemu plik?w Name: php-pear-%{_pearname} -Version: 0.3.1 +Version: 1.0.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: a81c83a7ce53f4fb9bec8a0019fde0e8 +# Source0-md5: fa77a8b791c5a56c08336e8e2debad34 URL: http://pear.php.net/package/File_Find/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 13:37:53 adamg +- updated to 1.0.0 + Revision 1.18 2005/01/14 07:30:22 adamg - updated to 0.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-File_Find.spec?r1=1.18&r2=1.19&f=u From baggins at pld-linux.org Thu Aug 25 15:39:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (LINUX_2_6): kernel.spec - TODO updated In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:39:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - TODO updated ---- Files affected: SPECS: kernel.spec (1.441.2.1162 -> 1.441.2.1163) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1162 SPECS/kernel.spec:1.441.2.1163 --- SPECS/kernel.spec:1.441.2.1162 Thu Aug 25 15:34:05 2005 +++ SPECS/kernel.spec Thu Aug 25 15:39:05 2005 @@ -3,6 +3,9 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs +# - check and maybe port ATM patches from 2.4 +# linux-2.4.22-fore200e-0.2f.patch +# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1484,6 +1487,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1163 2005/08/25 13:39:05 baggins +- TODO updated + Revision 1.441.2.1162 2005/08/25 13:34:05 baggins - ATM VBR is baaaaack! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1162&r2=1.441.2.1163&f=u From arekm at pld-linux.org Thu Aug 25 15:51:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: SOURCES (DEVEL): php-gd_imagerotate_enable.patch, php-nohttpd.patc... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 13:51:06 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 5.1rc1 (we loose one parameter to imagereotate unfortunately) ---- Files affected: SOURCES: php-gd_imagerotate_enable.patch (1.2 -> 1.2.2.1) , php-nohttpd.patch (1.1 -> 1.1.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-gd_imagerotate_enable.patch diff -u SOURCES/php-gd_imagerotate_enable.patch:1.2 SOURCES/php-gd_imagerotate_enable.patch:1.2.2.1 --- SOURCES/php-gd_imagerotate_enable.patch:1.2 Mon Oct 18 14:25:34 2004 +++ SOURCES/php-gd_imagerotate_enable.patch Thu Aug 25 15:51:00 2005 @@ -1,5 +1,6 @@ ---- ./ext/gd/gd.c.org 2004-08-17 01:08:56.000000000 +0200 -+++ ./ext/gd/gd.c 2004-10-18 14:24:15.797275104 +0200 +diff -urbB php-5.1.0RC1.org/ext/gd/gd.c php-5.1.0RC1/ext/gd/gd.c +--- php-5.1.0RC1.org/ext/gd/gd.c 2005-08-25 15:26:22.317049000 +0200 ++++ php-5.1.0RC1/ext/gd/gd.c 2005-08-25 15:27:37.644598376 +0200 @@ -209,8 +209,8 @@ PHP_FE(imagecopyresampled, NULL) #endif @@ -10,7 +11,7 @@ PHP_FE(imageantialias, NULL) #endif -@@ -416,11 +416,11 @@ +@@ -429,11 +429,11 @@ #ifdef GD2_FMT_COMPRESSED REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); #endif @@ -23,7 +24,7 @@ REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); /* Section Filters */ REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); -@@ -1191,7 +1191,6 @@ +@@ -1204,7 +1204,6 @@ /* }}} */ #endif @@ -31,7 +32,16 @@ /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor) Rotate an image using a custom angle */ PHP_FUNCTION(imagerotate) -@@ -1221,7 +1220,6 @@ +@@ -1221,7 +1220,7 @@ + + ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd); + +- im_dst = gdImageRotate(im_src, degrees, color, ignoretransparent); ++ im_dst = gdImageRotate(im_src, degrees, color); + + if (im_dst != NULL) { + ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd); +@@ -1230,7 +1229,6 @@ } } /* }}} */ @@ -39,8 +49,10 @@ #if HAVE_GD_IMAGESETTILE /* {{{ proto bool imagesettile(resource image, resource tile) ---- ./ext/gd/php_gd.h.org 2004-01-08 18:32:08.000000000 +0100 -+++ ./ext/gd/php_gd.h 2004-10-18 14:24:34.372451248 +0200 +Tylko w php-5.1.0RC1/ext/gd: gd.c.orig +diff -urbB php-5.1.0RC1.org/ext/gd/php_gd.h php-5.1.0RC1/ext/gd/php_gd.h +--- php-5.1.0RC1.org/ext/gd/php_gd.h 2005-08-25 15:26:22.366042000 +0200 ++++ php-5.1.0RC1/ext/gd/php_gd.h 2005-08-25 15:27:37.645598224 +0200 @@ -103,8 +103,8 @@ PHP_FUNCTION(imagecopyresampled); #endif ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1 SOURCES/php-nohttpd.patch:1.1.4.1 --- SOURCES/php-nohttpd.patch:1.1 Fri Jul 30 07:54:01 2004 +++ SOURCES/php-nohttpd.patch Thu Aug 25 15:51:01 2005 @@ -1,14 +1,15 @@ ---- php-4.3.8/sapi/apache2handler/config.m4.orig 2003-07-16 07:46:46.000000000 +0200 -+++ php-4.3.8/sapi/apache2handler/config.m4 2004-07-30 00:45:48.301382112 +0200 -@@ -52,9 +52,9 @@ +diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4 +--- php-5.1.0RC1.org/sapi/apache2handler/config.m4 2005-08-05 10:14:54.000000000 +0200 ++++ php-5.1.0RC1/sapi/apache2handler/config.m4 2005-08-25 15:09:38.486655320 +0200 +@@ -58,9 +58,9 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required.]) ++ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then + AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-gd_imagerotate_enable.patch?r1=1.2&r2=1.2.2.1&f=u http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1&r2=1.1.4.1&f=u From havner at pld-linux.org Thu Aug 25 15:51:55 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:21 2005 Subject: fortunes-pl: pld - no i madrosci ciag dalszy :-) In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:51:55 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - no i madrosci ciag dalszy :-) ---- Files affected: fortunes-pl: pld (1.426 -> 1.427) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.426 fortunes-pl/pld:1.427 --- fortunes-pl/pld:1.426 Thu Aug 25 15:33:27 2005 +++ fortunes-pl/pld Thu Aug 25 15:51:50 2005 @@ -3562,3 +3562,9 @@ [15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] [15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] % +[15:36:37] < gausus> havner: a autoryzacje dostales :) [IN] +[15:36:48] < gausus> potem bedzie potop i potomni dostana tylko moje przemyslenia i co [IN] +[15:36:53] < gausus> beda nas mieli za cywilizacje kretynow ? [IN] +[15:37:01] < gausus> chociaz w sumie [IN] +[15:37:11] < gausus> moze to i lepiej niz jakby mialo po nas cos wiecej pozostac ;) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.426&r2=1.427&f=u From arekm at pld-linux.org Thu Aug 25 16:09:50 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (DEVEL): php.spec - started 5.1 (cpdf, dbx, dio, fam, mnogos... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 14:09:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ---- Files affected: SPECS: php.spec (1.467 -> 1.467.2.1) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467 SPECS/php.spec:1.467.2.1 --- SPECS/php.spec:1.467 Tue Aug 23 12:31:11 2005 +++ SPECS/php.spec Thu Aug 25 16:09:44 2005 @@ -5,7 +5,6 @@ # - mcve, # - ovrimos, # - pfpro, -# - ircg, # These extensions BuildRequires proprietary libraries... # - deal with modules removed from php and not moved to PECL # (existing only in php4): @@ -24,16 +23,13 @@ %bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) %bcond_with oracle # with oracle extension module (BR: proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) -%bcond_without cpdf # without cpdf extension module %bcond_without curl # without CURL extension module -%bcond_without fam # without FAM (File Alteration Monitor) extension module %bcond_without imap # without IMAP extension module %bcond_with interbase # with InterBase extension module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension module %bcond_without ming # without ming extension module %bcond_without mm # without mm support for session storage -%bcond_without mnogosearch # without mnogosearch extension module %bcond_without msession # without msession extension module %bcond_without mssql # without MS SQL extension module %bcond_without odbc # without ODBC extension module @@ -77,13 +73,14 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.0.4 -Release: 10%{?with_hardening:hardened} +Version: 5.1.0 +%define _rc RC1 +Release: 0.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 -# Source0-md5: fb1aac107870f897d26563a9cc5053c0 +Source0: http://www.php.net/distributions/%{name}-%{version}%{_rc}.tar.bz2 +# Source0-md5: c7aebeb915e6f898559365cf82493ad0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -114,7 +111,6 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch -Patch20: %{name}-mnogosearch-fix.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -122,7 +118,6 @@ Patch25: %{name}-hwapi-link.patch Patch26: %{name}-dba-link.patch Patch27: %{name}-install_gd_headers.patch -Patch28: %{name}-cpdf-fix.patch Patch29: %{name}-gcc4.patch Patch30: %{name}-hardening-fix.patch Patch31: %{name}-both-apxs.patch @@ -142,7 +137,6 @@ %if %{with xmlrpc} BuildRequires: expat-devel %endif -%{?with_fam:BuildRequires: fam-devel} %{?with_fdf:BuildRequires: fdftk-devel} BuildRequires: fcgi-devel BuildRequires: flex @@ -154,7 +148,6 @@ BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2} -%{?with_cpdf:BuildRequires: libcpdf-devel >= 2.02r1-2} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 @@ -166,7 +159,6 @@ %{?with_mhash:BuildRequires: mhash-devel} %{?with_ming:BuildRequires: ming-devel >= 0.1.0} %{?with_mm:BuildRequires: mm-devel >= 1.3.0} -%{?with_mnogosearch:BuildRequires: mnogosearch-devel >= 3.2.6} BuildRequires: mysql-devel >= 4.0.0 %{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0} BuildRequires: ncurses-ext-devel @@ -195,7 +187,7 @@ BuildRequires: apache1-devel %endif %if %{with apache2} -BuildRequires: apache-devel >= 2.0.52-2 +BuildRequires: apache-devel >= 2.0.44-1 BuildRequires: apr-devel >= 1:1.0.0 BuildRequires: apr-util-devel >= 1:1.0.0 %endif @@ -465,20 +457,6 @@ %description calendar -l pl Modu? PHP dodaj?cy wsparcie dla kalendarza. -%package cpdf -Summary: cpdf extension module for PHP -Summary(pl): Modu? cpdf dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description cpdf -This is a dynamic shared object (DSO) for PHP that will add PDF -support through libcpdf library. - -%description cpdf -l pl -Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. - %package ctype Summary: ctype extension module for PHP Summary(pl): Modu? ctype dla PHP @@ -536,36 +514,6 @@ %description dbase -l pl Modu? PHP ze wsparciem dla DBase. -%package dbx -Summary: DBX extension module for PHP -Summary(pl): Modu? DBX dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dbx -This is a dynamic shared object (DSO) for PHP that will add DB -abstraction layer. DBX supports odbc, mysql, pgsql, mssql, fbsql and -more. - -%description dbx -l pl -Modu? PHP dodaj?cy warstw? abstrakcji do obs?ugi baz danych. DBX -obs?uguje bazy odbc, mysql, pgsql, mssql, fbsql i inne. - -%package dio -Summary: Direct I/O extension module for PHP -Summary(pl): Modu? Direct I/O dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dio -This is a dynamic shared object (DSO) for PHP that will add direct -file I/O support. - -%description dio -l pl -Modu? PHP dodaj?cy obs?ug? bezpo?rednich operacji I/O na plikach. - %package dom Summary: DOM extension module for PHP Summary(pl): Modu? DOM dla PHP @@ -597,23 +545,6 @@ %description exif -l pl Modu? PHP dodaj?cy obs?ug? znacznik?w EXIF w plikach obrazk?w. -%package fam -Summary: FAM (File Alteration Monitor) module for PHP -Summary(pl): Modu? FAM (File Alteration Monitor) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description fam -This PHP module adds support for FAM (File Alteration Monitor). -FAM monitors files and directories, notifying interested applications -of changes. - -%description fam -l pl -Modu? PHP dodaj?cy obs?ug? dla FAM (File Alteration Monitor). -FAM monitoruje pliki oraz katalogi, informuj?c zainteresowane aplikacje -o zmianach. - %package fdf Summary: FDF extension module for PHP Summary(pl): Modu? FDF dla PHP @@ -856,21 +787,6 @@ Modu? PHP dodaj?cy obs?ug? plik?w Flash (.swf) poprzez bibliotek? ming. -%package mnogosearch -Summary: mnoGoSearch extension module for PHP -Summary(pl): Modu? mnoGoSearch dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description mnogosearch -This is a dynamic shared object (DSO) for PHP that will allow you to -access mnoGoSearch free search engine. - -%description mnogosearch -l pl -Modu? PHP dodaj?cy pozwalaj?cy na dost?p do wolnodost?pnego silnika -wyszukiwarki mnoGoSearch. - %package msession Summary: msession extension module for PHP Summary(pl): Modu? msession dla PHP @@ -1401,20 +1317,6 @@ %description xsl -l pl Modu? PHP dodaj?cy now? obs?ug? XSLT (przy u?yciu libxslt). -%package yp -Summary: NIS (yp) extension module for PHP -Summary(pl): Modu? NIS (yp) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description yp -This is a dynamic shared object (DSO) for PHP that will add NIS -(Yellow Pages) support. - -%description yp -l pl -Modu? PHP dodaj?cy wsparcie dla NIS (Yellow Pages). - %package zlib Summary: Zlib extension module for PHP Summary(pl): Modu? zlib dla PHP @@ -1430,7 +1332,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1441,23 +1343,24 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +# FIXME; it's still needed? +# %patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 -%patch12 -p1 -%patch13 -p1 +# DROPME: not needed +# %patch12 -p1 +# DROPME: seems not needed +# %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 -%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1465,8 +1368,9 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -%patch27 -p1 -%patch29 -p1 +# FIXME: ??? +# %patch27 -p1 +# %patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -1546,8 +1450,6 @@ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ - --enable-dbx=shared \ - --enable-dio=shared \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1573,9 +1475,8 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --enable-yp=shared \ + --with-xmlreader \ --with-bz2=shared \ - %{?with_cpdf:--with-cpdflib=shared} \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ --with-dbase=shared \ @@ -1586,7 +1487,6 @@ %endif %{?with_fdf:--with-fdftk=shared} \ --with-iconv=shared \ - %{?with_fam:--with-fam=shared} \ --with-filepro=shared \ --with-freetype-dir=shared \ --with-gettext=shared \ @@ -1597,13 +1497,12 @@ %{?with_imap:--with-imap=shared --with-imap-ssl} \ %{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \ --with-jpeg-dir=/usr \ - %{?with_ldap:--with-ldap=shared} \ + %{?with_ldap:--with-ldap=shared --with-ldap-sasl} \ --with-mcrypt=shared \ %{?with_mhash:--with-mhash=shared} \ --with-mime-magic=shared,/usr/share/file/magic.mime \ %{?with_ming:--with-ming=shared} \ %{?with_mm:--with-mm} \ - %{!?with_mnogosearch:--without-mnogosearch}%{?with_mnogosearch:--with-mnogosearch=shared,/usr} \ %{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \ %{?with_mssql:--with-mssql=shared} \ --with-mysql=shared,/usr \ @@ -1612,6 +1511,7 @@ --with-ncurses=shared \ %{?with_oci8:--with-oci8=shared} \ %{?with_openssl:--with-openssl=shared} \ + --with-kerberos \ %{?with_oracle:--with-oracle=shared} \ %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared} \ --with-pear=%{php_pear_dir} \ @@ -1625,11 +1525,11 @@ %{?with_snmp:--with-snmp=shared} \ %{?with_sybase:--with-sybase=shared,/usr} \ %{?with_sybase_ct:--with-sybase-ct=shared,/usr} \ - %{?with_sqlite:--with-sqlite=shared,/usr} \ + %{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \ --with-t1lib=shared \ %{?with_tidy:--with-tidy=shared} \ --with-tiff-dir=/usr \ - %{?with_odbc:--with-unixODBC=shared} \ + %{?with_odbc:--with-unixODBC=shared,/usr} \ %{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \ --with-xsl=shared \ --with-zlib=shared \ @@ -1879,12 +1779,6 @@ %postun calendar %extension_postun -%post cpdf -%extension_post - -%postun cpdf -%extension_postun - %post ctype %extension_post @@ -1909,18 +1803,6 @@ %postun dbase %extension_postun -%post dbx -%extension_post - -%postun dbx -%extension_postun - -%post dio -%extension_post - -%postun dio -%extension_postun - %post dom %extension_post @@ -1933,12 +1815,6 @@ %postun exif %extension_postun -%post fam -%extension_post - -%postun fam -%extension_postun - %post fdf %extension_post @@ -2035,12 +1911,6 @@ %postun ming %extension_postun -%post mnogosearch -%extension_post - -%postun mnogosearch -%extension_postun - %post msession %extension_post @@ -2272,12 +2142,6 @@ %postun xsl %extension_postun -%post yp -%extension_post - -%postun yp -%extension_postun - %post zlib %extension_post @@ -2293,9 +2157,6 @@ %triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini -%triggerun cpdf -- %{name}-cpdf < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove cpdf %{_sysconfdir}/php.ini - %triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini @@ -2308,21 +2169,12 @@ %triggerun dbase -- %{name}-dbase < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini -%triggerun dbx -- %{name}-dbx < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbx %{_sysconfdir}/php.ini - -%triggerun dio -- %{name}-dio < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dio %{_sysconfdir}/php.ini - %triggerun dom -- %{name}-dom < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dom %{_sysconfdir}/php.ini %triggerun exif -- %{name}-exif < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini -%triggerun fam -- %{name}-fam < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fam %{_sysconfdir}/php.ini - %triggerun fdf -- %{name}-fdf < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fdf %{_sysconfdir}/php.ini @@ -2371,9 +2223,6 @@ %triggerun ming -- %{name}-ming < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini -%triggerun mnogosearch -- %{name}-mnogosearch < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mnogosearch %{_sysconfdir}/php.ini - %triggerun msession -- %{name}-msession < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini @@ -2461,9 +2310,6 @@ %triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xsl %{_sysconfdir}/php.ini -%triggerun yp -- %{name}-yp < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove yp %{_sysconfdir}/php.ini - %triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini @@ -2544,13 +2390,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so -%if %{with cpdf} -%files cpdf -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/cpdf.ini -%attr(755,root,root) %{extensionsdir}/cpdf.so -%endif - %files ctype %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini @@ -2573,28 +2412,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so -%files dbx -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbx.ini -%attr(755,root,root) %{extensionsdir}/dbx.so - -%files dio -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dio.ini -%attr(755,root,root) %{extensionsdir}/dio.so - %files dom %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so -%if %{with fam} -%files fam -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fam.ini -%attr(755,root,root) %{extensionsdir}/fam.so -%endif - %if %{with fdf} %files fdf %defattr(644,root,root,755) @@ -2694,13 +2516,6 @@ %attr(755,root,root) %{extensionsdir}/ming.so %endif -%if %{with mnogosearch} -%files mnogosearch -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mnogosearch.ini -%attr(755,root,root) %{extensionsdir}/mnogosearch.so -%endif - %if %{with msession} %files msession %defattr(644,root,root,755) @@ -2894,11 +2709,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xsl.ini %attr(755,root,root) %{extensionsdir}/xsl.so -%files yp -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/yp.ini -%attr(755,root,root) %{extensionsdir}/yp.so - %files zlib %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/zlib.ini @@ -2910,6 +2720,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.1 2005/08/25 14:09:44 arekm +- started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy + Revision 1.467 2005/08/23 10:31:11 glen - rel 10 for finished conf.d support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467&r2=1.467.2.1&f=u From arekm at pld-linux.org Thu Aug 25 16:10:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: php-5.1.0RC1.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz Message-ID: <15469.1124979007@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.php.net/distributions/php-5.1.0RC1.tar.bz2 c7aebeb915e6f898559365cf82493ad0 php-5.1.0RC1.tar.bz2 Size: 5989455 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- Virtually Yours: distfiles. From andree at pld-linux.org Thu Aug 25 16:58:32 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: VMware-workstation.spec - added bcond to build kernel24 mod... In-Reply-To: References: Message-ID: Author: andree Date: Thu Aug 25 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added bcond to build kernel24 modules ---- Files affected: SPECS: VMware-workstation.spec (1.66 -> 1.67) ---- Diffs: ================================================================ Index: SPECS/VMware-workstation.spec diff -u SPECS/VMware-workstation.spec:1.66 SPECS/VMware-workstation.spec:1.67 --- SPECS/VMware-workstation.spec:1.66 Sat Aug 20 02:06:15 2005 +++ SPECS/VMware-workstation.spec Thu Aug 25 16:58:27 2005 @@ -9,10 +9,14 @@ %bcond_without kernel # don't build kernel modules %bcond_without smp # without SMP kernel modules %bcond_without userspace # don't build userspace utilities +%bcond_with kernel24 # build kernel24 modules (disable kernel26) %bcond_with internal_libs # internal libs stuff %bcond_with verbose # verbose build (V=1) # %include /usr/lib/rpm/macros.perl +%if %{with kernel24} +%define _kernelsrcdir /usr/src/linux-2.4 +%endif # %define _ver 5.0.0 %define _build 13124 @@ -192,6 +196,82 @@ %description -n kernel-smp-misc-vmnet -l pl Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. +%package -n kernel24-misc-vmmon +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-misc-vmmon +Kernel modules for VMware Workstation - vmmon. + +%description -n kernel24-misc-vmmon -l pl +Modu?y j?dra dla VMware Workstation - vmmon. + +%package -n kernel24-misc-vmnet +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-misc-vmnet +Kernel modules for VMware Workstation - vmnet. + +%description -n kernel24-misc-vmnet -l pl +Modu?y j?dra dla VMware Workstation - vmnet. + +%package -n kernel24-smp-misc-vmmon +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmmon +SMP kernel modules fov VMware Workstation - vmmon-smp. + +%description -n kernel24-smp-misc-vmmon -l pl +Modu?y j?dra SMP dla VMware Workstation - vmmon-smp. + +%package -n kernel24-smp-misc-vmnet +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmnet +SMP kernel module for VMware Workstation - vmnet-smp. + +%description -n kernel24-smp-misc-vmnet -l pl +Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. + %prep %setup -q -n vmware-distrib %setup -qDT -n vmware-distrib -a1 @@ -220,6 +300,8 @@ %if %{with kernel} rm -rf built mkdir built + +%if %{without kernel24} cp -a vmmon-only vmmon-only.clean cp -a vmnet-only vmnet-only.clean for mod in vmmon vmnet ; do @@ -244,7 +326,42 @@ cd - done done -cd .. + +%else +for mod in vmmon vmnet ; do + rm -rf $mod-only + tar xf $mod.tar + cd $mod-only + sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile + sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile + +%if %{with smp} + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod-smp.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod-smp.o + fi + + %{__make} VM_KBUILD=no clean +%endif + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod.o + fi + + cd .. +done +%endif # kernel24 + %endif %install @@ -267,6 +384,8 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc cd vmware-any-any-update%{_urel} + +%if %{without kernel24} install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ @@ -277,6 +396,21 @@ install built/vmnet-smp.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko %endif + +%else +install built/vmmon.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.o +install built/vmnet.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.o +%if %{with smp} && %{with dist_kernel} +install built/vmmon-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.o +install built/vmnet-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.o +%endif + +%endif + cd - %endif @@ -358,6 +492,30 @@ %postun -n kernel-smp-misc-vmnet %depmod %{_kernel_ver}smp +%post -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%post -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%post -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%post -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + %if %{with userspace} %files %defattr(644,root,root,755) @@ -428,6 +586,7 @@ %endif %if %{with kernel} +%if %{without kernel24} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -445,6 +604,28 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko* %endif + +%else +%files -n kernel24-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmmon.o* + +%files -n kernel24-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmnet.o* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel24-smp-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmmon.o* + +%files -n kernel24-smp-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmnet.o* +%endif + +%endif + %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -453,6 +634,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.67 2005/08/25 14:58:27 andree +- added bcond to build kernel24 modules + Revision 1.66 2005/08/20 00:06:15 charles - rpmbuild(macros) >= 1.217 - added kernel, userspace, verbose bconds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.66&r2=1.67&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: horde.spec - added GeoIP database In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 15:35:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added GeoIP database ---- Files affected: SPECS: horde.spec (1.97 -> 1.98) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.97 SPECS/horde.spec:1.98 --- SPECS/horde.spec:1.97 Thu Aug 25 14:59:58 2005 +++ SPECS/horde.spec Thu Aug 25 17:35:46 2005 @@ -22,6 +22,8 @@ Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz # Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf +Source2: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz +# Source2-md5: 4f29410e385065eaa37037c1b1a44695 Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch @@ -149,6 +151,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +# MaxMind GeoIP Hostname Country lookup + +install %{SOURCE2} $RPM_BUILD_ROOT/var/lib/horde/ + > $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log install scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir} @@ -181,6 +187,9 @@ NOTE: You don't need SQL database for Auhtorization if You use LDAP for authorization. +If you want to use MaxMind GeoIP Hostname Country lookup do 'gunzip /var/lib/horde/GeoIP.dat.gz' +and enable this function in horde configuration. + EOF # ' @@ -300,6 +309,7 @@ %dir %attr(770,root,http) /var/log/%{name} %dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log +%attr(640,root,http) /var/lib/%{name}/GeoIP.dat.gz %files -n openldap-schema-horde %defattr(644,root,root,755) @@ -311,6 +321,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.98 2005/08/25 15:35:46 paszczus +- added GeoIP database + Revision 1.97 2005/08/25 12:59:58 paszczus - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.97&r2=1.98&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: horde-3.0.5.tar.gz GeoIP.dat.gz Message-ID: <7880.1124984152@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz STORED: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz 4f29410e385065eaa37037c1b1a44695 GeoIP.dat.gz Size: 418910 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Thu Aug 25 18:08:40 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: adapter.awk - spaces -> tabs, pld-linux.org In-Reply-To: References: Message-ID: Author: wolf Date: Thu Aug 25 16:08:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs, pld-linux.org ---- Files affected: SPECS: adapter.awk (1.173 -> 1.174) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.173 SPECS/adapter.awk:1.174 --- SPECS/adapter.awk:1.173 Thu Aug 25 13:03:07 2005 +++ SPECS/adapter.awk Thu Aug 25 18:08:33 2005 @@ -7,9 +7,9 @@ # Micha? Kuratczyk # Sebastian Zagrodzki # Tomasz K?oczko -# Artur Frysiak +# Artur Frysiak # Michal Kochanowicz -# Elan Ruusam?e +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.173&r2=1.174&f=u From glen at pld-linux.org Thu Aug 25 18:21:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: egroupware.spec - created virtual DB packages to let user c... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 16:21:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created virtual DB packages to let user choose just one database ---- Files affected: SPECS: egroupware.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.7 SPECS/egroupware.spec:1.8 --- SPECS/egroupware.spec:1.7 Thu Aug 25 12:11:52 2005 +++ SPECS/egroupware.spec Thu Aug 25 18:21:09 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.9 +Release: 0.12 Epoch: 0 License: GPL Group: Applications/WWW @@ -14,10 +14,8 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b Source1: %{name}.conf URL: http://www.egroupware.org/ +Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-mysql -Requires: php-pgsql -#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -40,6 +38,33 @@ adresow?, kalendarz, infolog (notatki, rzeczy do zrobienia, rozmowy telefoniczne), zarz?dzanie tre?ci?, forum, zak?adki, wiki. +%package db-mysql +Summary: eGroupware DB Driver for MySQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mysql + +%description db-mysql +This virtual package provides MySQL database backend for eGroupware. + +%package db-pgsql +Summary: eGroupware DB Driver for PostgreSQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-pgsql + +%description db-pgsql +This virtual package provides PostgreSQL database backend for eGroupware. + +%package db-mssql +Summary: eGroupware DB Driver for MS SQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mssql + +%description db-mssql +This virtual package provides MS SQL database backend for eGroupware. + %prep %setup -q -n %{name} @@ -138,12 +163,24 @@ %{_appdir}/fudforum/setup %{_appdir}/fudforum/templates +%files db-mysql +%defattr(644,root,root,755) + +%files db-pgsql +%defattr(644,root,root,755) + +%files db-mssql +%defattr(644,root,root,755) + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 16:21:09 glen +- created virtual DB packages to let user choose just one database + Revision 1.7 2005/08/25 10:11:52 glen - permission changes, check_install.php passed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Thu Aug 25 19:04:50 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atmdd patch ported from 2.4 In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:04:50 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atmdd patch ported from 2.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1163 -> 1.441.2.1164) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1163 SPECS/kernel.spec:1.441.2.1164 --- SPECS/kernel.spec:1.441.2.1163 Thu Aug 25 15:39:05 2005 +++ SPECS/kernel.spec Thu Aug 25 19:04:44 2005 @@ -5,7 +5,6 @@ # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs # - check and maybe port ATM patches from 2.4 # linux-2.4.22-fore200e-0.2f.patch -# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -258,6 +257,7 @@ Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch # Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs Patch115: linux-2.6-atm-vbr.patch +Patch116: linux-2.6-atmdd.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -694,6 +694,7 @@ %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1487,6 +1488,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1164 2005/08/25 17:04:44 baggins +- atmdd patch ported from 2.4 + Revision 1.441.2.1163 2005/08/25 13:39:05 baggins - TODO updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1163&r2=1.441.2.1164&f=u From baggins at pld-linux.org Thu Aug 25 19:06:41 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SOURCES: linux-2.6-atmdd.patch (NEW) - ported from linux-2.4.25-at... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:06:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported from linux-2.4.25-atmdd.patch ---- Files affected: SOURCES: linux-2.6-atmdd.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atmdd.patch diff -u /dev/null SOURCES/linux-2.6-atmdd.patch:1.1 --- /dev/null Thu Aug 25 19:06:41 2005 +++ SOURCES/linux-2.6-atmdd.patch Thu Aug 25 19:06:36 2005 @@ -0,0 +1,953 @@ +diff -urN linux-2.4.25/drivers/atm/Makefile linux-2.4.25-atmdd/drivers/atm/Makefile +--- linux-2.4.25/drivers/atm/Makefile 2004-02-23 15:18:29.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/Makefile 2004-02-29 22:51:26.000000000 +0100 +@@ -31,6 +31,7 @@ + obj-$(CONFIG_ATM_IDT77252) += suni.o + endif + ++obj-$(CONFIG_ATM_DD) += atmdd.o + obj-$(CONFIG_ATM_TCP) += atmtcp.o + obj-$(CONFIG_ATM_FIRESTREAM) += firestream.o + obj-$(CONFIG_ATM_LANAI) += lanai.o +diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfig +--- linux-2.4.25/drivers/atm/Kcnfig 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.25-atmdd/drivers/atm/Kconfig 2004-02-29 22:52:59.000000000 +0100 +@@ -4,6 +4,14 @@ + + menu "ATM drivers" + depends on NETDEVICES && ATM ++ ++config ATM_DD ++ tristate "ATM loopback" ++ depends on INET && ATM ++ help ++ This is an example atm driver. It does not require any actual ATM ++ hardware. It supports AAL5 and AAL0. Frames are merely looped back ++ to the sender on the same VC they were sent. + + config ATM_TCP + tristate "ATM over TCP" +diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.c +--- linux-2.4.25/drivers/atm/atmdd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/atmdd.c 2004-02-29 22:58:11.000000000 +0100 +@@ -0,0 +1,920 @@ ++/* ++####################################################################### ++# ++# (C) Copyright 2001 ++# Alex Zeffertt, Cambridge Broadband Ltd, ajz@cambridgebroadband.com ++# ++# 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 ++####################################################################### ++# Notes: ++# ++# This is an example atm driver. It does not require any actual ATM ++# hardware. It supports AAL5 and AAL0. frames are merely looped back ++# to the sender on the same VC they were sent. ++# ++####################################################################### ++*/ ++ ++/*############ Includes ###############################################*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* for xtime */ ++ ++/*############ Defines ################################################*/ ++ ++#define MYATMDD "atmdd" ++#define KLOG_PREAMBLE MYATMDD ": " ++#define MYATMDD_VPI_BITS 1 /* Allow ?.1.? but not ?.2.? */ ++#define MYATMDD_VCI_BITS 11 /* Allow ?.?.2047 but not ?.?.2048 */ ++#define MYATMDD_PCR 100000 ++#define RXQ_SZ 16 ++#define TXQ_SZ 16 ++#define AAL5_MTU (1510+8) /* Default AAL5 Maximum Transmission Unit (and length of AAL5 buffers) */ ++#define AAL5_BUFLEN (((AAL5_MTU + 47)/48)*48) /* Round up to n*48 bytes */ ++#if 0 ++# define DEBUG(format,args...) printk(format,##args) ++#else ++# define DEBUG(format,args...) ++#endif ++/*############ Types ##################################################*/ ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ RX_EMPTY, /* No sk_buff present */ ++ RX_FULL, /* sk_buff present and awaiting data */ ++ RX_RECVD, /* sk_buff present and contains valid data */ ++} myatmdd_rxstatus_e; ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ TX_EMPTY, /* No sk_buff present */ ++ TX_FULL, /* sk_buff present and awaiting transmission */ ++ TX_SENT, /* sk_buff present and has been sent */ ++} myatmdd_txstatus_e; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_rxstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_rxq_t; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_txstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_txq_t; ++ ++typedef struct { ++} myatmdd_devdata_t; ++ ++typedef struct { ++ myatmdd_rxq_t rxqueue; ++ myatmdd_txq_t txqueue; ++} myatmdd_vccdata_t; ++ ++/*############ Module paramters #######################################*/ ++ ++MODULE_AUTHOR("Alex Zeffertt, ajz@cambridgebroadband.com"); ++MODULE_DESCRIPTION("Example ATM device driver (loopback)"); ++#ifdef MODULE_LICENSE ++MODULE_LICENSE("GPL"); ++#endif ++/*#################### Forward declarations ###########################*/ ++ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc); ++ ++static void myatmdd_free_tx_skb(struct sk_buff *skb); ++ ++/* these functions will need modifying in a real ATM driver */ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc); ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc); ++ ++/* functions for manipulating circular bufs */ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size); ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size); ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue); ++static int myatmdd_release_txq(myatmdd_txq_t *queue); ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb); ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */); ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue); ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len); ++ ++/* myatmdd_ops registered by ATM device */ ++static int myatmdd_open(struct atm_vcc *vcc); ++static void myatmdd_close(struct atm_vcc *vcc); ++static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg); ++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb); ++static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs); ++static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page); ++ ++/* myatmdd_phy_ops registered by phy driver */ ++static void myatmdd_phy_int(struct atm_dev *dev); ++static int myatmdd_phy_start(struct atm_dev *dev); /* <-- This is the only thing exported by PHY driver */ ++static int myatmdd_phy_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg); ++ ++/*#################### Global scope variables #########################*/ ++ ++/* operations registered by the atm device */ ++static const struct atmdev_ops myatmdd_ops = ++{ ++ open: myatmdd_open, ++ close: myatmdd_close, ++ ioctl: myatmdd_ioctl, ++ getsockopt: myatmdd_getsockopt, ++ setsockopt: myatmdd_setsockopt, ++ send: myatmdd_send, ++ change_qos: myatmdd_change_qos, ++ proc_read: myatmdd_proc_read, ++ owner: THIS_MODULE, ++}; ++ ++/* operations registered by the phy driver */ ++static const struct atmphy_ops myatmdd_phy_ops = { ++ start: myatmdd_phy_start, ++ ioctl: myatmdd_phy_ioctl, ++ interrupt: myatmdd_phy_int, ++}; ++ ++struct atm_dev *myatmdd_dev; ++ ++/*#################### Function definitions ###########################*/ ++ ++ ++/* ++######################################################### ++# ++# Function : myatmdd_rx_interrupt, and myatmdd_tx_interrupt ++# ++# Purpose : handle interrupt from hardware. In first ++# case this means extract recvd buffers and pass ++# it up protocol stack. In 2nd case this means ++# free the sent buffers. ++# ++# Args : pointer to private data of the VCC concerned ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ int pkt_len; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len))) ++ { ++ struct sk_buff *newskb; ++ ++ /* Get a new skb to replace the one just consumed */ ++ if (!(newskb = dev_alloc_skb(AAL5_BUFLEN))) ++ { ++ atomic_inc(&vcc->stats->rx_err); ++ printk(KERN_ERR KLOG_PREAMBLE "cannot receive packet - out of memory\n"); ++ /* put skb back in rx queue) */ ++ myatmdd_rxq_enqueue(&priv->rxqueue, skb); ++ return; ++ } ++ myatmdd_rxq_enqueue(&priv->rxqueue, newskb); ++ ++ if (!atm_charge (vcc, skb->truesize)) ++ { ++ /* Exceeded memory quota for this vcc ++ * NOTE: if atm_charge succeeds you must then push or accounting will screw up ++ */ ++ dev_kfree_skb(skb); ++ /* &vcc->stats->drop stats incremented in atm_charge */ ++ } ++ else ++ { ++ /* sk_buff passed all sanity checks! */ ++ ++ /* Add received length to socket buffer */ ++ skb_put(skb, pkt_len); ++ ++ /* update device stats */ ++ atomic_inc(&vcc->stats->rx); ++ ++ /* add timestamp for upper layers to use */ ++ do_gettimeofday(&skb->stamp); ++ ++ /* Point socket buffer at the right VCC before giving to socket layer */ ++ ATM_SKB(skb)->vcc = vcc; ++ ++ /* push socket buffer up to ATM layer */ ++ vcc->push(vcc, skb); ++ } ++ } ++} ++ ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_txq_dequeue(&priv->txqueue))) ++ { ++ // Update channel stats and free the memory ++ atomic_inc(&vcc->stats->tx); ++ myatmdd_free_tx_skb(skb); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : myatmdd_emulate_loopback_hardware ++# ++# Purpose : emulate things normally done by hardware ++# i.e. copying tx bufs to rx bufs (we're modelling ++# a loopback system here), calling the tx done ++# interrupt, and calling the rx done interrupt. ++# ++# Args : priv = data private to VCC ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc) ++{ ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ struct sk_buff **ptxskb; ++ struct sk_buff **prxskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ ptxskb = priv->txqueue.hw_ptr; ++ prxskb = priv->rxqueue.hw_ptr; ++ ++ /* Send each tx buff waiting to go */ ++ while (priv->txqueue.status[ptxskb - priv->txqueue.start] == TX_FULL) ++ { ++ struct sk_buff *txskb = *ptxskb; ++ struct sk_buff *rxskb = *prxskb; ++ int pkt_len = priv->txqueue.pkt_len[ptxskb - priv->txqueue.start]; ++ ++ /* Is there an rx buffer? */ ++ if (priv->rxqueue.status[prxskb - priv->rxqueue.start] == RX_FULL) ++ { ++ /* Yes - Is the length in range? */ ++ if (pkt_len <= AAL5_BUFLEN) ++ { ++ /* Yes - do the copy */ ++ memcpy(rxskb->data, txskb->data,pkt_len); ++ priv->rxqueue.pkt_len[prxskb - priv->rxqueue.start] = pkt_len; ++ ++ /* Indicate rx buffer recvd */ ++ priv->rxqueue.status[prxskb - priv->rxqueue.start] = RX_RECVD; ++ ++ /* increment and maybe wrap rx pointer */ ++ if (++prxskb == priv->rxqueue.end) ++ prxskb = priv->rxqueue.start; ++ priv->rxqueue.hw_ptr = prxskb; ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "recvd frame too long - discarded\n"); ++ } ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "no rx buffers available\n"); ++ } ++ ++ /* Indicate tx buffer sent */ ++ priv->txqueue.status[ptxskb - priv->txqueue.start] = TX_SENT; ++ ++ /* increment and maybe wrap tx pointer */ ++ if (++ptxskb == priv->txqueue.end) ++ ptxskb = priv->txqueue.start; ++ priv->txqueue.hw_ptr = ptxskb; ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_tx_interrupt(vcc); ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_rx_interrupt(vcc); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : functions for manipulating circular buffs ++# ++# Purpose : ++# ++# Args : ++# ++# Returns : ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = RX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = TX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is there an skb here */ ++ if (*pskb == NULL) ++ continue; /* No, so skip this entry in ring */ ++ ++ /* Yes - free it */ ++ dev_kfree_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++static int myatmdd_release_txq(myatmdd_txq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ /* Scan through all TX bd's and cleanup */ ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is this buffer currently unused - i.e. no skb */ ++ if (*pskb == NULL) ++ continue; /* Yes, so ignore it */ ++ ++ /* If we reach here, we have found a socket buffer that ++ * exists in the TX ring and is waiting to be released. ++ */ ++ printk(KERN_WARNING KLOG_PREAMBLE "discarding unsent tx sk_buff\n"); ++ atomic_inc(&ATM_SKB(*pskb)->vcc->stats->tx_err); ++ myatmdd_free_tx_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if tx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = TX_FULL; ++ queue->pkt_len[queue->head - queue->start] = skb->len; ++ queue->head = newhead; ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if rx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = RX_FULL; ++ queue->head = newhead; ++ return 0; ++} ++ ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == TX_SENT) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = TX_EMPTY; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* returns NULL for "no new recvd frames" */ ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == RX_RECVD) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = RX_EMPTY; ++ *pkt_len = queue->pkt_len[queue->tail - queue->start]; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* ++######################################################### <> From baggins at pld-linux.org Thu Aug 25 19:09:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM TODO done In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:09:53 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM TODO done ---- Files affected: SPECS: kernel.spec (1.441.2.1164 -> 1.441.2.1165) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1164 SPECS/kernel.spec:1.441.2.1165 --- SPECS/kernel.spec:1.441.2.1164 Thu Aug 25 19:04:44 2005 +++ SPECS/kernel.spec Thu Aug 25 19:09:47 2005 @@ -3,8 +3,6 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs -# - check and maybe port ATM patches from 2.4 -# linux-2.4.22-fore200e-0.2f.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1488,6 +1486,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1165 2005/08/25 17:09:47 baggins +- ATM TODO done + Revision 1.441.2.1164 2005/08/25 17:04:44 baggins - atmdd patch ported from 2.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1164&r2=1.441.2.1165&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: open4-0.1.0.tgz Message-ID: <12632.1124997894@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.codeforpeople.com/lib/ruby/open4/open4-0.1.0.tgz aab7035d09a19af38a7468d7f1cb93c9 open4-0.1.0.tgz Size: 2918 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 09:12:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: subversion-1.2.3.tar.bz2 Message-ID: <6823.1125040338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://subversion.tigris.org/tarballs/subversion-1.2.3.tar.bz2 a14bc6590241b6e5c2ff2b354cc184a1 subversion-1.2.3.tar.bz2 Size: 7238176 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:57:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: mdadm-2.0.tar.bz2 Message-ID: <15335.1125061047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 802f301ea67db14773f49d6bed4f2411 mdadm-2.0.tar.bz2 Size: 102270 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 20:25:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: mysql-4.1.14.tar.gz Message-ID: <8345.1124994338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.dataphone.se/Downloads/MySQL-4.1/mysql-4.1.14.tar.gz 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz Size: 17074439 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: openvpn-2.0.2.tar.gz Message-ID: <32021.1125001715@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.2.tar.gz 862f8788f080f669b1ae00a74ef68001 openvpn-2.0.2.tar.gz Size: 663246 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Fri Aug 26 05:55:56 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: cairo-1.0.0.tar.gz Message-ID: <19931.1125028556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://cairographics.org/releases/cairo-1.0.0.tar.gz f0ff35c91983b7bf226154e68b280be3 cairo-1.0.0.tar.gz Size: 1439299 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 15:01:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: mdadm-1.12.0.tar.bz2 Message-ID: <18114.1125061306@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 736705240e918294740929518477fc6f mdadm-1.12.0.tar.bz2 Size: 79934 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:49:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ERRORS: mdadm-1.12.0.tar.bz2 Message-ID: <9701.1125060558@distfiles.pld-linux.org> FATAL: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 md5 mismatch, needed 4de899ddb1ede1d2cafd183794874ce1, got 736705240e918294740929518477fc6f Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <23028.1124995811@distfiles.pld-linux.org> wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <23163.1124995818@distfiles.pld-linux.org> wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From jajcus at pld-linux.org Fri Aug 26 10:43:25 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <31468.1125045805@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 08:25:29 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ooo-build-1.9.124.tar.gz src680-m124-core.tar.bz2 src680-m124-system.tar.bz2 src680-m124-binfilter.tar.bz2 src680-m124-lang.tar.bz2 ooo_custom_images-13.tar.bz2 ooo_crystal_images-6.tar.bz2 extras-2.tar.bz2 libwpd-0.8.0.tar.gz mdbtools-0.6pre1.tar.gz ... Message-ID: <10770.1125037529@distfiles.pld-linux.org> Files fetched: 5 STORED: http://go-ooo.org/packages/SRC680/ooo-build-1.9.124.tar.gz a82488bad72ea7006c7b269ad0652660 ooo-build-1.9.124.tar.gz Size: 4031429 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-core.tar.bz2 1f79a23b6d6a1339b137d12b156583a6 src680-m124-core.tar.bz2 Size: 157886806 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-system.tar.bz2 db7079c78028378224aeb0f282cb051e src680-m124-system.tar.bz2 Size: 18886198 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-binfilter.tar.bz2 a11c3419e5be158056bfbe8f16bcc65a src680-m124-binfilter.tar.bz2 Size: 18513561 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-lang.tar.bz2 dc8bd51c89a032e9156a53a38039150d src680-m124-lang.tar.bz2 Size: 29036821 bytes ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2 2480af7f890c8175c7f9e183a1b39ed2 ooo_custom_images-13.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/extras-2.tar.bz2 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/libwpd/libwpd-0.8.0.tar.gz 98e59beecc112339bb78654863304c1c libwpd-0.8.0.tar.gz ALREADY GOT: http://go-ooo.org/packages/SRC680/mdbtools-0.6pre1.tar.gz 246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_01_unix.tgz 7da2aff674c2c84aba8b21ac2ab16bb6 helpcontent_01_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_31_unix.tgz c7e618e2d9b8bd25cae12954ef2548c9 helpcontent_31_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_33_unix.tgz 68d58bc30b485a77c0a0fba08af3aee3 helpcontent_33_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_34_unix.tgz 8696bbee3dc4d5b6fd60218123016e29 helpcontent_34_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_39_unix.tgz c2ae86d02f462d2b663d621190f5ef34 helpcontent_39_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_46_unix.tgz 7b013981edce2fabe4a8751ff64a8d58 helpcontent_46_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_49_unix.tgz a39f44ec40f452c963a4a187f31d1acb helpcontent_49_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_55_unix.tgz 804d3ce61e11335193a410aaf9603f8e helpcontent_55_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_81_unix.tgz 81b705057a0e14ebcbf02fac4762781a helpcontent_81_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_82_unix.tgz 3121fbd251176d7c7b6e33ecec744c65 helpcontent_82_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_86_unix.tgz aee37935139c5ccd4b6d8abdd2037c66 helpcontent_86_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_88_unix.tgz 3b00571318e45965dee0545d86306d65 helpcontent_88_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_90_unix.tgz 9521a01c5817e87178f356762f8cdab5 helpcontent_90_unix.tgz -- Virtually Yours: distfiles. From megabajt at pld-linux.org Fri Aug 26 16:53:24 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: GeoIP-1.3.13.tar.gz Message-ID: <27610.1125068004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.maxmind.com/download/geoip/api/c/GeoIP-1.3.13.tar.gz 59fc9a6adfbde13cee33c88668f3f400 GeoIP-1.3.13.tar.gz Size: 668577 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Fri Aug 26 17:05:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: passwd-HEAD-2005-08-26.tar.gz Message-ID: <2176.1125068758@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/passwd-HEAD-2005-08-26.tar.gz 95fbc7b902ed4c527b1d84bcddf3241b passwd-HEAD-2005-08-26.tar.gz Size: 903489 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Fri Aug 26 17:52:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: pecl_http-0.12.0.tgz Message-ID: <30445.1125071556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/pecl_http-0.12.0.tgz d180e5b95d22c911e40d8265f7c8fd96 pecl_http-0.12.0.tgz Size: 92002 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Fri Aug 26 18:50:55 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: msmtp-1.4.4.tar.bz2 Message-ID: <3807.1125075055@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/msmtp/msmtp-1.4.4.tar.bz2 34b31619a61462d9f2dd4f59720cf05e msmtp-1.4.4.tar.bz2 Size: 480904 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Fri Aug 26 19:13:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:21 2005 Subject: DISTFILES: ocaml-3.08.4.tar.gz ocaml-3.08-refman.html.tar.gz ocaml-3.08-refman.ps.gz camlp4-3.06-manual.html.tar.gz camlp4-3.06-manual.dvi.gz camlp4-3.06-tutorial.html.tar.gz camlp4-3.06-tutorial.dvi.gz pure-fun-1.0.4.tar.bz2 ds-contrib.tar.gz ocaml-3.08-refman.info.tar.gz Message-ID: <17171.1125076405@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.gz 105d192896bf945b660c4fb1ee486f57 ocaml-3.08.4.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz 0daee5643db6960682c1a7d84467885f ocaml-3.08-refman.html.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz 35a5d4318456c0982e72ee3f33364bf5 ocaml-3.08-refman.ps.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.html.tar.gz 21370bae4e7f6435b38aeb21db7ce8bb camlp4-3.06-manual.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.dvi.gz 035915d1a530aa7ec9b194d9a7d258eb camlp4-3.06-manual.dvi.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.html.tar.gz 96d8eb4ca5abd58c9a280ba59f73b192 camlp4-3.06-tutorial.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.dvi.gz fcd87c235109364242a0c9ccf176dff8 camlp4-3.06-tutorial.dvi.gz ALREADY GOT: http://www.ocaml.info/ocaml_sources/pure-fun-1.0.4.tar.bz2 567bc681b4cc1cfcbbfb6fa5f012019b pure-fun-1.0.4.tar.bz2 ALREADY GOT: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz 77fa1da7375dea1393cc0b6cd802d7e1 ds-contrib.tar.gz STORED: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz 49b68ec07ccd7ce45eb6bd3f3fdee140 ocaml-3.08-refman.info.tar.gz Size: 274899 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 19:40:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: kdebase.spec - rel 4 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:40:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 4 ---- Files affected: SPECS: kdebase.spec (1.458 -> 1.459) ---- Diffs: ================================================================ Index: SPECS/kdebase.spec diff -u SPECS/kdebase.spec:1.458 SPECS/kdebase.spec:1.459 --- SPECS/kdebase.spec:1.458 Tue Aug 16 19:26:31 2005 +++ SPECS/kdebase.spec Fri Aug 26 19:40:26 2005 @@ -27,7 +27,7 @@ Summary(zh_CN): KDE???? Name: kdebase Version: %{_ver} -Release: 3 +Release: 4 Epoch: 9 License: GPL Group: X11/Applications @@ -2803,6 +2803,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.459 2005/08/26 17:40:26 arekm +- rel 4 + Revision 1.458 2005/08/16 17:26:31 glen - move kwriteconfig to -desktop package (it's not kwrite related program) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.458&r2=1.459&f=u From arekm at pld-linux.org Fri Aug 26 19:42:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: kdepim.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:42:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: kdepim.spec (1.188 -> 1.189) ---- Diffs: ================================================================ Index: SPECS/kdepim.spec diff -u SPECS/kdepim.spec:1.188 SPECS/kdepim.spec:1.189 --- SPECS/kdepim.spec:1.188 Tue Aug 2 11:22:48 2005 +++ SPECS/kdepim.spec Fri Aug 26 19:42:04 2005 @@ -17,7 +17,7 @@ Summary(uk): ???????????? ???????????? (PIM) ??? KDE Name: kdepim Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: GPL Vendor: The KDE Team @@ -1338,6 +1338,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.189 2005/08/26 17:42:04 arekm +- rel 3 + Revision 1.188 2005/08/02 09:22:48 arekm - rel2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.188&r2=1.189&f=u From qboosh at pld-linux.org Fri Aug 26 19:43:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: drupal-themeengine-phptemplate.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:43:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-phptemplate.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-phptemplate.spec diff -u SPECS/drupal-themeengine-phptemplate.spec:1.1 SPECS/drupal-themeengine-phptemplate.spec:1.2 --- SPECS/drupal-themeengine-phptemplate.spec:1.1 Fri Aug 19 12:54:31 2005 +++ SPECS/drupal-themeengine-phptemplate.spec Fri Aug 26 19:43:31 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine phptemplate Summary: Drupal PHPTemplate theme engine +Summary(pl): Silnik motyw?w Drupala PHPTemplate Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.2 @@ -18,7 +19,7 @@ %description A theme engine that allows you to use template files written in pure -php. These template files do not need to be processed by the theme +PHP. These template files do not need to be processed by the theme engine, and as such execute a lot faster than most other template engines. Another major advantage to using PHP as your template language, is flexibility, as the advanced user can access any @@ -30,6 +31,21 @@ The 'default' template for this engine is box_grey by Adrian Simmons. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych w +czystym PHP. Te pliki szablon?w nie wymagaj? przetwarzania przez +silnik motyw?w i jako takie wykonuj? si? du?o szybciej ni? wi?kszo?? +innych silnik?w motyw?w. Inn? du?? zalet? u?ywania PHP jako j?zyka +szablon?w jest elastyczno??, jako ?e zaawansowany u?ytkownik mo?e +dosta? si? do ka?dej informacji/funkcjonalno?ci dost?pnej w API +Drupala i nie jest ograniczony do tego, na co pozwala mu silnik/j?zyk +szablon?w. + +Kilka najwi?kszych serwis?w opartych na Drupalu, takich jak Drupal.org +czy Spreadfirefox.com u?ywa motyw?w opartych na PHPTemplate. + +"Domy?lnym" szablonem dla tego silnika jest box_grey Adriana Simmonsa. + %prep %setup -q -n %{engine} rm -f LICENSE.txt # GPL v2 @@ -54,6 +70,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:43:31 qboosh +- pl + Revision 1.1 2005/08/19 10:54:31 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-phptemplate.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 19:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: drupal-themeengine-smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-smarty.spec diff -u SPECS/drupal-themeengine-smarty.spec:1.3 SPECS/drupal-themeengine-smarty.spec:1.4 --- SPECS/drupal-themeengine-smarty.spec:1.3 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-smarty.spec Fri Aug 26 19:45:11 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine smarty Summary: Drupal Smarty theme engine +Summary(pl): Silnik motyw?w Drupala Smarty Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.9 @@ -26,6 +27,13 @@ The 'default' template for this engine is box_grey_smarty, which is ported from the original box_grey theme. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych przy +u?yciu sk?adni silnika szablon?w Smarty. + +"Domy?lnym" szablonem dla tego silnika jest box_grey_smarty, kt?ry +jest sportowany z oryginalnego motywu box_grey. + %prep %setup -q -n %{engine} %patch0 -p1 @@ -60,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:45:11 qboosh +- pl + Revision 1.3 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-smarty.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 19:49:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: drupal-themeengine-wgsmarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:49:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-wgsmarty.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-wgsmarty.spec diff -u SPECS/drupal-themeengine-wgsmarty.spec:1.2 SPECS/drupal-themeengine-wgsmarty.spec:1.3 --- SPECS/drupal-themeengine-wgsmarty.spec:1.2 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-wgsmarty.spec Fri Aug 26 19:49:04 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine wgsmarty Summary: Drupal wgSmarty theme engine +Summary(pl): Silnik motyw?w Drupala wgSmarty Name: drupal-themeengine-%{engine} Version: 4.6.001 Release: 0.2 @@ -23,18 +24,37 @@ wgSmarty is an implementation of the Smarty template engine as a theme engine. -Advantages -- Template files are easier to create and maintain then with PHPtemplate +Advantages: +- Template files are easier to create and maintain then with + PHPtemplate - Templates are compiled into PHP to avoid speed and memory issues with search-and-replace template engines like XTemplate - wgSmarty is much more closely integrated with Drupal than the - existing smarty theme engine + existing Smarty theme engine -Disadvantages +Disadvantages: - wgSmarty is currently experimental and is only available in CVS - There is very little support for wgSmarty: even when it is released, it will still be poorly supported in comparison with PHPTemplate +%description -l pl +wgSmarty to implementacja silnika szablon?w Smarty jako silnika +motyw?w. + +Zalety: +- pliki szablon?w s? ?atwiejsze do tworzenia i utrzymywania ni? + PHPtemplate +- szablony s? kompilowane do PHP, aby zapobiec problemom z szybko?ci? + i pami?ci? z silnikami szablon?w podmieniaj?cymi ?a?cuchy, takimi + jak XTemplate +- wgSmarty jest du?o bli?ej zintegrowany z Drupalem ni? istniej?cy + silnik motyw?w Smarty + +Wady: +- wgSmarty jest aktualnie eksperymentalny i dost?pny tylko w CVS-ie +- jest bardzo ma?e wsparcie dla wgSmarty: nawet kiedy zostanie wydany, + nadal b?dzie kiepsko wspierany w por?wnaniu do PHPTemplate + %prep %setup -q -n %{engine} %patch0 -p1 @@ -61,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 17:49:04 qboosh +- pl + Revision 1.2 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-wgsmarty.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:37:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: drupal-theme-box_grey_smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:37:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey_smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey_smarty.spec diff -u SPECS/drupal-theme-box_grey_smarty.spec:1.3 SPECS/drupal-theme-box_grey_smarty.spec:1.4 --- SPECS/drupal-theme-box_grey_smarty.spec:1.3 Fri Aug 19 13:08:48 2005 +++ SPECS/drupal-theme-box_grey_smarty.spec Fri Aug 26 19:37:35 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey_smarty Summary: Drupal Theme Box_grey_smarty +Summary(pl): Motyw Box_grey_smarty dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.5 @@ -21,6 +22,9 @@ %description A port of the original box_grey theme for the Smarty template engine. +%description -l pl +Port oryginalnego motywu box_grey dla silnika szablon?w Smarty. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -54,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:37:35 qboosh +- pl + Revision 1.3 2005/08/19 11:08:48 glen - fix theme style being available ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey_smarty.spec?r1=1.3&r2=1.4&f=u From wolvverine at pld-linux.org Fri Aug 26 18:50:57 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: msmtp.spec - 1.4.4 - STBR In-Reply-To: References: Message-ID: Author: wolvverine Date: Fri Aug 26 16:50:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.4 - STBR ---- Files affected: SPECS: msmtp.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.48 SPECS/msmtp.spec:1.49 --- SPECS/msmtp.spec:1.48 Mon Jul 18 17:44:42 2005 +++ SPECS/msmtp.spec Fri Aug 26 18:50:52 2005 @@ -2,12 +2,12 @@ Summary: SMTP "plugin" for MUAs Summary(pl): "Wtyczka" SMTP dla klient?w pocztowych (MUA) Name: msmtp -Version: 1.4.3 +Version: 1.4.4 Release: 1 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/msmtp/%{name}-%{version}.tar.bz2 -# Source0-md5: f6614490834ad3c2c15559bf38c2f694 +# Source0-md5: 34b31619a61462d9f2dd4f59720cf05e Patch0: %{name}-home_etc.patch URL: http://msmtp.sourceforge.net/ BuildRequires: autoconf >= 2.50 @@ -34,7 +34,7 @@ %description -l pl msmtp to prosty program dzia?aj?cy jako "wtyczka SMTP" dla Mutta i -prawdopodobnie innych klient?w pocztowych (MUA - mail user agents). +innych klient?w pocztowych (MUA - mail user agents). Przekierowuje wiadomo?ci do serwera SMTP (na przyk?ad providera darmowych kont e-mail), kt?ry je dostarcza. Mo?liwo?ci obejmuj?: - obs?ug? SMTP AUTH - metod PLAIN, LOGIN i CRAM-MD5 @@ -47,7 +47,7 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym). +konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. %prep %setup -q @@ -98,6 +98,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/26 16:50:52 wolvverine +- 1.4.4 +- STBR + Revision 1.48 2005/07/18 15:44:42 saq - drop unpackaged info-dir - works, release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.48&r2=1.49&f=u From adamg at pld-linux.org Fri Aug 26 18:15:45 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: template-php-pecl.spec - conf.d support In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - conf.d support ---- Files affected: SPECS: template-php-pecl.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.10 SPECS/template-php-pecl.spec:1.11 --- SPECS/template-php-pecl.spec:1.10 Sat Aug 7 19:47:11 2004 +++ SPECS/template-php-pecl.spec Fri Aug 26 18:15:39 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php +%define extensionsdir $(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -13,13 +15,11 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php - %description In PECL status of this extension is: %{_status}. @@ -39,24 +39,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 16:15:39 adamg +- conf.d support + Revision 1.10 2004/08/07 17:47:11 adamg - ok, let's force php5 for pecl extensions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.10&r2=1.11&f=u From aflinta at pld-linux.org Fri Aug 26 12:39:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:21 2005 Subject: CVSROOT: users - new JID In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 10:39:21 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - new JID ---- Files affected: CVSROOT: users (1.385 -> 1.386) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.385 CVSROOT/users:1.386 --- CVSROOT/users:1.385 Mon Aug 22 17:16:05 2005 +++ CVSROOT/users Fri Aug 26 12:39:16 2005 @@ -5,7 +5,7 @@ adamg:adamg@biomerieux.pl:Adam Go??biowski:adamg@pld-linux.org adasi:adasi@grubno.da.ru:Witek Kr?cicki adgor:adgor@isn.pl:Adam Gorzkiewicz:adgor@pld-linux.org -aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@at.kernel.pl +aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@jabber.org agaran:agaran@ep09.pld-linux.org:Maciej 'Agaran' Pijanka:agaran@rulez.pl andree:andree@luch.eu.org:Andrzej Augustynowicz aniolek:michal@dominium.warszawa.pl:Michal Czwojdzinski:aniolek@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.385&r2=1.386&f=u From paszczus at pld-linux.org Fri Aug 26 16:37:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: ocaml-lablgl.spec - added -j1 option to make cause it fails... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:37:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -j1 option to make cause it fails with multiprocesor build ---- Files affected: SPECS: ocaml-lablgl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.19 SPECS/ocaml-lablgl.spec:1.20 --- SPECS/ocaml-lablgl.spec:1.19 Fri Aug 26 16:32:56 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:37:43 2005 @@ -156,7 +156,7 @@ s|^GLLIBS.*|GLLIBS = -L%{_prefix}/X11R6/%{_lib} -lGL -lGLU -lXmu|; s|^COPTS.*|COPTS = %{rpmcflags} -c -fPIC|;' \ Makefile.config.ex > Makefile.config -%{__make} all opt +%{__make} -j1 all opt %install rm -rf $RPM_BUILD_ROOT @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/26 14:37:43 paszczus +- added -j1 option to make cause it fails with multiprocesor build + Revision 1.19 2005/08/26 14:32:56 paszczus - rel up for rebuild with ocaml 3.08.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.19&r2=1.20&f=u From darekr at pld-linux.org Thu Aug 25 22:11:59 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: wormulon.spec - fixed Source0 and URL field - added ChangeL... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:11:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed Source0 and URL field - added ChangeLog to %dir ---- Files affected: SPECS: wormulon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/wormulon.spec diff -u SPECS/wormulon.spec:1.2 SPECS/wormulon.spec:1.3 --- SPECS/wormulon.spec:1.2 Wed May 26 18:57:13 2004 +++ SPECS/wormulon.spec Thu Aug 25 22:11:54 2005 @@ -6,9 +6,9 @@ Release: 0.1 License: GPL Group: Networking/Utilities -Source0: http://www.raisdorf.net/files/wormulon/%{name}-%{version}.tar.gz +Source0: http://www.wormulon.net/files/code/wormulon/%{name}-%{version}.tar.gz # Source0-md5: 2ec78110fae31ee7f3cc651334da6b0e -URL: http://www.raisdorf.net/wormulon/ +URL: http://www.wormulon.net/projects/wormulon/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -37,7 +37,7 @@ %files %defattr(644,root,root,755) -%doc README TODO +%doc ChangeLog README TODO %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -46,6 +46,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 20:11:54 darekr +- fixed Source0 and URL field +- added ChangeLog to %dir + Revision 1.2 2004/05/26 16:57:13 qboosh - pl fixes, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wormulon.spec?r1=1.2&r2=1.3&f=u From aredridel at pld-linux.org Fri Aug 26 05:55:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: cairo.spec - up to 1.0.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Fri Aug 26 03:55:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.0 ---- Files affected: SPECS: cairo.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.33 SPECS/cairo.spec:1.34 --- SPECS/cairo.spec:1.33 Thu Aug 25 10:04:57 2005 +++ SPECS/cairo.spec Fri Aug 26 05:55:49 2005 @@ -2,13 +2,12 @@ Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo -Version: 0.9.2 -Release: 3 +Version: 1.0.0 +Release: 1 License: LGPL v2.1 or MPL v1.1 Group: Libraries -Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz -# Source0-md5: 992095a5db597384a89b41e93737105d -Patch0: %{name}-bug4110.patch +Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz +# Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel BuildRequires: autoconf @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +108,11 @@ %{__automake} %configure \ --enable-gtk-doc \ + --enable-quartz \ + --enable-xcb \ + --enable-glitz \ + --enable-ps \ + --enable-pdf \ --with-html-dir=%{_gtkdocdir} %{__make} @@ -149,6 +152,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/26 03:55:49 aredridel +- up to 1.0.0 + Revision 1.33 2005/08/25 08:04:57 aflinta - avoid to link with external libpixman, rel 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.33&r2=1.34&f=u From arekm at pld-linux.org Thu Aug 25 23:05:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:21 2005 Subject: SOURCES (DEVEL): php-lib64.patch - more complete fix In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 21:05:16 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - more complete fix ---- Files affected: SOURCES: php-lib64.patch (1.10.4.2 -> 1.10.4.3) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.2 SOURCES/php-lib64.patch:1.10.4.3 --- SOURCES/php-lib64.patch:1.10.4.2 Thu Aug 25 20:23:51 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 23:05:11 2005 @@ -1,6 +1,6 @@ diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 --- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 -+++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 23:03:43.002336568 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) @@ -10,6 +10,22 @@ MING_DIR=$i break fi +@@ -34,11 +34,11 @@ + ],[ + AC_MSG_ERROR([Ming library 0.2a or greater required.]) + ],[ +- -L$MING_DIR/lib ++ -L$MING_DIR/$PHP_LIBDIR + ]) + + PHP_ADD_INCLUDE($MING_INC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) + + AC_MSG_CHECKING([for destroySWFBlock]) + AC_TRY_RUN([ + + diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag --- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 +++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.2&r2=1.10.4.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:36:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:21 2005 Subject: SPECS: drupal-theme-box_grey.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:36:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey.spec diff -u SPECS/drupal-theme-box_grey.spec:1.1 SPECS/drupal-theme-box_grey.spec:1.2 --- SPECS/drupal-theme-box_grey.spec:1.1 Fri Aug 19 13:08:08 2005 +++ SPECS/drupal-theme-box_grey.spec Fri Aug 26 19:36:13 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey Summary: Drupal Theme Box_grey +Summary(pl): Motyw Box_grey dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.1 @@ -26,6 +27,14 @@ lastly has a neutral grey colour scheme which will hopefully encourage people to change it. +%description -l pl +Box_grey ma by? stosunkowo ?atwy do modyfikowania dla tych, kt?rzy nie +s? kompetentni w pozycjonowaniu css, ale mog? zarz?dza? kolorami, +t?ami i obramowaniami css (albo przynajmniej chc? spr?bowa?). Jest +zaprojektowany tak, aby by? stosunkowo bogaty w r??ne rozmiary tre?ci +i ostatecznie mie? neutralny szary schemat kolor?w, zach?caj?cy ludzi +do jego zmiany. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -59,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:36:13 qboosh +- pl + Revision 1.1 2005/08/19 11:08:08 glen - phptemplate based theme - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey.spec?r1=1.1&r2=1.2&f=u From arekm at pld-linux.org Fri Aug 26 09:11:49 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: subversion.spec - up to 1.2.3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 07:11:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.3 ---- Files affected: SPECS: subversion.spec (1.144 -> 1.145) ---- Diffs: ================================================================ Index: SPECS/subversion.spec diff -u SPECS/subversion.spec:1.144 SPECS/subversion.spec:1.145 --- SPECS/subversion.spec:1.144 Sun Jul 31 23:45:59 2005 +++ SPECS/subversion.spec Fri Aug 26 09:11:44 2005 @@ -16,19 +16,18 @@ Summary(pl): System kontroli wersji podobny, ale lepszy, ni? CVS Summary(pt_BR): Sistema de versionamento concorrente Name: subversion -Version: 1.2.1 -Release: 3 +Version: 1.2.3 +Release: 1 License: Apache/BSD Style Group: Development/Version Control Source0: http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2 -# Source0-md5: 0b546195ca794c327c6830f2e88661f7 +# Source0-md5: a14bc6590241b6e5c2ff2b354cc184a1 Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init Source4: %{name}-svnserve.sysconfig Patch0: %{name}-home_etc.patch -Patch1: %{name}-SWIGEXPORT.patch -Patch2: %{name}-po.pl.patch +Patch1: %{name}-po.pl.patch URL: http://subversion.tigris.org/ %if %{with net_client_only} %global apache_modules_api 0 @@ -270,7 +269,6 @@ %setup -q %patch0 -p0 %patch1 -p1 -%patch2 -p1 rm -rf apr-util{,/xml/expat}/autom4te.cache @@ -522,6 +520,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.145 2005/08/26 07:11:44 arekm +- up to 1.2.3 + Revision 1.144 2005/07/31 21:45:59 pluto - segfault fixed, release 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.144&r2=1.145&f=u From baggins at pld-linux.org Fri Aug 26 17:56:54 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - fix ip_conntra... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:56:54 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix ip_conntrack_amanda Oops ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.17 -> 1.1.2.18) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 Fri Aug 26 15:40:25 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 17:56:48 2005 @@ -7237,6 +7237,19 @@ + +module_init(init); +module_exit(fini); +Index: net/ipv4/netfilter/ip_conntrack_amanda.c +=================================================================== +--- net/ipv4/netfilter/ip_conntrack_amanda.c (.../branches/vanilla-2.6.12.x) (revision 6284) ++++ net/ipv4/netfilter/ip_conntrack_amanda.c (.../trunk) (revision 6284) +@@ -66,7 +66,7 @@ + + /* increase the UDP timeout of the master connection as replies from + * Amanda clients to the server can be quite delayed */ +- ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); ++ ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); + + /* No data? */ + dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); Index: net/ipv4/netfilter/ip_conntrack_core.c =================================================================== --- net/ipv4/netfilter/ip_conntrack_core.c (.../branches/vanilla-2.6.12.x) (revision 6284) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.17&r2=1.1.2.18&f=u From glen at pld-linux.org Fri Aug 26 17:05:50 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-26 snap In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 15:05:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-26 snap ---- Files affected: SPECS: horde-passwd.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.26 SPECS/horde-passwd.spec:1.27 --- SPECS/horde-passwd.spec:1.26 Thu Aug 25 12:13:07 2005 +++ SPECS/horde-passwd.spec Fri Aug 26 17:05:45 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-24 -%define _rel 2 +%define _snap 2005-08-26 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -14,9 +14,8 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz -# Source0-md5: 6638fad5170d5421bacf7e44868a7964 +# Source0-md5: 95fbc7b902ed4c527b1d84bcddf3241b Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -52,7 +51,6 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 -%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -144,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/26 15:05:45 glen +- updated to 2005-08-26 snap + Revision 1.26 2005/08/25 10:13:07 paszczus - unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Fri Aug 26 17:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: drupal-mod-blogtheme.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 15:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-mod-blogtheme.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-mod-blogtheme.spec diff -u SPECS/drupal-mod-blogtheme.spec:1.1 SPECS/drupal-mod-blogtheme.spec:1.2 --- SPECS/drupal-mod-blogtheme.spec:1.1 Thu Aug 18 16:19:10 2005 +++ SPECS/drupal-mod-blogtheme.spec Fri Aug 26 17:54:16 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define modname blogtheme Summary: Drupal Blog Theme Module +Summary(pl): Modu? Drupal Blog Theme Name: drupal-mod-%{modname} Version: 4.6.0 Release: 0.1 @@ -19,12 +20,21 @@ %description Blog theme allows users to have persistent themes for their blogs based on the theme they choose for their account. When others view -thier main blog page, or any node created by them, the reader will see -the authors theme instead of thier own. +their main blog page, or any node created by them, the reader will see +the author's theme instead of their own. The module works by using the hook_init function and setting the $custom_theme global variable to the node/blog owner's theme. +%description -l pl +Blog theme pozwala u?ytkownikom mie? trwa?e motywy dla swoich blog?w w +oparciu o motyw wybrany dla w?asnego konta. Kiedy inni ogl?daj? ich +g??wn? stron? bloga lub dowolny utworzony w?ze?, czytelnik zobaczy +motyw autora zamiast w?asnego. + +Modu? dzia?a poprzez u?ycie funkcji hook_init i ustawienie zmiennej +globalnej $custom_theme na motyw w?a?ciciela w?z?a/bloga. + %prep %setup -q -n %{modname} @@ -49,6 +59,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:54:16 qboosh +- pl + Revision 1.1 2005/08/18 14:19:10 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-mod-blogtheme.spec?r1=1.1&r2=1.2&f=u From paszczus at pld-linux.org Fri Aug 26 14:57:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (DEVEL): mdadm.spec - updated to 2.0 - added URL - changed S... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:57:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.0 - added URL - changed Source0 url to mirror on kernel.org (better) - changed bcond_without initrd to bcond_with initrd cause build fails with initrd - release 0.1 ---- Files affected: SPECS: mdadm.spec (1.26.2.2 -> 1.26.2.3) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.26.2.2 SPECS/mdadm.spec:1.26.2.3 --- SPECS/mdadm.spec:1.26.2.2 Sat Jan 8 15:33:04 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:57:22 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without initrd # don't build initrd version +%bcond_with initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc # %ifarch amd64 @@ -10,16 +10,17 @@ Summary: Tool for creating and maintaining software RAID devices Summary(pl): Narz?dzie do tworzenia i obs?ugi programowych macierzy RAID Name: mdadm -Version: 1.8.1 -Release: 1 +Version: 2.0 +Release: 0.1 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz -# Source0-md5: d6298c34590334cad3b951bc590e4007 +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 +# Source0-md5: 802f301ea67db14773f49d6bed4f2411 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-degraded.patch -Patch1: %{name}-mdassemble.patch +#Patch0: %{name}-degraded.patch +#Patch1: %{name}-mdassemble.patch +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ %if %{with initrd} %{!?with_uClibc:BuildRequires: glibc-static} %{?with_uClibc:BuildRequires: uClibc-static} @@ -56,8 +57,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +#%patch0 -p1 +#%patch1 -p1 %build %if %{with initrd} @@ -150,6 +151,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.3 2005/08/26 12:57:22 paszczus +- updated to 2.0 +- added URL +- changed Source0 url to mirror on kernel.org (better) +- changed bcond_without initrd to bcond_with initrd cause build fails with initrd +- release 0.1 + Revision 1.26.2.2 2005/01/08 14:33:04 qboosh - added mdassemble patch, fixed mdassemble build (on by default again) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.26.2.2&r2=1.26.2.3&f=u From adamg at pld-linux.org Fri Aug 26 17:52:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec - updated to 0.12.0... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 15:52:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.12.0 - switched to conf.d ---- Files affected: SPECS: php-pecl-http.spec (1.7 -> 1.8) , php4-pecl-http.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.7 SPECS/php-pecl-http.spec:1.8 --- SPECS/php-pecl-http.spec:1.7 Wed Jul 27 08:59:16 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.7 2005/07/27 06:59:16 adamg - updated to 0.10.1 ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.1 SPECS/php4-pecl-http.spec:1.2 --- SPECS/php4-pecl-http.spec:1.1 Wed Jul 27 09:04:39 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php4-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.1 2005/07/27 07:04:39 adamg - new (cp from php-pecl-http) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 21:19:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: pcre.spec - 6.3 fixes CAN-2005-2491 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 19:19:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 6.3 fixes CAN-2005-2491 ---- Files affected: SPECS: pcre.spec (1.64 -> 1.65) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.64 SPECS/pcre.spec:1.65 --- SPECS/pcre.spec:1.64 Mon Aug 22 14:16:57 2005 +++ SPECS/pcre.spec Thu Aug 25 21:19:18 2005 @@ -275,11 +275,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.65 2005/08/25 19:19:18 glen +- 6.3 fixes CAN-2005-2491 + Revision 1.64 2005/08/22 12:16:57 adamg - fixed previous changelog entry Revision 1.63 2005/08/22 12:11:35 adamg -- updated to 6.3 +- updated to 6.3 (fixes CAN-2005-2491) - -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.64&r2=1.65&f=u From arekm at pld-linux.org Thu Aug 25 21:55:44 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (DEVEL): php-mod_php.conf - fix for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:55:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fix for php 5.1 ---- Files affected: SOURCES: php-mod_php.conf (1.3.4.2 -> 1.3.4.2.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-mod_php.conf diff -u SOURCES/php-mod_php.conf:1.3.4.2 SOURCES/php-mod_php.conf:1.3.4.2.4.1 --- SOURCES/php-mod_php.conf:1.3.4.2 Fri Jul 16 21:44:02 2004 +++ SOURCES/php-mod_php.conf Thu Aug 25 21:55:39 2005 @@ -1,6 +1,6 @@ LoadModule php5_module modules/libphp5.so - + AddType application/x-httpd-php .php AddType application/x-httpd-php .php3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-mod_php.conf?r1=1.3.4.2&r2=1.3.4.2.4.1&f=u From baggins at pld-linux.org Fri Aug 26 15:40:31 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - shift sock opt... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 13:40:31 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - shift sock options for ipt_ACCOUNT to work (overlap with ip_tables.c) ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.16 -> 1.1.2.17) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 Mon Aug 1 16:25:15 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 15:40:25 2005 @@ -3937,11 +3937,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -+#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -+#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -+#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) ++#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) ++#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) +#define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES + /* CONTINUE verdict for targets */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.16&r2=1.1.2.17&f=u From paszczus at pld-linux.org Fri Aug 26 14:47:37 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: mdadm.spec - changed to mirror site, but there are more fil... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed to mirror site, but there are more files than on main site ---- Files affected: SPECS: mdadm.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.38 SPECS/mdadm.spec:1.39 --- SPECS/mdadm.spec:1.38 Tue Jun 28 10:24:13 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:47:29 2005 @@ -14,12 +14,12 @@ Release: 2 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ BuildRequires: groff BuildRequires: rpmbuild(macros) >= 1.213 %if %{with initrd} @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/26 12:47:29 paszczus +- changed to mirror site, but there are more files than on main site + Revision 1.38 2005/06/28 08:24:13 blues - don't require mdadm on _every_ system. Require strict version of mdadm-initrd in mdadm. Should be enought ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Fri Aug 26 10:51:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: builder - skip colourization if output is not terminal In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 08:51:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - skip colourization if output is not terminal ---- Files affected: SPECS: builder (1.325 -> 1.326) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.325 SPECS/builder:1.326 --- SPECS/builder:1.325 Tue Aug 23 21:41:39 2005 +++ SPECS/builder Fri Aug 26 10:50:55 2005 @@ -134,7 +134,7 @@ else wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" OUTFILEOPT="-O" @@ -1398,8 +1398,8 @@ if [ "`diff --brief $SPECFILE $tmpdir/$SPECFILE`" ] ; then diff -u $SPECFILE $tmpdir/$SPECFILE > $tmpdir/$SPECFILE.diff - diffcol $tmpdir/$SPECFILE.diff | less -r - ( + if [ -t 1 ]; then + diffcol $tmpdir/$SPECFILE.diff | less -r while : ; do echo -n "Accept? [yn] " read ans @@ -1415,7 +1415,9 @@ ;; esac done - ) + else + cat $tmpdir/$SPECFILE.diff + fi else echo "The SPEC is perfect ;)" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.325&r2=1.326&f=u From qboosh at pld-linux.org Fri Aug 26 13:44:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (RA-branch): clamav.spec - typo, proper error messages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:44:51 2005 GMT Module: SPECS Tag: RA-branch ---- Log message: - typo, proper error messages ---- Files affected: SPECS: clamav.spec (1.131.2.26 -> 1.131.2.27) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.131.2.26 SPECS/clamav.spec:1.131.2.27 --- SPECS/clamav.spec:1.131.2.26 Thu Jul 28 14:09:20 2005 +++ SPECS/clamav.spec Fri Aug 26 13:44:46 2005 @@ -52,7 +52,7 @@ Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig Requires: /usr/sbin/usermod -Requires: %{name}-libs = %{epoch}%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc Provides: group(clamav) Provides: user(clamav) @@ -226,7 +226,7 @@ %pre if [ -n "`/usr/bin/getgid clamav`" ]; then if [ "`/usr/bin/getgid clamav`" != 43 ]; then - echo "Warning: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 + echo "Error: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -235,7 +235,7 @@ fi if [ -n "`/bin/id -u clamav 2>/dev/null`" ]; then if [ "`/bin/id -u clamav`" != 43 ]; then - echo "Warning: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 + echo "Error: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -369,6 +369,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.131.2.27 2005/08/26 11:44:46 qboosh +- typo, proper error messages + Revision 1.131.2.26 2005/07/28 12:09:20 hawk - release 2 (1 was already built for AC) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.131.2.26&r2=1.131.2.27&f=u From arekm at pld-linux.org Fri Aug 26 11:02:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (DEVEL): php.spec - use libtool for installing apache DSOs; ... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:02:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - use libtool for installing apache DSOs; rel 0.x.2 ---- Files affected: SPECS: php.spec (1.467.2.5 -> 1.467.2.6) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.5 SPECS/php.spec:1.467.2.6 --- SPECS/php.spec:1.467.2.5 Fri Aug 26 10:55:18 2005 +++ SPECS/php.spec Fri Aug 26 11:02:09 2005 @@ -76,7 +76,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.%{_rc}.1%{?with_hardening:hardened} +Release: 0.%{_rc}.2%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1705,14 +1705,12 @@ # install apache1 DSO module %if %{with apache1} -# TODO: use libtool here -install sapi/apache/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so +libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/ %endif # install apache2 DSO module %if %{with apache2} -# TODO: use libtool here -install sapi/apache2handler/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so +libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/ %endif libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} @@ -2913,6 +2911,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.6 2005/08/26 09:02:09 arekm +- use libtool for installing apache DSOs; rel 0.x.2 + Revision 1.467.2.5 2005/08/26 08:55:18 arekm - add PDO (base compiled in; database drivers as shared modules) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.5&r2=1.467.2.6&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:49 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: ruby-open4.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 19:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ruby-open4.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u /dev/null SPECS/ruby-open4.spec:1.1 --- /dev/null Thu Aug 25 21:24:49 2005 +++ SPECS/ruby-open4.spec Thu Aug 25 21:24:44 2005 @@ -0,0 +1,61 @@ +# $Revision$, $Date$ +%define ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")') +%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') +%define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') +Summary: Ruby open3 with exit reporting +Name: ruby-open4 +Version: 0.1.0 +Release: 1 +License: GPL +Group: Development/Languages +Source0: http://www.codeforpeople.com/lib/ruby/open4/open4-%{version}.tgz +# Source0-md5: aab7035d09a19af38a7468d7f1cb93c9 +URL: http://www.codeforpeople.com/lib/ruby/open4/ +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: setup.rb +Requires: ruby +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ruby open3 with exit reporting. + +%prep +%setup -q -n open4-%{version} + +%build +cp /usr/share/setup.rb . +ruby setup.rb config \ + --rbdir=%{ruby_rubylibdir} \ + --sodir=%{ruby_archdir} + +rdoc --ri -o ri +rdoc -o rdoc + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{ruby_archdir} +install -d $RPM_BUILD_ROOT%{ruby_ridir} + +ruby setup.rb install --prefix=$RPM_BUILD_ROOT + +cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README* rdoc +%{ruby_ridir}/* +%{ruby_rubylibdir}/open4* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 19:24:44 aredridel +- added + ================================================================ From darekr at pld-linux.org Thu Aug 25 22:27:58 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: wondershaper.spec - proper License; sorted %verify flags - C... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:27:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License;sorted %verify flags - ChangeLog to %doc ---- Files affected: SPECS: wondershaper.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/wondershaper.spec diff -u SPECS/wondershaper.spec:1.3 SPECS/wondershaper.spec:1.4 --- SPECS/wondershaper.spec:1.3 Thu Aug 12 18:04:55 2004 +++ SPECS/wondershaper.spec Thu Aug 25 22:27:53 2005 @@ -4,15 +4,15 @@ Name: wondershaper Version: 1.1a Release: 1 -License: GPL +License: GPL v2 Group: Networking/Utilities Source0: http://lartc.org/wondershaper/%{name}-%{version}.tar.gz # Source0-md5: bbc5a3a4485ab286e337ce8550e7b990 Patch0: %{name}-conf.patch URL: http://lartc.org/wondershaper/ Requires: iproute2 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Many cablemodem and ADSL users experience horrifying latency while @@ -45,8 +45,8 @@ %files %defattr(644,root,root,755) -%doc README ChangeLog -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wshaper.conf +%doc ChangeLog README TODO +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wshaper.conf %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 20:27:53 darekr +- proper License;sorted %verify flags +- ChangeLog to %doc + Revision 1.3 2004/08/12 16:04:55 radek - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wondershaper.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 20:25:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: mysql.spec - updated to 4.1.14 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 18:25:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.14 ---- Files affected: SPECS: mysql.spec (1.295 -> 1.296) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.295 SPECS/mysql.spec:1.296 --- SPECS/mysql.spec:1.295 Wed Jul 27 15:51:06 2005 +++ SPECS/mysql.spec Thu Aug 25 20:25:11 2005 @@ -24,11 +24,11 @@ Summary(zh_CN): MySQL???????????? Name: mysql Group: Applications/Databases -Version: 4.1.13 +Version: 4.1.14 Release: 1 License: GPL + MySQL FLOSS Exception Source0: http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz -# Source0-md5: 49d7a7314a2c9cf49e34777e73e66562 +# Source0-md5: 98ba9caea24b0a48ee06bb242ff2e37f Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -551,11 +551,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}comp_err mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump -# not our OS -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.plist -# unuseful stuff -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.spec - # functionality in initscript / rpm rm $RPM_BUILD_ROOT%{_bindir}/mysql_create_system_tables rm $RPM_BUILD_ROOT%{_bindir}/mysql_install_db @@ -565,7 +560,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fill_help_tables.sql rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/{pre,post}install +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure rm $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid # in %doc @@ -877,6 +872,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.296 2005/08/25 18:25:11 glen +- updated to 4.1.14 + Revision 1.295 2005/07/27 13:51:06 glen - guide where are the help tables data (probably it should be instead in iniscript?) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.295&r2=1.296&f=u From arekm at pld-linux.org Thu Aug 25 21:25:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (DEVEL): php.spec - zts is enabled for all SAPIs; --enable-f... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:25:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN ---- Files affected: SPECS: php.spec (1.467.2.3 -> 1.467.2.4) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.3 SPECS/php.spec:1.467.2.4 --- SPECS/php.spec:1.467.2.3 Thu Aug 25 20:57:03 2005 +++ SPECS/php.spec Thu Aug 25 21:25:13 2005 @@ -75,7 +75,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.1%{?with_hardening:hardened} +Release: 0.%{_rc}.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1424,6 +1424,7 @@ fi PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL +# Apache SAPIs should be last one listed here sapis=" fcgi cgi cli %if %{with apache1} @@ -1440,13 +1441,13 @@ ` case $sapi in cgi) - echo --enable-discard-path + echo --enable-discard-path --enable-force-cgi-redirect ;; cli) echo --disable-cgi ;; fcgi) - echo --enable-fastcgi --with-fastcgi=/usr + echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect ;; apxs1) ver=%(rpm -q --qf '%%{version}' apache1-apxs) @@ -1454,7 +1455,7 @@ ;; apxs2) ver=%(rpm -q --qf '%%{version}' apache-apxs) - echo --with-apxs2=%{apxs2} --with-apache-version=$ver --enable-maintainer-zts + echo --with-apxs2=%{apxs2} --with-apache-version=$ver ;; esac ` \ @@ -1464,6 +1465,7 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ @@ -1570,9 +1572,6 @@ # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la -# for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -# -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1 -# -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1 %if %{with apache1} %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1 sed -i -e " @@ -1587,19 +1586,18 @@ s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la %endif -%{__make} sapi/cgi/php -f Makefile.fcgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1 -DHAVE_SYS_PARAM_H=1 -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1" +# FCGI +cp -af php_config.h.fcgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.fcgi cp -r sapi/cgi sapi/fcgi rm -rf sapi/cgi/.libs sapi/cgi/*.lo -# notes: -# -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common) -# -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 - -%{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" +# CGI +cp -af php_config.h.cgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.cgi # CLI +cp -af php_config.h.cli main/php_config.h %{__make} sapi/cli/php -f Makefile.cli %install @@ -2751,6 +2749,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.4 2005/08/25 19:25:13 arekm +- zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN + Revision 1.467.2.3 2005/08/25 18:57:03 arekm - -DFORCE_CGI_REDIRECT=1 for cgi version ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.3&r2=1.467.2.4&f=u From cvs at pld-linux.org Fri Aug 26 17:53:10 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6336@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:06 2005 New Revision: 6336 Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:06 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: openvpn.spec - 2.0.2 In-Reply-To: References: Message-ID: Author: areq Date: Thu Aug 25 20:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 ---- Files affected: SPECS: openvpn.spec (1.94 -> 1.95) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.94 SPECS/openvpn.spec:1.95 --- SPECS/openvpn.spec:1.94 Mon Aug 22 11:33:20 2005 +++ SPECS/openvpn.spec Thu Aug 25 22:28:30 2005 @@ -2,12 +2,12 @@ Summary: VPN Daemon Summary(pl): Serwer VPN Name: openvpn -Version: 2.0.1 +Version: 2.0.2 Release: 1 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz -# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 +# Source0-md5: 862f8788f080f669b1ae00a74ef68001 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.95 2005/08/25 20:28:30 areq +- 2.0.2 + Revision 1.94 2005/08/22 09:33:20 glen - simplify %prep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.94&r2=1.95&f=u From arekm at pld-linux.org Thu Aug 25 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (DEVEL): php-lib64.patch - update In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:23:57 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - update ---- Files affected: SOURCES: php-lib64.patch (1.10.4.1 -> 1.10.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.1 SOURCES/php-lib64.patch:1.10.4.2 --- SOURCES/php-lib64.patch:1.10.4.1 Thu Aug 25 19:26:19 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 20:23:51 2005 @@ -10,3 +10,16 @@ MING_DIR=$i break fi +diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag +--- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 ++++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 +@@ -4,7 +4,7 @@ + # + + phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpbuilddir = $(libdir)/php/build + + BUILD_FILES = \ + scripts/phpize.m4 \ + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.1&r2=1.10.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:38:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: siefs.spec - use _sbindir macro In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:38:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _sbindir macro ---- Files affected: SPECS: siefs.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/siefs.spec diff -u SPECS/siefs.spec:1.12 SPECS/siefs.spec:1.13 --- SPECS/siefs.spec:1.12 Tue Apr 5 20:52:00 2005 +++ SPECS/siefs.spec Thu Aug 25 22:38:34 2005 @@ -48,7 +48,6 @@ %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT%{_sbindir} %{__make} install \ @@ -65,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS README* ChangeLog COPYRIGHT.vmo2wav %attr(755,root,root) %{_bindir}/* -/sbin/mount.siefs +%{_sbindir}/mount.siefs %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/25 20:38:34 darekr +- use _sbindir macro + Revision 1.12 2005/04/05 18:52:00 saq - up to 0.5 - lots of various fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/siefs.spec?r1=1.12&r2=1.13&f=u From paszczus at pld-linux.org Fri Aug 26 14:49:19 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: mdadm.spec - use tar.bz2 compression In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:49:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use tar.bz2 compression ---- Files affected: SPECS: mdadm.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.39 SPECS/mdadm.spec:1.40 --- SPECS/mdadm.spec:1.39 Fri Aug 26 14:47:29 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:49:14 2005 @@ -14,7 +14,7 @@ Release: 2 License: GPL Group: Base -Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/26 12:49:14 paszczus +- use tar.bz2 compression + Revision 1.39 2005/08/26 12:47:29 paszczus - changed to mirror site, but there are more files than on main site ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.39&r2=1.40&f=u From havner at pld-linux.org Fri Aug 26 10:38:02 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atm patches commented out for now... In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 08:38:02 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atm patches commented out for now, update configs ---- Files affected: SPECS: kernel.spec (1.441.2.1166 -> 1.441.2.1167) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1166 SPECS/kernel.spec:1.441.2.1167 --- SPECS/kernel.spec:1.441.2.1166 Fri Aug 26 01:59:40 2005 +++ SPECS/kernel.spec Fri Aug 26 10:37:56 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -%patch115 -p1 -%patch116 -p1 +#%%patch115 -p1 +#%%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1167 2005/08/26 08:37:56 havner +- atm patches commented out for now, update configs + Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1166&r2=1.441.2.1167&f=u From cvs at pld-linux.org Fri Aug 26 15:46:15 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6334@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:46:11 2005 New Revision: 6334 Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:46:11 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From arekm at pld-linux.org Thu Aug 25 20:57:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (DEVEL): php.spec - -DFORCE_CGI_REDIRECT=1 for cgi version In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:57:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - -DFORCE_CGI_REDIRECT=1 for cgi version ---- Files affected: SPECS: php.spec (1.467.2.2 -> 1.467.2.3) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.2 SPECS/php.spec:1.467.2.3 --- SPECS/php.spec:1.467.2.2 Thu Aug 25 20:39:05 2005 +++ SPECS/php.spec Thu Aug 25 20:57:03 2005 @@ -1597,7 +1597,7 @@ # -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 %{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1" + CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" # CLI %{__make} sapi/cli/php -f Makefile.cli @@ -2751,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.3 2005/08/25 18:57:03 arekm +- -DFORCE_CGI_REDIRECT=1 for cgi version + Revision 1.467.2.2 2005/08/25 18:39:05 arekm - fix cli with readline; add xmlreader module; builds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.2&r2=1.467.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 13:46:15 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: clamav.spec - triggerpostun dep really differs from postun dep In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:46:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - triggerpostun dep really differs from postun dep ---- Files affected: SPECS: clamav.spec (1.170 -> 1.171) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.170 SPECS/clamav.spec:1.171 --- SPECS/clamav.spec:1.170 Thu Jul 28 14:18:51 2005 +++ SPECS/clamav.spec Fri Aug 26 13:46:10 2005 @@ -53,9 +53,9 @@ Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel -Requires(postun): sed >= 4.0 Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig +Requires(triggerpostun): sed >= 4.0 Requires: /usr/sbin/usermod Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc @@ -365,6 +365,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171 2005/08/26 11:46:10 qboosh +- triggerpostun dep really differs from postun dep + Revision 1.170 2005/07/28 12:18:51 hawk - release 3 (2 went to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.170&r2=1.171&f=u From darekr at pld-linux.org Thu Aug 25 22:01:20 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: words.spec - noreplace for %config - sorted %verify flags In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:01:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - noreplace for %config - sorted %verify flags ---- Files affected: SPECS: words.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/words.spec diff -u SPECS/words.spec:1.28 SPECS/words.spec:1.29 --- SPECS/words.spec:1.28 Sat Sep 25 13:20:55 2004 +++ SPECS/words.spec Thu Aug 25 22:01:14 2005 @@ -55,7 +55,7 @@ %files %defattr(644,root,root,755) %doc usr/dict/{README.linux.words*,README2.linux.words*} -%config %verify(not size mtime md5) %{_datadir}/dict/* +%config(noreplace) %verify(not md5 mtime size) %{_datadir}/dict/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -63,6 +63,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/25 20:01:14 darekr +- noreplace for %config +- sorted %verify flags + Revision 1.28 2004/09/25 11:20:55 radek - cosmetics (spaces -> tabs) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/words.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Thu Aug 25 20:05:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (DEVEL): php-readline.patch (NEW) - new In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:05:39 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - new ---- Files affected: SOURCES: php-readline.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php-readline.patch diff -u /dev/null SOURCES/php-readline.patch:1.1.2.1 --- /dev/null Thu Aug 25 20:05:39 2005 +++ SOURCES/php-readline.patch Thu Aug 25 20:05:34 2005 @@ -0,0 +1,12 @@ +diff -urN php-5.1.0RC1.org/sapi/cli/config.m4 php-5.1.0RC1/sapi/cli/config.m4 +--- php-5.1.0RC1.org/sapi/cli/config.m4 2005-08-25 19:54:02.051504000 +0200 ++++ php-5.1.0RC1/sapi/cli/config.m4 2005-08-25 19:54:28.699452976 +0200 +@@ -29,7 +29,7 @@ + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" + ;; + *) +- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" + ;; + esac + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" ================================================================ From arekm at pld-linux.org Thu Aug 25 19:59:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (DEVEL): php-nohttpd.patch - fixed In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:59:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed ---- Files affected: SOURCES: php-nohttpd.patch (1.1.4.1 -> 1.1.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1.4.1 SOURCES/php-nohttpd.patch:1.1.4.2 --- SOURCES/php-nohttpd.patch:1.1.4.1 Thu Aug 25 15:51:01 2005 +++ SOURCES/php-nohttpd.patch Thu Aug 25 19:59:11 2005 @@ -6,10 +6,10 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then ++ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1.4.1&r2=1.1.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:50:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: cpio.spec - defined _bindir - use it In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _bindir - use it ---- Files affected: SPECS: cpio.spec (1.60 -> 1.61) ---- Diffs: ================================================================ Index: SPECS/cpio.spec diff -u SPECS/cpio.spec:1.60 SPECS/cpio.spec:1.61 --- SPECS/cpio.spec:1.60 Mon Aug 8 13:37:20 2005 +++ SPECS/cpio.spec Thu Aug 25 22:50:16 2005 @@ -152,13 +152,13 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS TODO -%attr(755,root,root) /bin/cpio -%{_infodir}/cpio.info* -%{_mandir}/man1/cpio.1* +%attr(755,root,root) %{_bindir}/cpio %lang(es) %{_mandir}/es/man1/cpio.1* %lang(hu) %{_mandir}/hu/man1/cpio.1* %lang(ja) %{_mandir}/ja/man1/cpio.1* %lang(pt_BR) %{_mandir}/pt_BR/man1/cpio.1* +%{_infodir}/cpio.info* +%{_mandir}/man1/cpio.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.61 2005/08/25 20:50:16 darekr +- defined _bindir - use it + Revision 1.60 2005/08/08 11:37:20 baggins - release 3 - an lstat, we need or symbolic links copy we will not ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpio.spec?r1=1.60&r2=1.61&f=u From darekr at pld-linux.org Thu Aug 25 22:54:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: cpudyn.spec - defined _sbindir to /sbin In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:54:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _sbindir to /sbin ---- Files affected: SPECS: cpudyn.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpudyn.spec diff -u SPECS/cpudyn.spec:1.7 SPECS/cpudyn.spec:1.8 --- SPECS/cpudyn.spec:1.7 Sun May 15 14:28:23 2005 +++ SPECS/cpudyn.spec Thu Aug 25 22:54:17 2005 @@ -11,10 +11,12 @@ Source1: %{name}.init Source2: %{name}.conf URL: http://mnm.uib.es/~gallir/cpudyn/ -PreReq: rc-scripts +Requires: rc-scripts Requires(post,preun): /sbin/chkconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description This program control the speed in Intel SpeedStep, Pentium 4 Mobile and PowerPC machines with the cpufreq compiled in the kernel. @@ -45,12 +47,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/cpudynd install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cpudyn.conf -install cpudynd $RPM_BUILD_ROOT/sbin -install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install cpudynd $RPM_BUILD_ROOT%{_sbindir} +install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -58,8 +60,8 @@ %files %defattr(644,root,root,755) %doc README faq.html -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cpudyn.conf -%attr(755,root,root) /sbin/cpudynd +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cpudyn.conf +%attr(755,root,root) %{_sbindir}/cpudynd %attr(754,root,root) /etc/rc.d/init.d/cpudynd %{_mandir}/man8/* @@ -69,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:54:17 darekr +- defined _sbindir to /sbin + Revision 1.7 2005/05/15 12:28:23 aflinta - up to version 1.0.1, it doesn't require cpufreqd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpudyn.spec?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Fri Aug 26 08:18:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: openoffice.org.spec - up to 1.9.124 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 06:18:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.9.124 ---- Files affected: SPECS: openoffice.org.spec (1.546 -> 1.547) ---- Diffs: ================================================================ Index: SPECS/openoffice.org.spec diff -u SPECS/openoffice.org.spec:1.546 SPECS/openoffice.org.spec:1.547 --- SPECS/openoffice.org.spec:1.546 Sat Aug 13 16:32:34 2005 +++ SPECS/openoffice.org.spec Fri Aug 26 08:18:30 2005 @@ -21,9 +21,9 @@ %define ver 2.0 %define rel 0 -%define ooobver 1.9.123 +%define ooobver 1.9.124 %define snap SRC680 -%define bver m123 +%define bver m124 %define subver 680 %define fullver %{ver}.%{rel} @@ -35,20 +35,20 @@ Summary(pl): OpenOffice.org - pot??ny pakiet biurowy Name: openoffice.org Version: %{fullver} -Release: 0.6%{?with_vfs:vfs} +Release: 0.7%{?with_vfs:vfs} Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz -# Source0-md5: 7906dcfeb2074971bdc37019582b32f5 +# Source0-md5: a82488bad72ea7006c7b269ad0652660 Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-core.tar.bz2 -# Source1-md5: 4c566ccd4131ceb99fcf7395cbae3d9e +# Source1-md5: 1f79a23b6d6a1339b137d12b156583a6 Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-system.tar.bz2 -# Source2-md5: e223aa4452b2148f657c107392539343 +# Source2-md5: db7079c78028378224aeb0f282cb051e Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-binfilter.tar.bz2 -# Source3-md5: cc5799f480c530e21b2f030e194aae1f +# Source3-md5: a11c3419e5be158056bfbe8f16bcc65a Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-lang.tar.bz2 -# Source4-md5: ec7638b7b508b7da5aa8dcea52fd823a +# Source4-md5: dc8bd51c89a032e9156a53a38039150d Source10: http://go-ooo.org/packages/%{snap}/ooo_custom_images-13.tar.bz2 # Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2 Source11: http://go-ooo.org/packages/%{snap}/ooo_crystal_images-6.tar.bz2 @@ -1447,7 +1447,7 @@ %prep %setup -q -n ooo-build-%{ooobver} -%patch0 -p1 +#%patch0 -p1 install -d src # sources, icons, KDE_icons @@ -2068,6 +2068,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.547 2005/08/26 06:18:30 arekm +- up to 1.9.124 + Revision 1.546 2005/08/13 14:32:34 arekm - up to m123 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.546&r2=1.547&f=u From arekm at pld-linux.org Thu Aug 25 20:50:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: php-pecl-cpdf.spec (NEW), php-pecl-dio.spec (NEW) - nothing... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - nothing; not available yet ---- Files affected: SPECS: php-pecl-cpdf.spec (NONE -> 1.1) (NEW), php-pecl-dio.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u /dev/null SPECS/php-pecl-cpdf.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-cpdf.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,74 @@ +# $Revision$, $Date$ +%define _modname cpdf +%define _status stable + +Summary: %{_modname} - extension module for PHP +Summary(pl): %{_modname} - modu? dla php +Name: php-pecl-%{_modname} +Version: 2.0.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/cpdf/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +This is a dynamic shared object (DSO) for PHP that will add PDF +support through libcpdf library. + +In PECL status of this extension is: %{_status}. + +%description -l pl +Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ Index: SPECS/php-pecl-dio.spec diff -u /dev/null SPECS/php-pecl-dio.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-dio.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,71 @@ +# $Revision$, $Date$ +%define _modname dio +%define _status stable + +Summary: %{_modname} - Direct I/O functions +Name: php-pecl-%{_modname} +Version: not-yet +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/dio/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +PHP supports the direct io functions as described in the Posix +Standard (Section 6) for performing I/O functions at a lower level +than the C-Language stream I/O functions (fopen(), fread(),..). The +use of the DIO functions should be considered only when direct control +of a device is needed. In all other cases, the standard filesystem +functions are more than adequate. + +In PECL status of this extension is: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ From arekm at pld-linux.org Thu Aug 25 20:39:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (DEVEL): php.spec - fix cli with readline; add xmlreader mod... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:39:10 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix cli with readline; add xmlreader module; builds ---- Files affected: SPECS: php.spec (1.467.2.1 -> 1.467.2.2) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.1 SPECS/php.spec:1.467.2.2 --- SPECS/php.spec:1.467.2.1 Thu Aug 25 16:09:44 2005 +++ SPECS/php.spec Thu Aug 25 20:39:05 2005 @@ -111,6 +111,7 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch +Patch20: %{name}-readline.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -1280,6 +1281,24 @@ zwi?zanych z tymi plikami. Pozwala on tworzy? analizatory XML-a i nast?pnie definiowa? procedury obs?ugi dla r??nych zdarze? XML. +%package xmlreader +Summary: XML Reader extension module for PHP +Summary(pl): Modu? XML Reader dla PHP +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description xmlreader +This is a dynamic shared object (DSO) for PHP that will add XML Reader +support. The XMLReader extension is an XML Pull parser. The reader +acts as a cursor going forward on the document stream and stopping +at each node on the way. + +%description xmlreader -l pl +Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy +si? naka?dym w??le po drodze. + %package xmlrpc Summary: xmlrpc extension module for PHP Summary(pl): Modu? xmlrpc dla PHP @@ -1360,10 +1379,9 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch21 -p1 -%if "%{_lib}" == "lib64" %patch22 -p1 -%endif %patch23 -p1 %patch24 -p1 %patch25 -p1 @@ -1441,6 +1459,7 @@ esac ` \ --cache-file=config.cache \ + --with-libdir=%{_lib} \ --with-config-file-path=%{_sysconfdir} \ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ @@ -1475,11 +1494,11 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --with-xmlreader \ + --with-xmlreader=shared \ --with-bz2=shared \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ - --with-dbase=shared \ + --enable-dbase=shared \ %if %{with xmlrpc} --with-expat-dir=shared,/usr \ %else @@ -1626,7 +1645,7 @@ ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php -install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +sed -e 's#/usr/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini @@ -2130,6 +2149,12 @@ %postun xml %extension_postun +%post xmlreader +%extension_post + +%postun xmlreader +%extension_postun + %post xmlrpc %extension_post @@ -2367,13 +2392,14 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/phpextdist %attr(755,root,root) %{_bindir}/phpize %attr(755,root,root) %{_bindir}/php-config %attr(755,root,root) %{_libdir}/libphp_common.so %{_libdir}/libphp_common.la %{_includedir}/php %{_libdir}/php/build +%{_mandir}/man1/phpize* +%{_mandir}/man1/php-config* %files bcmath %defattr(644,root,root,755) @@ -2697,6 +2723,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xml.ini %attr(755,root,root) %{extensionsdir}/xml.so +%files xmlreader +%defattr(644,root,root,755) +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xmlreader.ini +%attr(755,root,root) %{extensionsdir}/xmlreader.so + %if %{with xmlrpc} %files xmlrpc %defattr(644,root,root,755) @@ -2720,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.2 2005/08/25 18:39:05 arekm +- fix cli with readline; add xmlreader module; builds + Revision 1.467.2.1 2005/08/25 14:09:44 arekm - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.1&r2=1.467.2.2&f=u From cvs at pld-linux.org Fri Aug 26 17:53:41 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6337@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:40 2005 New Revision: 6337 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:40 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From paszczus at pld-linux.org Fri Aug 26 15:01:47 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: mdadm.spec - md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 13:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - md5 ---- Files affected: SPECS: mdadm.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.40 SPECS/mdadm.spec:1.41 --- SPECS/mdadm.spec:1.40 Fri Aug 26 14:49:14 2005 +++ SPECS/mdadm.spec Fri Aug 26 15:01:42 2005 @@ -15,7 +15,7 @@ License: GPL Group: Base Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 -# Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 +# Source0-md5: 736705240e918294740929518477fc6f Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.41 2005/08/26 13:01:42 paszczus +- md5 + Revision 1.40 2005/08/26 12:49:14 paszczus - use tar.bz2 compression ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.40&r2=1.41&f=u From darekr at pld-linux.org Thu Aug 25 22:51:08 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: cpg.spec - gpm-friendly Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - gpm-friendly Source0 ---- Files affected: SPECS: cpg.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpg.spec diff -u SPECS/cpg.spec:1.7 SPECS/cpg.spec:1.8 --- SPECS/cpg.spec:1.7 Mon Aug 30 20:07:24 2004 +++ SPECS/cpg.spec Thu Aug 25 22:51:02 2005 @@ -6,7 +6,7 @@ Release: 1 License: distributable Group: Documentation -Source0: http://www.tldp.org/LDP/%{name}/Custom-Porting-Guide.html.tar.gz +Source0: http://www.tldp.org/LDP/cpg/Custom-Porting-Guide.html.tar.gz # Source0-md5: d3716f3750152305b10cd557e2bdbffd URL: http://www.tldp.org/LDP/cpg/html/index.html BuildArch: noarch @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:51:02 darekr +- gpm-friendly Source0 + Revision 1.7 2004/08/30 18:07:24 snurf - typo / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpg.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Fri Aug 26 14:52:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS (LINUX_2_6): kernel.spec - uncommented atm patches In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 12:52:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - uncommented atm patches ---- Files affected: SPECS: kernel.spec (1.441.2.1167 -> 1.441.2.1168) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1167 SPECS/kernel.spec:1.441.2.1168 --- SPECS/kernel.spec:1.441.2.1167 Fri Aug 26 10:37:56 2005 +++ SPECS/kernel.spec Fri Aug 26 14:52:05 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -#%%patch115 -p1 -#%%patch116 -p1 +%patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1168 2005/08/26 12:52:05 baggins +- uncommented atm patches + Revision 1.441.2.1167 2005/08/26 08:37:56 havner - atm patches commented out for now, update configs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1167&r2=1.441.2.1168&f=u From arekm at pld-linux.org Fri Aug 26 11:34:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES: kdebase-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:34:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdebase-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdebase-branch.diff diff -u SOURCES/kdebase-branch.diff:1.16 SOURCES/kdebase-branch.diff:1.17 --- SOURCES/kdebase-branch.diff:1.16 Sun Aug 7 10:30:42 2005 +++ SOURCES/kdebase-branch.diff Fri Aug 26 11:34:45 2005 @@ -1,20 +1,7 @@ -Index: kate/plugins/defaultproject/katedefaultproject.desktop -=================================================================== ---- kate/plugins/defaultproject/katedefaultproject.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/plugins/defaultproject/katedefaultproject.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) -@@ -58,7 +58,7 @@ - Name[tr]=??ntan??ml?? Kate Proje Eklentisi - Name[uk]=?????????????? ???????????? ?????????????? Kate - Name[uz]=Kate ???????????? ???????????? ?????????????? --Name[zh_CN]=Kate ?????????????????? -+Name[zh_CN]=Kat ?????????????????? - Comment=Default Plugin for Projects - Comment[af]=Standaard Inprop Module vir Projekte - Comment[ar]=????? ?????? ?????????????????? ????? ?????????? Index: kate/data/x-kate-project.desktop =================================================================== ---- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -58,7 +58,7 @@ Comment[tr]=Kate Proje Dosyas?? Comment[uk]=???????? ?????????????? Kate @@ -26,8 +13,17 @@ Type=QString Index: kdepasswd/kcm/kcm_useraccount.desktop =================================================================== ---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -23,7 +23,7 @@ + Name[es]=Contrase??a y cuenta de usuario + Name[et]=Parool ja kasutaja konto + Name[eu]=Pasahitza eta erabiltzaile kontua +-Name[fi]=Salasanat & k??ytt??j??tilit ++Name[fi]=Salasanat ja k??ytt??j??tilit + Name[fr]=Compte utilisateur et mot de passe + Name[fy]=Wachtwurd en br??kersbehear + Name[ga]=Focal Faire & Cuntas ??s??ideora @@ -41,7 +41,7 @@ Name[nds]=Passwoort & Brukerkonto Name[nl]=Wachtwoord en gebruikerbeheer @@ -48,8 +44,8 @@ Comment[pt_BR]=Informa????es do usu??rio tais como senha, nome e e-mail Index: kpersonalizer/kpersonalizer.desktop =================================================================== ---- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -47,7 +47,7 @@ Name[nl]=KDE's Configuratie Assistent Name[nn]=Vegvisar for skrivebordsoppsett @@ -59,6 +55,19 @@ Name[pl]=Asystent ustawie?? ??rodowiska Name[pt]=Assistente de Configura????o do Ambiente de Trabalho Name[pt_BR]=Assistente de Configura????es para a ??rea de Trabalho +Index: kcontrol/background/background.desktop +=================================================================== +--- kcontrol/background/background.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/background/background.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -125,7 +125,7 @@ + Comment[nso]=Fetosa dipeakanyo tsa bokamorago + Comment[pa]=???????????????????????? ?????????????????? ??????????????? + Comment[pl]=Ustawienia t??a +-Comment[pt]=alterar a configura????o do fundo ++Comment[pt]=Alterar a configura????o do fundo + Comment[pt_BR]=Muda as configura????es do fundo da tela + Comment[ro]=Configureaz?? set??rile fundalului + Comment[ru]=?????????????????? ???????? ???????????????? ?????????? Index: kcontrol/krdb/kcs/Windows2000.kcsrc =================================================================== Cannot display: file marked as a binary type. @@ -75,10 +84,14 @@ =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/x-kcsrc +Index: kcontrol/krdb/kcs/WhiteOnBlack.kcsrc +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-kcsrc Index: kcontrol/usbview/kcmusb.desktop =================================================================== ---- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -185,6 +185,7 @@ Keywords[nl]=USB,devices,viewer,control,weergaveprogramma Keywords[nn]=USB,einingar,visar,kontroll @@ -89,8 +102,8 @@ Keywords[pt_BR]=USB,dispositivos,visualizador,controle Index: kcontrol/taskbar/kcmtaskbar.desktop =================================================================== ---- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nn]=Oppg??velinje Name[nso]=Bar ya Mosongwana @@ -109,10 +122,31 @@ Comment[pl]=Konfiguracja paska zada?? panelu Comment[pt]=Configura????o da barra de tarefas do painel Comment[pt_BR]=Configura a barra de tarefas +Index: kcontrol/kcontrol/searchwidget.cpp +=================================================================== +--- kcontrol/kcontrol/searchwidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kcontrol/searchwidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -124,6 +124,7 @@ + + // get the modules keyword list + QStringList kw = module->keywords(); ++ kw << module->moduleName(); + + // loop through the keyword list to populate _keywords + for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it) Index: kcontrol/nics/nic.desktop =================================================================== ---- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=V??rguliidesed + Name[eu]=Sare interfazeak + Name[fa]=????????????????? ???????? +-Name[fi]=Verkkoliittym??t ++Name[fi]=Verkkoliitynn??t + Name[fr]=Interfaces r??seau + Name[fy]=Netwurkynterfaces + Name[ga]=Comh??adain L??onra @@ -52,7 +52,7 @@ Name[nl]=Netwerkinterfaces Name[nn]=Nettverksgrensesnitt @@ -131,10 +165,113 @@ Comment[pl]=Informacje o interfejsie sieciowym Comment[pt]=Informa????es sobre as interfaces de rede Comment[pt_BR]=Informa????es sobre rede +Index: kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +=================================================================== +--- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -216,6 +216,7 @@ + QString path; + QString ref; + QString query; ++ QString nameFilter; + + if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) { + path = cmd; +@@ -228,7 +229,8 @@ + // but not for "/tmp/a#b", if "a#b" is an existing file, + // or for "/tmp/a?b" (#58990) + if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed +- && QFile::exists(url.path()) ) ++ && QFile::exists(url.path()) ++ && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query + { + path = url.path(); + ref = url.ref(); +@@ -338,6 +340,24 @@ + if( isLocalFullPath && !exists ) + { + exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 ); ++ if ( !exists ) { ++ // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter ++ // If the app using this filter doesn't support it, well, it'll simply error out itself ++ int lastSlash = path.findRev( '/' ); ++ if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments ++ { ++ QString fileName = path.mid( lastSlash + 1 ); ++ QString testPath = path.left( lastSlash + 1 ); ++ if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) ++ && stat( QFile::encodeName(testPath).data(), &buff ) == 0 ) ++ { ++ nameFilter = fileName; ++ kdDebug() << "Setting nameFilter to " << nameFilter << endl; ++ path = testPath; ++ exists = true; ++ } ++ } ++ } + } + + //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl; +@@ -370,7 +390,9 @@ + // Open "uri" as file:/xxx if it is a non-executable local resource. + if( isDir || S_ISREG( buff.st_mode ) ) + { +- //kdDebug() << "Abs path as local file" << endl; ++ //kdDebug() << "Abs path as local file or directory" << endl; ++ if ( !nameFilter.isEmpty() ) ++ u.setFileName( nameFilter ); + setFilteredURI( data, u ); + setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE ); + return true; +Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop +=================================================================== +--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -55,7 +55,7 @@ + Name[uz]=Wikipedia - ?????????? ???????????????????????? + Name[vi]=Wikipedia -B??? t??? ??i???n b??ch khoa m?? n ph?? + Name[wa]=Wikipedia - Li libe eciclopedeye +-Name[zh_CN]=Wikipedia - ? ?????????????? ???? ++Name[zh_CN]=???????????? - ? ?????????????? ???? + Name[zh_TW]=Wikipedia - ? ??????? Encyclopedia + ServiceTypes=SearchProvider + Keys=wp +@@ -66,4 +66,5 @@ + Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[pa]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=????????? ++Query[zh_CN]=http://zh.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Charset=utf8 +Index: kcontrol/locale/default/entry.desktop +=================================================================== +--- kcontrol/locale/default/entry.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,7 +16,7 @@ + Name[es]=Ingl??s de EEUU + Name[et]=Inglise (US) + Name[eu]=EEBBetako ingelesa +-Name[fi]=US-englanti ++Name[fi]=Yhdysvaltain englanti + Name[fr]=Anglais US + Name[fy]=VS Ingelsk + Name[gl]=Ingl??s de EEUU +Index: kcontrol/locale/language.desktop +=================================================================== +--- kcontrol/locale/language.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/language.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=Riik/regioon ja keel + Name[eu]=Herrialdea eta hizkuntza + Name[fa]=????????/???????? ?? ? ???????? +-Name[fi]=Maa/alue ja kieli ++Name[fi]=Maa tai alue ja kieli + Name[fr]=Pays & langue + Name[fy]=L??n/regio en taal + Name[ga]=T??r/R??igi??n agus Teanga Index: kcontrol/smserver/kcmsmserver.desktop =================================================================== ---- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -55,7 +55,7 @@ Name[nl]=Sessiebeheer Name[nn]=??kthandsamar @@ -153,10 +290,22 @@ Comment[pl]=Konfiguracja mened??era sesji i ustawie?? wylogowania Comment[pt]=Configura????o do gestor de sess??es e das op????es de finaliza????o Comment[pt_BR]=Configura o gerenciador de sess??o e defini????es de logout +Index: kcontrol/konq/desktop.desktop +=================================================================== +--- kcontrol/konq/desktop.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktop.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,6 +16,7 @@ + Name[az]=Masa ??stl??ri + Name[bg]=?????????????? ?????????????? + Name[bn]=?????????????????? ????????????????????? ++Name[br]=Lies burev + Name[bs]=Vi??estruki desktopi + Name[ca]=M??ltiples escriptoris + Name[cs]=Virtu??ln?? plochy Index: kcontrol/konq/desktoppath.desktop =================================================================== ---- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -50,7 +50,7 @@ Name[nl]=Paden Name[nn]=Stiar @@ -186,8 +335,8 @@ Index: kcontrol/konq/webappearance.desktop =================================================================== ---- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -199,8 +348,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filebehavior.desktop =================================================================== ---- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,3 +181,4 @@ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,s??rskilt f??nster,visa f??nster,beteende,minnesanv??ndning,hemadress,n??tverks??tg??rder,f??rloppsdialogruta,papperskorg,ta bort,bekr??ftelse Keywords[ta]=???????????????????????????,?????????????????? ?????????????????????,kfm,?????????????????????????????????,?????????????????? ?????????????????????????????????,????????? ??????????????????,???????????????????????? ??????????????????,??????????????????,?????????????????? ????????????????????????,?????????????????? ????????????????????????????????????,???????????????????????????????????? ????????????????????????????????????, ????????????????????? ????????????????????????,??????????????????????????????????????????, ??????????????????,????????????????????????????????????????????? @@ -208,8 +357,8 @@ +Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,???????????????,??????,????????????,????????????,????????????,??????,?? ?????????,??? URL,????????????,???????????????,?????????,??????,?????? Index: kcontrol/konq/fileappearance.desktop =================================================================== ---- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -221,8 +370,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filepreviews.desktop =================================================================== ---- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,7 +46,7 @@ Name[nds]=V??ransichten & Meta-Daten Name[nl]=Voorbeelden en meta-data @@ -234,8 +383,8 @@ Name[pt_BR]=Pr??-visualiza????es & Metadados Index: kcontrol/kicker/kicker_config_appearance.desktop =================================================================== ---- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -247,8 +396,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/privacy/privacy.desktop =================================================================== ---- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -34,7 +34,7 @@ Comment[nds]=Privaatruum - Mit dit Moduul kannst Du dat Systeem vun de Sporen vun't Bruken reenmaken Comment[nl]=Privacy - een configuratiemodule waarmee u ongewenste sporen die gebruikers achterlaten kunt wissen. @@ -275,10 +424,23 @@ Name[pl]=Prywatno???? Name[pt]=Privacidade Name[pt_BR]=Privacidade +Index: kcontrol/kfontinst/thumbnail/FontThumbnail.cpp +=================================================================== +--- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- ThumbCreator *new_creator() ++ KDE_EXPORT ThumbCreator *new_creator() + { + return new KFI::CFontThumbnail; + } Index: kcontrol/kfontinst/lib/FcEngine.cpp =================================================================== ---- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -833,6 +833,7 @@ QString name(url.fileName()); int pos; @@ -289,8 +451,8 @@ if(-1==(pos=name.find(", "))) // No style information... Index: kcontrol/screensaver/testwin.h =================================================================== ---- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,9 +1,9 @@ #ifndef TESTWIN_H #define TESTWIN_H @@ -305,8 +467,8 @@ public: Index: kcontrol/screensaver/screensaver.desktop =================================================================== ---- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -117,7 +117,7 @@ Comment[nl]=Schermbeveiliging instellen Comment[nn]=Innstillingar for skjermsparar @@ -327,7 +489,7 @@ Index: kcontrol/screensaver/configure.in.in =================================================================== --- kcontrol/screensaver/configure.in.in (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,8 @@ +AC_HAVE_GL( + [ @@ -339,8 +501,8 @@ + ) Index: kcontrol/screensaver/kssmonitor.h =================================================================== ---- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,13 +1,12 @@ #ifndef KSSMONITOR_H #define KSSMONITOR_H @@ -361,7 +523,7 @@ Index: kcontrol/screensaver/kswidget.cpp =================================================================== --- kcontrol/screensaver/kswidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,40 @@ +#include + @@ -405,8 +567,8 @@ +#include "kswidget.moc" Index: kcontrol/screensaver/scrnsave.cpp =================================================================== ---- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,10 +46,7 @@ #include "scrnsave.h" @@ -422,7 +584,7 @@ Index: kcontrol/screensaver/kswidget.h =================================================================== --- kcontrol/screensaver/kswidget.h (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,13 @@ +#ifndef KSWIDGET_H +#define KSWIDGET_H @@ -439,8 +601,8 @@ +#endif Index: kcontrol/screensaver/Makefile.am =================================================================== ---- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,11 +1,12 @@ -AM_CPPFLAGS = $(all_includes) @@ -459,8 +621,8 @@ noinst_HEADERS = scrnsave.h Index: kcontrol/screensaver/testwin.cpp =================================================================== ---- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -4,7 +4,7 @@ class QXEmbed; @@ -472,8 +634,8 @@ KWin::setState( winId(), NET::StaysOnTop ); Index: kcontrol/kio/lanbrowser.desktop =================================================================== ---- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -49,7 +49,7 @@ Name[nl]=Lokaal netwerk Name[nn]=Lokalt nettverk @@ -493,8 +655,8 @@ Keywords[pt_BR]=samba,smb,windows,rede Index: kcontrol/kio/proxy.desktop =================================================================== ---- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -40,7 +40,7 @@ Name[nb]=Mellomtjener Name[nn]=Mellomtenar @@ -514,8 +676,8 @@ Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy Index: kcontrol/kio/cookies.desktop =================================================================== ---- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,7 +181,7 @@ Keywords[ven]=Cookies,Burousini.Inithenete,WWW> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Fri Aug 26 18:15:01 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec, template-php4-pecl... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - move %define calls to the top of the file ---- Files affected: SPECS: php-pecl-http.spec (1.8 -> 1.9) , php4-pecl-http.spec (1.2 -> 1.3) , template-php4-pecl.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.8 SPECS/php-pecl-http.spec:1.9 --- SPECS/php-pecl-http.spec:1.8 Fri Aug 26 17:52:28 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.8 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.2 SPECS/php4-pecl-http.spec:1.3 --- SPECS/php4-pecl-http.spec:1.2 Fri Aug 26 17:52:28 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %(php4-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.2 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.3 SPECS/template-php4-pecl.spec:1.4 --- SPECS/template-php4-pecl.spec:1.3 Thu Aug 25 10:31:34 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,7 @@ %define _modname - %define _status - %define _sysconfdir /etc/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -19,8 +20,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description In PECL status of this extension is: %{_status}. @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.3 2005/08/25 08:31:34 glen - typo, merge installs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.3&r2=1.4&f=u From twittner at pld-linux.org Fri Aug 26 19:13:19 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: ocaml.spec - added ocaml-doc-info subpkg (but info page suf... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 17:13:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ocaml-doc-info subpkg (but info page suffer from lack of index). - moved html docs in separate subpkgs: ocaml-doc-html, ocaml-camlp4-doc-html. Updated descriptions. - replace (by editing Makefiles by sed) hardcoded `-O', `-pg', `-DPROFILING' with $(CFLAGS). Allow passing CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 - rel. 2 ---- Files affected: SPECS: ocaml.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/ocaml.spec diff -u SPECS/ocaml.spec:1.98 SPECS/ocaml.spec:1.99 --- SPECS/ocaml.spec:1.98 Mon Aug 15 17:59:03 2005 +++ SPECS/ocaml.spec Fri Aug 26 19:13:12 2005 @@ -16,7 +16,7 @@ Summary(pl): Kompilator OCamla (Objective Caml) oraz ?rodowisko programistyczne Name: ocaml Version: 3.08.4 -Release: 1 +Release: 2 Epoch: 1 License: distributable Vendor: Group of implementors @@ -39,6 +39,8 @@ # Source7-md5: 567bc681b4cc1cfcbbfb6fa5f012019b Source8: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz # Source8-md5: 77fa1da7375dea1393cc0b6cd802d7e1 +Source9: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz +# Source9-md5: 49b68ec07ccd7ce45eb6bd3f3fdee140 Patch0: %{name}-build.patch Patch1: %{name}-db3.patch Patch2: %{name}-objinfo.patch @@ -51,6 +53,7 @@ %{!?with_db3:BuildRequires: db-devel >= 4.1} %{?with_tk:BuildRequires: tk-devel} %if %{with emacs} +BuildRequires: sed >= 4.0 BuildRequires: xemacs BuildRequires: xemacs-common BuildRequires: xemacs-fsf-compat-pkg @@ -78,17 +81,38 @@ pracy, narz?dzia do tworzenia analizator?w leksykalnych oraz sk?adniowych (ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i biblioteki. +%package doc-html +Summary: HTML documentation for OCaml +Summary(pl): Dokumentacja dla OCamla w formacie HTML +Group: Development/Tools + +%description doc-html +HTML documentation for OCaml. + +%description doc-html -l pl +Dokumentacja dla OCamla w formacie HTML. + %package doc-ps Summary: PostScript documentation for OCaml Summary(pl): Dokumentacja dla OCamla w formacie PostScript Group: Development/Tools %description doc-ps -PostScript documentation for OCaml. HTML documentation is in main package. +PostScript documentation for OCaml. %description doc-ps -l pl -Dokumentacja dla OCamla w formacie PostScript. Dokumentacja HTML jest -w g??wnym pakiecie. +Dokumentacja dla OCamla w formacie PostScript. + +%package doc-info +Summary: Info documentation for OCaml +Summary(pl): Dokumentacja info dla OCamla +Group: Development/Tools + +%description doc-info +Info documentation for OCaml. + +%description doc-info -l pl +Dokumentacja info dla OCamla. %package emacs Summary: Emacs mode for OCaml @@ -215,6 +239,17 @@ poprawionej sk?adni OCamla. Potrafi tak?e t?umaczy? programy z jednej sk?adni na drug?. +%package camlp4-doc-html +Summary: Objective Caml Preprocessor - HTML documentation +Summary(pl): Preprocesor OCamla - dokumentacja HTML +Group: Development/Languages + +%description camlp4-doc-html +Objective Caml Preprocessor - HTML documentation. + +%description camlp4-doc-html -l pl +Preprocesor OCamla - dokumentacja HTML. + %package compiler-objects Summary: Compiled parts of OCaml compiler Summary(pl): Skompilowane cz??ci kompilatora OCamla @@ -278,9 +313,9 @@ mkdir examples tar xjf %{SOURCE7} -C examples tar xzf %{SOURCE8} -C examples +tar xzf %{SOURCE9} # order mess with docs somewhat -mkdir docs -mkdir docs/html +mkdir -p docs/html mv htmlman docs/html/ocaml cp %{SOURCE2} docs/ocaml.ps.gz mv camlp4-%{p4ver}-manual.html docs/html/camlp4 @@ -293,10 +328,18 @@ #%patch3 -p1 %patch4 -p1 -%build +# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS) +Makefiles=$(find . -type f -name Makefile\*) +%{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles +%{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles +%{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles +%{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile +%{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile + +%build cp -f /usr/share/automake/config.sub config/gnu ./configure \ - -cc "%{__cc} %{rpmcflags}" \ + -cc "%{__cc}" \ -bindir %{_bindir} \ -libdir %{_libdir}/%{name} \ -mandir %{_mandir}/man1 \ @@ -305,12 +348,12 @@ -with-pthread \ -x11lib /usr/X11R6/%{_lib} -%{__make} world bootstrap opt.opt -%{__make} -C tools objinfo +%{__make} world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall" +%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_examplesdir}/%{name}-{labltk-,}%{version}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}} %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ @@ -360,9 +403,18 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man3 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp} +# install info pages +cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir} + %clean rm -rf $RPM_BUILD_ROOT +%post doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + +%postun doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + %files runtime %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/ocamlrun @@ -378,7 +430,6 @@ %files %defattr(644,root,root,755) %doc LICENSE Changes README Upgrading -%doc docs/html/ocaml %attr(755,root,root) %{_bindir}/ocaml* %{!?_without_tk:%exclude %{_bindir}/ocamlbrowser} %exclude %{_bindir}/ocamlrun @@ -423,7 +474,6 @@ %files camlp4 %defattr(644,root,root,755) -%doc docs/html/camlp4* %attr(755,root,root) %{_bindir}/*camlp4* %attr(755,root,root) %{_bindir}/ocpp # Not installed since 3.05, is is needed? @@ -432,6 +482,10 @@ %{_mandir}/man*/*camlp4* %{_mandir}/man*/*ocpp* +%files camlp4-doc-html +%defattr(644,root,root,755) +%doc docs/html/camlp4* + %if %{with tk} %files labltk-devel %defattr(644,root,root,755) @@ -472,16 +526,34 @@ %{_libdir}/%{name}/ocamldoc/*.cm* %{_libdir}/%{name}/ocamldoc/*.a +%files doc-html +%defattr(644,root,root,755) +%doc docs/html/ocaml/* + %files doc-ps %defattr(644,root,root,755) %doc docs/*.ps.gz +%files doc-info +%defattr(644,root,root,755) +%{_infodir}/ocaml.info* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/26 17:13:12 twittner +- added ocaml-doc-info subpkg (but info page suffer from + lack of index). +- moved html docs in separate subpkgs: ocaml-doc-html, + ocaml-camlp4-doc-html. Updated descriptions. +- replace (by editing Makefiles by sed) hardcoded `-O', + `-pg', `-DPROFILING' with $(CFLAGS). Allow passing + CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 +- rel. 2 + Revision 1.98 2005/08/15 15:59:03 qboosh - updated to 3.08.4, removed outdated gcc-pr21291-workaround patch - updated pure-fun and ds-contrib source URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml.spec?r1=1.98&r2=1.99&f=u From baggins at pld-linux.org Fri Aug 26 12:51:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES (LINUX_2_6): kernel-alpha-smp.config, kernel-alpha.config, ... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 10:51:18 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_ATM_DD=m ---- Files affected: SOURCES: kernel-alpha-smp.config (1.33.10.152 -> 1.33.10.153) , kernel-alpha.config (1.30.6.3.2.144 -> 1.30.6.3.2.145) , kernel-i386-smp.config (1.59.10.103 -> 1.59.10.104) , kernel-i386.config (1.82.10.108 -> 1.82.10.109) , kernel-ia64-smp.config (1.1.2.21 -> 1.1.2.22) , kernel-ia64.config (1.1.2.20 -> 1.1.2.21) , kernel-sparc-smp.config (1.9.2.6.2.80 -> 1.9.2.6.2.81) , kernel-sparc.config (1.37.2.109 -> 1.37.2.110) , kernel-sparc64-smp.config (1.48.2.95 -> 1.48.2.96) , kernel-sparc64.config (1.48.2.82 -> 1.48.2.83) , kernel-x86_64-smp.config (1.1.2.87 -> 1.1.2.88) , kernel-x86_64.config (1.1.2.87 -> 1.1.2.88) , kernel-xen0-x86_32-2.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_32-3.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_64-3.0.config (1.1.2.8 -> 1.1.2.9) , kernel-xenU-x86_32-3.0.config (1.1.2.2 -> 1.1.2.3) , kernel-xenU-x86_64-3.0.config (1.1.2.2 -> 1.1.2.3) ---- Diffs: ================================================================ Index: SOURCES/kernel-alpha-smp.config diff -u SOURCES/kernel-alpha-smp.config:1.33.10.152 SOURCES/kernel-alpha-smp.config:1.33.10.153 --- SOURCES/kernel-alpha-smp.config:1.33.10.152 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha-smp.config Fri Aug 26 12:51:12 2005 @@ -1020,6 +1020,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-alpha.config diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.144 SOURCES/kernel-alpha.config:1.30.6.3.2.145 --- SOURCES/kernel-alpha.config:1.30.6.3.2.144 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha.config Fri Aug 26 12:51:12 2005 @@ -1034,6 +1034,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.103 SOURCES/kernel-i386-smp.config:1.59.10.104 --- SOURCES/kernel-i386-smp.config:1.59.10.103 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386-smp.config Fri Aug 26 12:51:12 2005 @@ -1406,6 +1406,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.108 SOURCES/kernel-i386.config:1.82.10.109 --- SOURCES/kernel-i386.config:1.82.10.108 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386.config Fri Aug 26 12:51:12 2005 @@ -1422,6 +1422,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64-smp.config diff -u SOURCES/kernel-ia64-smp.config:1.1.2.21 SOURCES/kernel-ia64-smp.config:1.1.2.22 --- SOURCES/kernel-ia64-smp.config:1.1.2.21 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64-smp.config Fri Aug 26 12:51:12 2005 @@ -1024,6 +1024,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64.config diff -u SOURCES/kernel-ia64.config:1.1.2.20 SOURCES/kernel-ia64.config:1.1.2.21 --- SOURCES/kernel-ia64.config:1.1.2.20 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64.config Fri Aug 26 12:51:12 2005 @@ -1039,6 +1039,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc-smp.config diff -u SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 SOURCES/kernel-sparc-smp.config:1.9.2.6.2.81 --- SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc-smp.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc.config diff -u SOURCES/kernel-sparc.config:1.37.2.109 SOURCES/kernel-sparc.config:1.37.2.110 --- SOURCES/kernel-sparc.config:1.37.2.109 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc64-smp.config diff -u SOURCES/kernel-sparc64-smp.config:1.48.2.95 SOURCES/kernel-sparc64-smp.config:1.48.2.96 --- SOURCES/kernel-sparc64-smp.config:1.48.2.95 Wed Aug 17 18:46:48 2005 +++ SOURCES/kernel-sparc64-smp.config Fri Aug 26 12:51:12 2005 @@ -848,6 +848,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc64.config diff -u SOURCES/kernel-sparc64.config:1.48.2.82 SOURCES/kernel-sparc64.config:1.48.2.83 --- SOURCES/kernel-sparc64.config:1.48.2.82 Thu Aug 18 14:06:12 2005 +++ SOURCES/kernel-sparc64.config Fri Aug 26 12:51:12 2005 @@ -849,6 +849,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64-smp.config diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.87 SOURCES/kernel-x86_64-smp.config:1.1.2.88 --- SOURCES/kernel-x86_64-smp.config:1.1.2.87 Thu Aug 18 14:10:18 2005 +++ SOURCES/kernel-x86_64-smp.config Fri Aug 26 12:51:12 2005 @@ -1181,6 +1181,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64.config diff -u SOURCES/kernel-x86_64.config:1.1.2.87 SOURCES/kernel-x86_64.config:1.1.2.88 --- SOURCES/kernel-x86_64.config:1.1.2.87 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-x86_64.config Fri Aug 26 12:51:13 2005 @@ -1184,6 +1184,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-2.0.config diff -u SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-2.0.config Fri Aug 26 12:51:13 2005 @@ -1421,6 +1421,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-3.0.config diff -u SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -1325,6 +1325,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_64-3.0.config diff -u SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.9 --- SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -1293,6 +1293,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xenU-x86_32-3.0.config diff -u SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -609,6 +609,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ Index: SOURCES/kernel-xenU-x86_64-3.0.config diff -u SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -797,6 +797,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-alpha-smp.config?r1=1.33.10.152&r2=1.33.10.153&f=u http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.144&r2=1.30.6.3.2.145&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.103&r2=1.59.10.104&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.108&r2=1.82.10.109&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64-smp.config?r1=1.1.2.21&r2=1.1.2.22&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64.config?r1=1.1.2.20&r2=1.1.2.21&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc-smp.config?r1=1.9.2.6.2.80&r2=1.9.2.6.2.81&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.109&r2=1.37.2.110&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64-smp.config?r1=1.48.2.95&r2=1.48.2.96&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.82&r2=1.48.2.83&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-2.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-3.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_64-3.0.config?r1=1.1.2.8&r2=1.1.2.9&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_32-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_64-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:59:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: msmtp.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:59:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: msmtp.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.49 SPECS/msmtp.spec:1.50 --- SPECS/msmtp.spec:1.49 Fri Aug 26 18:50:52 2005 +++ SPECS/msmtp.spec Fri Aug 26 19:59:31 2005 @@ -47,7 +47,8 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. +konfiguracyjnym) lub zrobienie dowi?zania symbolicznego do +/usr/sbin/sendmail. %prep %setup -q @@ -98,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/26 17:59:31 qboosh +- pl fix + Revision 1.49 2005/08/26 16:50:52 wolvverine - 1.4.4 - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.49&r2=1.50&f=u From glen at pld-linux.org Fri Aug 26 01:04:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES: mozillaOrgPerson.schema - it's actually v0.6.4 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:04:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - it's actually v0.6.4 ---- Files affected: SOURCES: mozillaOrgPerson.schema (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u SOURCES/mozillaOrgPerson.schema:1.1 SOURCES/mozillaOrgPerson.schema:1.2 --- SOURCES/mozillaOrgPerson.schema:1.1 Fri Aug 26 01:02:28 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:04:29 2005 @@ -1,5 +1,5 @@ # -# mozillaOrgPerson schema v. 0.6.3 +# mozillaOrgPerson schema v. 0.6.4 # # req. core @@ -174,4 +174,4 @@ mozillaCustom4 ) ) # not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' -# \ No newline at end of file +# ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mozillaOrgPerson.schema?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 01:02:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES: mozillaOrgPerson.schema (NEW) - saved v0.6.3 from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:02:33 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved v0.6.3 from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaOrgPerson.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u /dev/null SOURCES/mozillaOrgPerson.schema:1.1 --- /dev/null Fri Aug 26 01:02:33 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:02:28 2005 @@ -0,0 +1,177 @@ +# +# mozillaOrgPerson schema v. 0.6.3 +# + +# req. core +# req. cosine +# req. inetorgperson + +# attribute defs + +attributetype ( 1.3.6.1.4.1.13769.2.1.1 + NAME ( 'mozillaNickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.2 + NAME ( 'mozillaUseHtmlMail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.3 + NAME 'mozillaSecondEmail' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.4 + NAME 'mozillaHomeLocalityName' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.5 + NAME 'mozillaPostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.6 + NAME 'mozillaHomePostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.7 + NAME ( 'mozillaHomeState' ) SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.8 + NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.9 + NAME ( 'mozillaHomeCountryName' ) + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.10 + NAME ( 'mozillaHomeFriendlyCountryName' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.11 + NAME ( 'mozillaHomeUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.12 + NAME ( 'mozillaWorkUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# un-comment for all LDAP server NOT supporting SYNTAX 2.16.840.1.113730.3.7.1 +attributetype ( 1.3.6.1.4.1.13769.2.1.13 + NAME ( 'nsAIMid' ) + DESC 'AOL Instant Messenger (AIM) Identity' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.14 NAME ( 'mozillaHomeStreet' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +# un-comment for Netscape 6.x and all other LDAP server supporting SYNTAX 2.16.840.1.113730.3.7.1 +# attributeTypes ( 2.16.840.1.113730.3.1.2013 +# NAME ( 'nsAIMid' ) +# DESC 'AOL Instant Messenger (AIM) Identity' +# SYNTAX 2.16.840.1.113730.3.7.1 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.96 + NAME ( 'mozillaCustom1' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.97 + NAME ( 'mozillaCustom2' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.98 + NAME ( 'mozillaCustom3' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.99 + NAME ( 'mozillaCustom4' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# defined in "A Summary of the X.500(96) User Schema for use with LDAPv3" - RFC 2256 +# +# attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' ) +# DESC 'RFC2256: ISO-3166 country 2-letter code' +# SUP name SINGLE-VALUE ) + +# defined in "The COSINE and Internet X.500 Schema" - RFC 1274 +# +# attributetype ( 0.9.2342.19200300.100.1.43 +# NAME ( 'co' 'friendlyCountryName' ) +# DESC 'RFC1274: friendly country name' +# EQUALITY caseIgnoreMatch +# SUBSTR caseIgnoreSubstringsMatch +# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +# objectClass defs + +objectclass ( 1.3.6.1.4.1.13769.2.2.1 + NAME 'mozillaOrgPerson' + SUP top + AUXILIARY + MAY ( + sn $ + givenName $ + cn $ + displayName $ + mozillaNickname $ + title $ + telephoneNumber $ + facsimileTelephoneNumber $ + mobile $ + pager $ + homePhone $ + street $ + postalCode $ + mozillaPostalAddress2 $ + mozillaHomeStreet $ + mozillaHomePostalAddress2 $ + l $ + mozillaHomeLocalityName $ + st $ + mozillaHomeState $ + mozillaHomePostalCode $ + c $ + mozillaHomeCountryName $ + co $ + mozillaHomeFriendlyCountryName $ + ou $ + o $ + mail $ + mozillaSecondEmail $ + mozillaUseHtmlMail $ + nsAIMid $ + mozillaHomeUrl $ + mozillaWorkUrl $ + description $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 ) ) + +# not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' +# \ No newline at end of file ================================================================ From havner at pld-linux.org Fri Aug 26 16:07:08 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 09:39:22 2005 Subject: CVSROOT: users - ares's mail change (on his request) In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 14:07:08 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - ares's mail change (on his request) ---- Files affected: CVSROOT: users (1.386 -> 1.387) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.386 CVSROOT/users:1.387 --- CVSROOT/users:1.386 Fri Aug 26 12:39:16 2005 +++ CVSROOT/users Fri Aug 26 16:07:03 2005 @@ -14,7 +14,7 @@ arekm:miskiewicz@beep.pl:Arkadiusz Mi?kiewicz:arekm@jabber.bnet.pl arekmat:arekmat@amba.bydg.pdi.net:Arkadiusz Grz?dzicki areq:areq@areq.eu.org:Arkadiusz Patyk -ares:ares@betanet.pl:Piotr Siwicki +ares:p.siwicki@mpoczta.net:Piotr Siwicki arturs:arturs@linuxpl.org:Artur Skura averne:averne@pld-dc.org:Marcin Doli?ski:averne@kamp.pl baggins:baggins@sith.mimuw.edu.pl:Jan R?korajski ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.386&r2=1.387&f=u From glen at pld-linux.org Fri Aug 26 00:31:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:22 2005 Subject: SOURCES: mozillaAddressBookEntry.schema (NEW) - saved from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 22:31:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaAddressBookEntry.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaAddressBookEntry.schema diff -u /dev/null SOURCES/mozillaAddressBookEntry.schema:1.1 --- /dev/null Fri Aug 26 00:31:11 2005 +++ SOURCES/mozillaAddressBookEntry.schema Fri Aug 26 00:31:06 2005 @@ -0,0 +1,147 @@ +# Mozilla: @VERSION@ +# +# mozillaAddressBookEntry +# +# This file contains LDAPv3 schema for use with the Mozilla Address Book +# and is intended to ... + +# Depends upon +# Definition of an X.500 Attribute Type and an Object Class to Hold +# Uniform Resource Identifiers (URIs) [RFC2079], and A Summary of +# the X.500(96) User Schema for use with LDAPv3 [RFC2256] (core.schema) +# +# The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema) +# +# The InetOrgPerson Schema [RFC2798] (inetorgperson.schema) + +# 1.3.6.1.4.1.13769.4.x - Mozilla AB 'Other' tab + +attributetype ( 1.3.6.1.4.1.13769.4.1 NAME 'mozillaCustom1' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.2 NAME 'mozillaCustom2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.3 NAME 'mozillaCustom3' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.4 NAME 'mozillaCustom4' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + + +# 1.3.6.1.4.1.13769.3.x - Mozilla AB 'Address' tab + +attributetype ( 1.3.6.1.4.1.13769.3.1 NAME 'mozillaHomeStreet' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.2 NAME 'mozillaHomeStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.3 NAME 'mozillaHomeLocalityName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.4 NAME 'mozillaHomeState' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.5 NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.6 NAME 'mozillaHomeCountryName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.7 NAME 'mozillaHomeUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.8 NAME 'mozillaWorkStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.9 NAME 'mozillaWorkUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +# 1.3.6.1.4.1.13769.2.x - Mozilla AB 'Contact' tab + +attributetype ( 1.3.6.1.4.1.13769.2.1 + NAME ( 'mozillaNickname' 'xmozillanickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.2 + NAME ( 'mozillaSecondEmail' 'xmozillasecondemail' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.3 + NAME ( 'mozillaUseHtmlMail' 'xmozillausehtmlmail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) + +# AOL Instant Messenger (AIM) Identity +attributetype ( 1.3.6.1.4.1.13769.2.4 + NAME ( 'nsAIMid' 'nscpaimscreenname' ) + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +# 1.3.6.1.4.1.13769.9 - Mozilla AB objectclasses + +# The mozillaAddressBookEntry object class is used to define entries +# representing Cards in the Mozilla Address Book. The commonName attribute +# is used for naming entries of this object class, but may not be unique. + +objectclass ( 1.3.6.1.4.1.13769.9.1 NAME 'mozillaAddressBookEntry' + SUP top AUXILIARY + MUST ( cn ) + MAY( c $ + department $ + description $ + fax $ + givenName $ + homeTelephoneNumber $ + l $ + mail $ + mobile $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 $ + mozillaHomeCountryName $ + mozillaHomeLocalityName $ + mozillaHomePostalCode $ + mozillaHomeState $ + mozillaHomeStreet $ + mozillaHomeStreet2 $ + mozillaHomeUrl $ + mozillaNickname $ + mozillaSecondeMail $ + mozillaUseHtmlMail $ + mozillaWorkStreet2 $ + mozillaWorkUrl $ + nsAIMid $ + o $ + ou $ + pager $ + postalCode $ + postOfficeBox $ + sn $ + st $ + street $ + telephoneNumber $ + title ) ) + ================================================================ From arekm at pld-linux.org Fri Aug 26 18:07:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: kdelibs.spec - rel 3; rebuild In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 16:07:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3; rebuild ---- Files affected: SPECS: kdelibs.spec (1.415 -> 1.416) ---- Diffs: ================================================================ Index: SPECS/kdelibs.spec diff -u SPECS/kdelibs.spec:1.415 SPECS/kdelibs.spec:1.416 --- SPECS/kdelibs.spec:1.415 Thu Aug 11 11:46:18 2005 +++ SPECS/kdelibs.spec Fri Aug 26 18:07:07 2005 @@ -21,7 +21,7 @@ Summary(uk): K Desktop Environment - ?????????? Name: kdelibs Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: LGPL Group: X11/Libraries @@ -959,6 +959,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.416 2005/08/26 16:07:07 arekm +- rel 3; rebuild + Revision 1.415 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.415&r2=1.416&f=u From jajcus at pld-linux.org Fri Aug 26 10:43:12 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 09:39:22 2005 Subject: SPECS: Zope3.spec (NEW) - new, based on Zope.spec, NFY In-Reply-To: References: Message-ID: Author: jajcus Date: Fri Aug 26 08:43:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new, based on Zope.spec, NFY ---- Files affected: SPECS: Zope3.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u /dev/null SPECS/Zope3.spec:1.1 --- /dev/null Fri Aug 26 10:43:12 2005 +++ SPECS/Zope3.spec Fri Aug 26 10:43:05 2005 @@ -0,0 +1,255 @@ +# $Revision$, $Date$ + +Summary: An application server and portal toolkit for building Web sites +Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web +Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW +Summary(pt_BR): Um servidor de aplica??es e um conjunto de ferramentas para constru??o de sites Web +Name: Zope3 +Version: 3.1.0 +%define sub_ver c1 +Release: 0.%{sub_ver}.0.1 +License: Zope Public License (ZPL) +Group: Networking/Daemons +Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz +# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +Source1: %{name}.init +Source2: %{name}.sysconfig +Source3: %{name}.logrotate +URL: http://dev.zope.org/Zope3 +BuildRequires: python-devel >= 1:2.4.1 +BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.213 +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(post,preun): /sbin/chkconfig +Requires: expat >= 1.95.7 +Requires: logrotate +Requires: python >= 2.4.1 +Requires: python-modules >= 2.4.1 +Requires: python-libs >= 2.4.1 +Requires: python-zope-interface = %{epoch}:%{version}-%{release} +%pyrequires_eq python +Provides: group(zope) +Provides: user(zope) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define zope_dir /usr/lib/zope3 + +%description +The Z Object Programming Environment (Zope) is a free, Open Source +Python-based application server for building high-performance, dynamic +web sites, using a powerful and simple scripting object model and +high-performance, integrated object database. + +This project is a redesign of Zope 2 and seeks to improve the Zope development +experience through the use of Interfaces and Components. + +%description -l es +Zope es una aplicaci?n basada en Python, Open Source[tm], para la +construcci?n de sitios din?micos, usa un modelo de escritura de +guiones poderoso y sencillo. Para instalar la aplicaci?n Zope, instale +ese paquete y despu?s, Zope-server, para un servidor HTTP integrado +simple, Zope-pcgi, para uso con el servidor Apache. Si desea instalar +solamente algunas partes de la aplicaci?n Zope, est?n diponibles otros +subpaquetes, usted debe instalar ?stos en vez de ese RPM. + +%description -l pl +Zope (Z Object Programming Environment - Obiektowe ?rodowisko +Programistyczne Z) jest opartym o Pythona serwerem aplikacji do +tworzenia wysoko wydajnych, dynamicznych serwis?w WWW, przy u?yciu +u?ytecznego i prostego modelu obiektowego skrypt?w oraz wysoko +wydajnej zintegrowanej obiektowej bazy danych. + +%description -l pt_BR +Zope ? uma aplica??o baseada em Python, Open Source[tm], para +constru??o de sites din?micos, usando um modelo de scripting poderoso +e simples Para instalar o Zope, instale esse pacote e depois, ou o +Zope-server, para um servidor HTTP integrado simples, ou Zope-pcgi, +para uso com o Apache. Se voc? quiser instalar apenas algumas partes +do Zope, outros sub-pacotes est?o dispon?veis, e voc? deveria instalar +eles ao inv?s desse RPM. + +%package -n python-zope +Summary: Python packages developed as part of the Zope 3 project. +Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Group: Development/Tools +Obsoletes: ZopeInterface +Provides: ZopeInterface +Provides: python-zope-cachedescriptors +Provides: python-zope-component +Provides: python-zope-configuration +Provides: python-zope-deprecation +Provides: python-zope-documenttemplate +Provides: python-zope-event +Provides: python-zope-exceptions +Provides: python-zope-hookable +Provides: python-zope-i18n +Provides: python-zope-i18nmessageid +Provides: python-zope-index +Provides: python-zope-interface +Provides: python-zope-modulealias +Provides: python-zope-pagetemplate +Provides: python-zope-proxy +Provides: python-zope-publisher +Provides: python-zope-schema +Provides: python-zope-security +Provides: python-zope-server +Provides: python-zope-structuredtext +Provides: python-zope-tal +Provides: python-zope-tales +Provides: python-zope-testing +Provides: python-zope-thread + +%description -n python-zope +The "zope" package is a pure namespace package holding packages developed as +part of the Zope 3 project. + +Generally, the immediate subpackages of the "zope" package should be useful and +usable outside of the Zope application server. Subpackages of the "zope" +package should have minimal interdependencies, although most depend on +"zope.interface". + +%prep +%setup -q -n Zope-%{version}%{sub_ver} + +%build +./configure \ + --prefix=%{zope_dir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT{%{py_sitedir},%{_sbindir}} \ + $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ + $RPM_BUILD_ROOT{/var/lib/zope3/main,/var/run/zope3,/var/log/zope3/main} \ + $RPM_BUILD_ROOT%{_sysconfdir}/zope3/main + +python install.py -q install --skip-build --home "%{zope_dir}" --root "$RPM_BUILD_ROOT" +mv $RPM_BUILD_ROOT%{zope_dir}/lib/python/zope $RPM_BUILD_ROOT%{py_sitedir} + +find $RPM_BUILD_ROOT%{py_sitedir}/zope -name '*.txt' -o -name '*.cfg' | xargs rm + +%py_comp $RPM_BUILD_ROOT%{py_sitedir}/zope +%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/zope + +ln -sf %{zope_dir}/bin/mkzopeinstance $RPM_BUILD_ROOT%{_sbindir}/mkzope3instance +for f in zconfig zconfig_schema2html zopetest ; do + ln -sf %{zope_dir}/bin/"$f" $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done +for f in mkzeoinst runzeo zdctl zdrun zeoctl zeopasswd ; do + ln -sf %{zope_dir}/bin/"$f".py $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done + +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/zope3 +install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/zope3 +install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/zope3 + +touch $RPM_BUILD_ROOT/var/log/zope3/main/event.log +touch $RPM_BUILD_ROOT/var/log/zope3/main/Z2.log + + +#install -d $RPM_BUILD_ROOT{/var/lib/zope/main,/var/run/zope,/var/log/zope/main} \ +# $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ +# $RPM_BUILD_ROOT{%{_sysconfdir}/zope/main,%{_sbindir}} \ +# $RPM_BUILD_ROOT%{zope_dir}/bin +# +#ln -sfn /usr/bin/python $RPM_BUILD_ROOT%{zope_dir}/bin/python +# +#%{__make} install \ +# INSTALL_FLAGS="--root $RPM_BUILD_ROOT" +# +#mv $RPM_BUILD_ROOT%{zope_dir}/bin/zpasswd.py $RPM_BUILD_ROOT%{_sbindir}/zpasswd +#mv $RPM_BUILD_ROOT%{zope_dir}/skel $RPM_BUILD_ROOT%{_sysconfdir}/zope +#mv $RPM_BUILD_ROOT{%{zope_dir}/import/*,%{_sysconfdir}/zope/skel/import} +# +#rm -rf $RPM_BUILD_ROOT%{zope_dir}/doc +#rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/log +#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/bin/{runzope.bat,zopeservice.py}.in +# +#install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/mkzopeinstance +#install %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}/mkzeoinstance +#install %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/runzope +#install %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/zopectl +#install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/installzopeproduct +# + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +%groupadd -g 112 zope +%useradd -u 112 -d /var/lib/zope/main -s /bin/false -c "Zope User" -g zope zope + +%post +/sbin/chkconfig --add zope +if [ ! -f /etc/zope/main/zope.conf ] ; then + echo "Creating initial 'main' instance..." + /usr/sbin/mkzope3instance main zope:zope + echo "Instance created. Listening on 127.0.0.1:8080, initial user: 'zope' with password: 'zope'" +fi + +%preun +if [ "$1" = "0" ]; then + if [ -f /var/lock/subsys/zope ]; then + /etc/rc.d/init.d/zope stop + fi + /sbin/chkconfig --del zope +fi + +%postun +if [ "$1" = "0" ] ; then + %userremove zope + %groupremove zope +fi + +%files +%defattr(644,root,root,755) +%doc Zope/doc/* +%attr(754,root,root) /etc/rc.d/init.d/zope3 +%attr(755,root,root) %{_sbindir}/* +%dir %{zope_dir} +%dir %{zope_dir}/bin +%attr(755,root,root) %{zope_dir}/bin/* +%{zope_dir}/include +%{zope_dir}/lib +%dir %{zope_dir}/zopeskel +%dir %{zope_dir}/zopeskel/bin +%attr(755,root,root) %{zope_dir}/zopeskel/bin/* +%{zope_dir}/zopeskel/etc +%{zope_dir}/zopeskel/lib +%{zope_dir}/zopeskel/log +%{zope_dir}/zopeskel/var +%{zope_dir}/zopeskel/README.txt +%{py_sitedir}/zope/app +%attr(775,zope,zope) %dir /var/run/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3/main +%attr(775,zope,zope) %dir /var/log/zope3 +%attr(775,zope,zope) %dir /var/log/zope3/main +%attr(640,root,root) %dir /etc/zope3 +%attr(640,root,root) %dir /etc/zope3/main +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/zope3 +%attr(640,root,root) /etc/sysconfig/zope3 +%ghost /var/log/zope3/main/event.log +%ghost /var/log/zope3/main/Z2.log + +%files -n python-zope +%defattr(644,root,root,755) +%{py_sitedir}/zope +%exclude %{py_sitedir}/zope/app + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/26 08:43:05 jajcus +- new, based on Zope.spec, NFY + ================================================================ From baggins at pld-linux.org Fri Aug 26 17:54:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES (LINUX_2_6): kernel-netfilter.config CONFIG_IP_NF_PPTP dis... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:54:53 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_IP_NF_PPTP disabled as it's sure to cause Oops ---- Files affected: SOURCES: kernel-netfilter.config (1.34.2.43 -> 1.34.2.44) ---- Diffs: ================================================================ Index: SOURCES/kernel-netfilter.config diff -u SOURCES/kernel-netfilter.config:1.34.2.43 SOURCES/kernel-netfilter.config:1.34.2.44 --- SOURCES/kernel-netfilter.config:1.34.2.43 Thu Jul 28 22:33:41 2005 +++ SOURCES/kernel-netfilter.config Fri Aug 26 17:54:48 2005 @@ -77,8 +77,8 @@ CONFIG_IP_NF_NAT_H323=m CONFIG_IP_NF_H323=m CONFIG_IP_NF_CT_PROTO_GRE=m -CONFIG_IP_NF_PPTP=m -CONFIG_IP_NF_NAT_PPTP=m +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_NAT_PPTP is not set CONFIG_IP_NF_NAT_PROTO_GRE=m CONFIG_IP_NF_MATCH_IPV4OPTIONS=m CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP=m ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.43&r2=1.34.2.44&f=u From paszczus at pld-linux.org Fri Aug 26 16:33:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: ocaml-lablgl.spec - rel up for rebuild with ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:33:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel up for rebuild with ocaml 3.08.4 ---- Files affected: SPECS: ocaml-lablgl.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.18 SPECS/ocaml-lablgl.spec:1.19 --- SPECS/ocaml-lablgl.spec:1.18 Thu Mar 17 09:36:09 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:32:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Wi?zania OpenGL dla OCamla Name: ocaml-lablgl Version: 1.01 -Release: 3 +Release: 4 License: BSD Group: Libraries Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/26 14:32:56 paszczus +- rel up for rebuild with ocaml 3.08.4 + Revision 1.18 2005/03/17 08:36:09 paszczus - release up for rebuild with ocaml ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.18&r2=1.19&f=u From adamg at pld-linux.org Fri Aug 26 18:25:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 09:39:23 2005 Subject: admin: distfiles/README, distfiles/file-fetcher.pl - Don't check t... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:25:17 2005 GMT Module: admin Tag: HEAD ---- Log message: - Don't check the server certificate against the available certificate authorities (wget 1.10 refused to download lkcp sources) ---- Files affected: admin/distfiles: README (1.2 -> 1.3) , file-fetcher.pl (1.38 -> 1.39) ---- Diffs: ================================================================ Index: admin/distfiles/README diff -u admin/distfiles/README:1.2 admin/distfiles/README:1.3 --- admin/distfiles/README:1.2 Tue May 27 03:33:29 2003 +++ admin/distfiles/README Fri Aug 26 18:25:12 2005 @@ -1,6 +1,8 @@ Skrypty w tym katalogu zawieraj? automatyczny zasysacz plik?w do repozytorium distfiles. +Wymagania: wget >= 1.10 + Jak to dzia?a? S? dwie cz??ci: ================================================================ Index: admin/distfiles/file-fetcher.pl diff -u admin/distfiles/file-fetcher.pl:1.38 admin/distfiles/file-fetcher.pl:1.39 --- admin/distfiles/file-fetcher.pl:1.38 Thu Feb 3 18:20:47 2005 +++ admin/distfiles/file-fetcher.pl Fri Aug 26 18:25:12 2005 @@ -212,8 +212,8 @@ my $all_out = ""; my $bn = basename($url); my $local = "$tmp_dir/$md5/$bn"; - my $cmd = "wget -nv -O $local \"$url\""; - my $cmd2 = "wget -nv --passive-ftp -O $local \"$url\""; + my $cmd = "wget -nv --no-check-certificate -O $local \"$url\""; + my $cmd2 = "wget -nv --no-check-certificate --passive-ftp -O $local \"$url\""; push @files, $bn; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/admin/distfiles/README?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/admin/distfiles/file-fetcher.pl?r1=1.38&r2=1.39&f=u From mguevara at pld-linux.org Fri Aug 26 01:59:46 2005 From: mguevara at pld-linux.org (mguevara) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS (LINUX_2_6): kernel.spec - patch 145 linux-2.6-cx88-blackbir... In-Reply-To: References: Message-ID: Author: mguevara Date: Thu Aug 25 23:59:46 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) - rel 0.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1165 -> 1.441.2.1166) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1165 SPECS/kernel.spec:1.441.2.1166 --- SPECS/kernel.spec:1.441.2.1165 Thu Aug 25 19:09:47 2005 +++ SPECS/kernel.spec Fri Aug 26 01:59:40 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.3 +%define _rel 0.4 %define _netfilter_snap 20050801 @@ -260,6 +260,9 @@ # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch +# derived from http://www.spinics.net/lists/vfl/msg15217.html +Patch145: linux-2.6-cx88-blackbird.patch + # derived from http://www.grsecurity.net/grsecurity-2.1.5-2.6.11.7-200504111924.patch.gz Patch200: grsecurity-2.1.5-2.6.11.7-200504111924.patch # http://openmosix.snarc.org/files/releases/2.6/ @@ -698,6 +701,7 @@ %if %{with abi} %patch135 -p1 %endif +%patch145 -p0 %endif %if %{with grsecurity} @@ -1486,6 +1490,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara +- patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird + based tv tuner cards (Winfast PVR2000) +- rel 0.4 + Revision 1.441.2.1165 2005/08/25 17:09:47 baggins - ATM TODO done ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1165&r2=1.441.2.1166&f=u From glen at pld-linux.org Fri Aug 26 01:05:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec (NEW) - created In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:05:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u /dev/null SPECS/openldap-schema-mozillaorgperson.spec:1.1 --- /dev/null Fri Aug 26 01:05:12 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Fri Aug 26 01:05:07 2005 @@ -0,0 +1,82 @@ +# $Revision$, $Date$ +Summary: Mozilla LDAP schema +Name: openldap-schema-mozillaorgperson +Version: 0.6.3 +Release: 0.2 +Epoch: 0 +License: ? +Group: Networking/Daemons +Source0: mozillaOrgPerson.schema +URL: https://bugzilla.mozilla.org/show_bug.cgi?id=116692 +Requires(post,postun): sed >= 4.0 +Requires: openldap-servers +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define schemadir /usr/share/openldap/schema + +%description +This package contains LDAPv3 schema for use with the Mozilla Address +Book. + +%prep +%setup -q -c -T +cp %{SOURCE0} . + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{schemadir} + +install *.schema $RPM_BUILD_ROOT%{schemadir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if ! grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*local.schema/{ + i\ +include %{schemadir}/mozillaOrgPerson.schema + } + + # enable dependant schemas: cosine, inetorgperson and core + /^#include.*\(cosine\|inetorgperson\|core\)\.schema/{ + s/^#// + } + ' /etc/openldap/slapd.conf +fi + +if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : +fi + +%postun +if [ "$1" = "0" ]; then + if grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*\/usr\/share\/openldap\/schema\/mozillaOrgPerson\.schema/d + + # for symmetry it would be nice if we disable enabled schemas in post, + # but we really can not do that, it would break something else. + ' /etc/openldap/slapd.conf + fi + + if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : + fi +fi + +%files +%defattr(644,root,root,755) +%{schemadir}/*.schema + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 23:05:07 glen +- created + ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:18:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: pcre-cxx.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:18:31 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pcre-cxx.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From andree at pld-linux.org Fri Aug 26 20:19:30 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: clamsmtp.spec - updated to 1.5 In-Reply-To: References: Message-ID: Author: andree Date: Fri Aug 26 18:19:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5 ---- Files affected: SPECS: clamsmtp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/clamsmtp.spec diff -u SPECS/clamsmtp.spec:1.14 SPECS/clamsmtp.spec:1.15 --- SPECS/clamsmtp.spec:1.14 Fri May 13 01:25:48 2005 +++ SPECS/clamsmtp.spec Fri Aug 26 20:19:22 2005 @@ -2,12 +2,12 @@ Summary: clamav-based antivirus SMTP-level gateway Summary(pl): Oparta na clamavie bramka antywirusowa SMTP Name: clamsmtp -Version: 1.4.1 +Version: 1.5 Release: 1 License: BSD Group: Applications/Networking Source0: http://memberwebs.com/nielsen/software/clamsmtp/%{name}-%{version}.tar.gz -# Source0-md5: 4eb6311f5f46bf76e9b7490247ba59ed +# Source0-md5: 521e43f5872cab8e53c21285041a759f Source1: %{name}.init Patch0: %{name}-config.patch URL: http://memberwebs.com/nielsen/software/clamsmtp/ @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/26 18:19:22 andree +- updated to 1.5 + Revision 1.14 2005/05/12 23:25:48 zbyniu - up to 1.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamsmtp.spec?r1=1.14&r2=1.15&f=u From andree at pld-linux.org Fri Aug 26 20:19:42 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: clamsmtp-1.5.tar.gz Message-ID: <4034.1125080382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-1.5.tar.gz 521e43f5872cab8e53c21285041a759f clamsmtp-1.5.tar.gz Size: 148067 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 20:20:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: evolution-data-server.spec - pl for openldap-schema- In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:20:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for openldap-schema- ---- Files affected: SPECS: evolution-data-server.spec (1.54 -> 1.55) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.54 SPECS/evolution-data-server.spec:1.55 --- SPECS/evolution-data-server.spec:1.54 Sat Aug 20 14:36:25 2005 +++ SPECS/evolution-data-server.spec Fri Aug 26 20:20:52 2005 @@ -56,12 +56,16 @@ %package -n openldap-schema-evolutionperson Summary: evolutionperson LDAP schema +Summary(pl): Schemat LDAP evolutionperson Group: Networking/Daemons Requires(post,postun): sed >= 4.0 Requires: openldap-servers %description -n openldap-schema-evolutionperson -This package contains evolutionperson.schema for openldap. +This package contains evolutionperson.schema for openldap server. + +%description -n openldap-schema-evolutionperson -l pl +Ten pakiet zawiera evolutionperson.schema dla serwera openldap. %package devel Summary: Evolution data server development files @@ -180,7 +184,7 @@ fi if [ -f /var/lock/subsys/ldap ]; then - /etc/rc.d/init.d/ldap restart >&2 + /etc/rc.d/init.d/ldap restart >&2 fi %postun -n openldap-schema-evolutionperson @@ -243,6 +247,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.55 2005/08/26 18:20:52 qboosh +- pl for openldap-schema- + Revision 1.54 2005/08/20 12:36:25 glen - created openldap-schema-evolutionperson subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.54&r2=1.55&f=u From arekm at pld-linux.org Thu Aug 25 19:26:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES (DEVEL): php-lib64.patch - up for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:26:25 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for php 5.1 ---- Files affected: SOURCES: php-lib64.patch (1.10 -> 1.10.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10 SOURCES/php-lib64.patch:1.10.4.1 --- SOURCES/php-lib64.patch:1.10 Tue Mar 15 18:38:12 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 19:26:19 2005 @@ -1,455 +1,12 @@ -diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4 ---- php-5.0.4RC1.orig/acinclude.m4 2005-03-15 18:21:05.158404416 +0100 -+++ php-5.0.4RC1/acinclude.m4 2005-03-15 18:22:03.101595712 +0100 -@@ -1723,6 +1723,9 @@ - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib - fi -+ if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then -+ OPENSSL_LIBDIR=$i/lib64 -+ fi - test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break - done - -diff -burN php-5.0.4RC1.orig/ext/cpdf/config.m4 php-5.0.4RC1/ext/cpdf/config.m4 ---- php-5.0.4RC1.orig/ext/cpdf/config.m4 2005-03-15 18:21:04.537498808 +0100 -+++ php-5.0.4RC1/ext/cpdf/config.m4 2005-03-15 18:23:06.693928208 +0100 -@@ -4,7 +4,7 @@ - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then -+ if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then - CPDF_JPEG_DIR=$i - break; - fi -@@ -13,11 +13,11 @@ - AC_MSG_ERROR([libjpeg.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_JPEG_DIR/lib -+ -L$CPDF_JPEG_DIR/lib64 - ]) - ],) - ]) -@@ -26,7 +26,7 @@ - AC_ARG_WITH(tiff-dir, - [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then -+ if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then - CPDF_TIFF_DIR=$i - break; - fi -@@ -35,11 +35,11 @@ - AC_MSG_ERROR([libtiff.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ -- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_TIFF_DIR/lib -+ -L$CPDF_TIFF_DIR/lib64 - ]) - ],) - ]) -@@ -65,13 +65,13 @@ - ], [ - AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - -- PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD) - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) - break -diff -burN php-5.0.4RC1.orig/ext/dba/config.m4 php-5.0.4RC1/ext/dba/config.m4 ---- php-5.0.4RC1.orig/ext/dba/config.m4 2005-03-15 18:21:04.484506864 +0100 -+++ php-5.0.4RC1/ext/dba/config.m4 2005-03-15 18:22:03.103595408 +0100 -@@ -21,7 +21,7 @@ - dnl Assign INCLUDE/LFLAGS from PREFIX - AC_DEFUN([PHP_DBA_STD_ASSIGN],[ - if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then -- THIS_LFLAGS=$THIS_PREFIX/lib -+ THIS_LFLAGS=$THIS_PREFIX/lib64 - fi - ]) - -@@ -120,7 +120,7 @@ - AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) - THIS_LIBS=gdbm -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - fi - - PHP_DBA_STD_ASSIGN -@@ -152,7 +152,7 @@ - AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_NDBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -170,8 +170,8 @@ - dnl parameters(version, library list, function) - AC_DEFUN([PHP_DBA_DB_CHECK],[ - for LIB in $2; do -- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then -- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ -+ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then -+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ - AC_TRY_LINK([ - #include "$THIS_INCLUDE" - ],[ -@@ -366,7 +366,7 @@ - fi - AC_DEFINE(DBA_DBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -408,7 +408,7 @@ - AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_CDB, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -diff -burN php-5.0.4RC1.orig/ext/gd/config.m4 php-5.0.4RC1/ext/gd/config.m4 ---- php-5.0.4RC1.orig/ext/gd/config.m4 2005-03-15 18:21:04.469509144 +0100 -+++ php-5.0.4RC1/ext/gd/config.m4 2005-03-15 18:22:03.104595256 +0100 -@@ -51,7 +51,7 @@ - if test "$PHP_JPEG_DIR" != "no"; then - - for i in $PHP_JPEG_DIR /usr/local /usr; do -- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break -+ test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break - done - - if test -z "$GD_JPEG_DIR"; then -@@ -61,11 +61,11 @@ - PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, - [ - PHP_ADD_INCLUDE($GD_JPEG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_JPEG_DIR/lib -+ -L$GD_JPEG_DIR/lib64 - ]) - else - AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) -@@ -76,7 +76,7 @@ - if test "$PHP_PNG_DIR" != "no"; then - - for i in $PHP_PNG_DIR /usr/local /usr; do -- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break -+ test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break - done - - if test -z "$GD_PNG_DIR"; then -@@ -94,12 +94,12 @@ - PHP_CHECK_LIBRARY(png,png_write_image, - [ - PHP_ADD_INCLUDE($GD_PNG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) - ],[ -- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib -+ -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64 - ]) - - else -@@ -111,7 +111,7 @@ - if test "$PHP_XPM_DIR" != "no"; then - - for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do -- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break -+ test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break - done - - if test -z "$GD_XPM_DIR"; then -@@ -129,12 +129,12 @@ - PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, - [ - PHP_ADD_INCLUDE($GD_XPM_INC) -- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_XPM_DIR/lib -lX11 -+ -L$GD_XPM_DIR/lib64 -lX11 - ]) - else - AC_MSG_RESULT(If configure fails try --with-xpm-dir=) -@@ -163,7 +163,7 @@ - fi - if test -n "$TTF_DIR" ; then - AC_DEFINE(HAVE_LIBTTF,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD) - fi - if test -z "$TTF_INC_DIR"; then - TTF_INC_DIR=$TTF_DIR/include -@@ -188,7 +188,7 @@ - done - - if test -n "$FREETYPE2_DIR" ; then -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD) - PHP_ADD_INCLUDE($FREETYPE2_DIR/include) - PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) - AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -@@ -216,11 +216,11 @@ - [ - AC_DEFINE(HAVE_LIBT1,1,[ ]) - PHP_ADD_INCLUDE($GD_T1_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_T1_DIR/lib -+ -L$GD_T1_DIR/lib64 - ]) - fi - ]) -@@ -365,7 +365,7 @@ - done - - dnl Library path -- for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do -+ for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do - test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" - done - -diff -burN php-5.0.4RC1.orig/ext/imap/config.m4 php-5.0.4RC1/ext/imap/config.m4 ---- php-5.0.4RC1.orig/ext/imap/config.m4 2005-03-15 18:21:04.545497592 +0100 -+++ php-5.0.4RC1/ext/imap/config.m4 2005-03-15 18:22:03.105595104 +0100 -@@ -148,13 +148,13 @@ - - if test -r "$IMAP_DIR/c-client/c-client.a"; then - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -+ elif test -r "$IMAP_DIR/lib64/c-client.a"; then -+ ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1 - fi - - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib -- IMAP_LIB_CHK(lib) -+ IMAP_LIB_CHK(lib64) - IMAP_LIB_CHK(c-client) - done - -diff -burN php-5.0.4RC1.orig/ext/ldap/config.m4 php-5.0.4RC1/ext/ldap/config.m4 ---- php-5.0.4RC1.orig/ext/ldap/config.m4 2005-03-15 18:21:04.551496680 +0100 -+++ php-5.0.4RC1/ext/ldap/config.m4 2005-03-15 18:22:03.107594800 +0100 -@@ -6,15 +6,15 @@ - if test -f $1/include/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/include/umich-ldap/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include/umich-ldap -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/ldap/public/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/ldap/public -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - fi - ]) - -diff -burN php-5.0.4RC1.orig/ext/ming/config.m4 php-5.0.4RC1/ext/ming/config.m4 ---- php-5.0.4RC1.orig/ext/ming/config.m4 2005-03-15 18:21:04.555496072 +0100 -+++ php-5.0.4RC1/ext/ming/config.m4 2005-03-15 18:22:03.108594648 +0100 +diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 +--- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) for i in $PHP_MING /usr/local /usr; do - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then -+ if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then ++ if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libming.a; then MING_DIR=$i break fi -@@ -34,11 +34,11 @@ - ],[ - AC_MSG_ERROR([Ming library 0.2a or greater required.]) - ],[ -- -L$MING_DIR/lib -+ -L$MING_DIR/lib64 - ]) - - PHP_ADD_INCLUDE($MING_INC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) - - AC_MSG_CHECKING([for destroySWFBlock]) - AC_TRY_RUN([ -diff -burN php-5.0.4RC1.orig/ext/mssql/config.m4 php-5.0.4RC1/ext/mssql/config.m4 ---- php-5.0.4RC1.orig/ext/mssql/config.m4 2005-03-15 18:21:04.646482240 +0100 -+++ php-5.0.4RC1/ext/mssql/config.m4 2005-03-15 18:22:03.108594648 +0100 -@@ -32,12 +32,12 @@ - fi - fi - -- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then -- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) -+ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then -+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so]) - fi - - MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include -- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib -+ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 - - PHP_ADD_INCLUDE($MSSQL_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) -diff -burN php-5.0.4RC1.orig/ext/mysql/config.m4 php-5.0.4RC1/ext/mysql/config.m4 ---- php-5.0.4RC1.orig/ext/mysql/config.m4 2005-03-15 18:21:04.649481784 +0100 -+++ php-5.0.4RC1/ext/mysql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -17,7 +17,7 @@ - /var/run/mysqld/mysqld.sock \ - /var/tmp/mysql.sock \ - /var/run/mysql/mysql.sock \ -- /var/lib/mysql/mysql.sock \ -+ /var/lib64/mysql/mysql.sock \ - /var/mysql/mysql.sock \ - /usr/local/mysql/var/mysql.sock \ - /Private/tmp/mysql.sock \ -@@ -84,7 +84,7 @@ - Note that the MySQL client library is not bundled anymore.]) - fi - -- for i in lib lib/mysql; do -+ for i in lib64 lib64/mysql; do - MYSQL_LIB_CHK($i) - done - -@@ -100,9 +100,9 @@ - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ - AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) - ], [ -- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR -+ -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR - ]) -- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" -+ MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" - else - PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ -diff -burN php-5.0.4RC1.orig/ext/pgsql/config.m4 php-5.0.4RC1/ext/pgsql/config.m4 ---- php-5.0.4RC1.orig/ext/pgsql/config.m4 2005-03-15 18:21:04.658480416 +0100 -+++ php-5.0.4RC1/ext/pgsql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -44,7 +44,7 @@ - fi - done - -- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do -+ for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi -diff -burN php-5.0.4RC1.orig/ext/xml/config.m4 php-5.0.4RC1/ext/xml/config.m4 ---- php-5.0.4RC1.orig/ext/xml/config.m4 2005-03-15 18:21:04.530499872 +0100 -+++ php-5.0.4RC1/ext/xml/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -30,7 +30,7 @@ - dnl - if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR; do -- if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then -+ if test -f "$i/lib64/libexpat.a" -o -f "$i/lib64/libexpat.$SHLIB_SUFFIX_NAME"; then - EXPAT_DIR=$i - break - fi -@@ -41,7 +41,7 @@ - fi - - PHP_ADD_INCLUDE($EXPAT_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - fi - -diff -burN php-5.0.4RC1.orig/ext/xmlrpc/config.m4 php-5.0.4RC1/ext/xmlrpc/config.m4 ---- php-5.0.4RC1.orig/ext/xmlrpc/config.m4 2005-03-15 18:21:04.902443328 +0100 -+++ php-5.0.4RC1/ext/xmlrpc/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -23,9 +23,9 @@ - - testval=no - for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then -+ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then - AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) - PHP_ADD_INCLUDE($i/include) - testval=yes - break -@@ -90,6 +90,6 @@ - PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) - XMLRPC_MODULE_TYPE=external - PHP_ADD_INCLUDE($XMLRPC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) - fi - -diff -burN php-5.0.4RC1.orig/php.ini php-5.0.4RC1/php.ini ---- php-5.0.4RC1.orig/php.ini 2005-03-15 18:21:05.162403808 +0100 -+++ php-5.0.4RC1/php.ini 2005-03-15 18:22:03.111594192 +0100 -@@ -514,7 +514,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "/usr/lib/php" -+extension_dir = "/usr/lib64/php" - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -diff -burN php-5.0.4RC1.orig/scripts/Makefile.frag php-5.0.4RC1/scripts/Makefile.frag ---- php-5.0.4RC1.orig/scripts/Makefile.frag 2005-03-15 18:21:05.145406392 +0100 -+++ php-5.0.4RC1/scripts/Makefile.frag 2005-03-15 18:22:03.112594040 +0100 -@@ -4,7 +4,7 @@ - # - - phpincludedir = $(includedir)/php --phpbuilddir = $(prefix)/lib/php/build -+phpbuilddir = $(libdir)/php/build - - BUILD_FILES = \ - scripts/phpize.m4 \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10&r2=1.10.4.1&f=u From cvs at pld-linux.org Fri Aug 26 15:47:01 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 09:39:23 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6335@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:47:00 2005 New Revision: 6335 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:47:00 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From megabajt at pld-linux.org Fri Aug 26 16:53:18 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: GeoIP.spec - up to 1.3.13 In-Reply-To: References: Message-ID: Author: megabajt Date: Fri Aug 26 14:53:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.3.13 ---- Files affected: SPECS: GeoIP.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/GeoIP.spec diff -u SPECS/GeoIP.spec:1.20 SPECS/GeoIP.spec:1.21 --- SPECS/GeoIP.spec:1.20 Mon Jul 25 11:10:57 2005 +++ SPECS/GeoIP.spec Fri Aug 26 16:53:12 2005 @@ -2,12 +2,12 @@ Summary: Library to find what country an IP address or hostnames originate from Summary(pl): Biblioteka do sprawdzenia z jakiego kraju pochodzi adres IP lub domena Name: GeoIP -Version: 1.3.12 +Version: 1.3.13 Release: 1 License: GPL v2 Group: Libraries Source0: http://www.maxmind.com/download/geoip/api/c/%{name}-%{version}.tar.gz -# Source0-md5: a22ae6197c3bbe280dbc4055cc29ec1f +# Source0-md5: 59fc9a6adfbde13cee33c88668f3f400 # note: "c" is a filename, do not add '/' URL: http://www.maxmind.com/app/c BuildRequires: autoconf @@ -119,6 +119,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/26 14:53:12 megabajt +- up to 1.3.13 + Revision 1.20 2005/07/25 09:10:57 blekot - up to 1.3.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GeoIP.spec?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Fri Aug 26 11:43:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: kdepim-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:43:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdepim-branch.diff (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SOURCES/kdepim-branch.diff diff -u SOURCES/kdepim-branch.diff:1.8 SOURCES/kdepim-branch.diff:1.9 --- SOURCES/kdepim-branch.diff:1.8 Tue Aug 2 08:09:29 2005 +++ SOURCES/kdepim-branch.diff Fri Aug 26 11:43:22 2005 @@ -1,7 +1,56 @@ +Index: akregator/src/pageviewer.cpp +=================================================================== +--- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -361,7 +361,7 @@ + if (copylinkaddress) + { + copylinkaddress->plug( &popup); +- popup.insertSeparator(); ++ //popup.insertSeparator(); + } + } + else // we are not on a link +Index: kresources/egroupware/kabc_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kabc_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kabc_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/knotes_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/knotes_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/knotes_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/kcal_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kcal_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kcal_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) Index: kresources/exchange/exchange.desktop =================================================================== ---- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -17,6 +17,7 @@ Name[et]=Exchange 2000 server Name[eu]=Exchange 2000 zerbitzaria @@ -12,8 +61,8 @@ Name[is]=Exchange 2000 ??j??nn Index: kresources/slox/kcal_slox.desktop =================================================================== ---- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -24,8 +73,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/slox/webdavhandler.cpp =================================================================== ---- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,8 @@ #endif #endif @@ -55,8 +104,8 @@ } Index: kresources/slox/kabc_slox.desktop =================================================================== ---- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -67,8 +116,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/groupdav/kabc_groupdav.desktop =================================================================== ---- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -79,8 +128,8 @@ Name[it]=Server GroupDAV (per es. OpenGroupware) Index: kresources/groupdav/kcal_groupdav.desktop =================================================================== ---- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -89,10 +138,46 @@ Name[hu]=GroupDAV-kiszolg??l?? (pl. OpenGroupware) Name[is]=GroupDAV ??j??nn (t.d. OpenGroupware) Name[it]=Server GroupDAV (per es. OpenGroupware) +Index: kresources/kolab/kabc/kolab.desktop +=================================================================== +--- kresources/kolab/kabc/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Aadressiraamat IMAP-serveril (KMaili vahendusel) + Name[eu]=Helbide-liburua IMAP zerbitzarian KMail-en bidez + Name[fr]=Carnet d'adresse sur serveur IMAP (via KMail) ++Name[ga]=Leabhar Seolta?? ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt c??mjegyz??k a KMailen kereszt??l + Name[is]=Vistfangaskr?? ?? IMAP ??j??ni gegnum KMail + Name[it]=Rubrica indirizzi su server IMAP via KMail +Index: kresources/kolab/knotes/kolabresource.desktop +=================================================================== +--- kresources/kolab/knotes/kolabresource.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/knotes/kolabresource.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=IMAP-server (KMaili vahendusel) + Name[eu]=IMAP zerbitzaria KMail-en bidez + Name[fr]=Serveur IMAP (via KMail) ++Name[ga]=Freastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l?? a KMailen kereszt??l + Name[is]=IMAP ??j??nn gegnum KMail + Name[it]=Server IMAP via KMail +Index: kresources/kolab/kcal/kolab.desktop +=================================================================== +--- kresources/kolab/kcal/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Kalender IMAP-serveril (KMaili vahendusel) + Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez + Name[fr]=Agenda sur serveur IMAP (via KMail) ++Name[ga]=F??ilire ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt napt??r a KMailen kereszt??l + Name[is]=Dagatal ?? IMAP ??j??ni gegnum KMail + Name[it]=Calendario su server IMAP via KMail Index: kresources/kolab/kcal/resourcekolab.cpp =================================================================== ---- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -487,10 +487,18 @@ mUidMap[ uid ] = StorageReference( subResource, sernum ); } else { @@ -116,8 +201,8 @@ /* Add to the cache if the add didn't come from KOrganizer, in which case Index: kresources/groupware/kabc_groupware.desktop =================================================================== ---- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -128,8 +213,8 @@ Name[is]=Groupware ??j??nn Index: kresources/groupware/kcal_groupware.desktop =================================================================== ---- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -140,8 +225,8 @@ Name[is]=Groupware ??j??nn Index: kresources/remote/remote.desktop =================================================================== ---- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -15,6 +15,7 @@ Name[eu]=Egutegia urruneko fitxategi batean Name[fi]=Kalenteri et??tiedostossa @@ -150,10 +235,22 @@ Name[hi]=??????????????? ??????????????? ????????? ???????????????????????? Name[hu]=T??voli f??jlban t??rolt napt??r Name[is]=Dagatal ?? fjarl??gri skr?? +Index: kresources/newexchange/kcal_newexchange_final.desktop +=================================================================== +--- kresources/newexchange/kcal_newexchange_final.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/newexchange/kcal_newexchange_final.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -13,6 +13,7 @@ + Name[et]=Kalender Exchange-serveril + Name[eu]=Egutegia Exchange zerbitzari batean + Name[fr]=Agenda sur un serveur Exchange ++Name[ga]=F??ilire ar Fhreastala?? Exchange + Name[hu]=Exchange 2000-kiszolg??l?? napt??ra + Name[is]=Dagatal ?? Exchange ??j??ni + Name[it]=Calendario su un server Exchange Index: kmail/kmailicalifaceimpl.cpp =================================================================== ---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -848,7 +848,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum ) @@ -163,10 +260,23 @@ return; // kdDebug(5006) << "KMailICalIfaceImpl::slotIncidenceAdded" << endl; +Index: kmail/kmail_config_composer.desktop +=================================================================== +--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -109,7 +109,7 @@ + Keywords[he]=kmail,???????? + Keywords[hi]=??????-?????????,???????????????????????? + Keywords[hu]=kmail,szerkeszt?? +-Keywords[is]=kmail,composer,ritill ++Keywords[is]=kmail,ritill + Keywords[it]=kmail,compositore + Keywords[lt]=kmail,composer,redaktorius + Keywords[nb]=kmail,komposer Index: kmail/partNode.cpp =================================================================== ---- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -36,6 +36,7 @@ #include "kmmimeparttree.h" #include @@ -184,10 +294,74 @@ return this; if( mChild ) found = mChild->findNodeForDwPart( part ); +Index: kmail/eventsrc +=================================================================== +--- kmail/eventsrc (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -10,6 +10,7 @@ + [new-mail-arrived] + Name=New Mail Arrived + Name[bg]=?????????? ???????? ?????????? ++Name[br]=Deuet eo ur postel nevez + Name[bs]=Stigla vam je nova po??ta + Name[ca]=Ha arribat correu nou + Name[cs]=P??i??la nov?? po??ta +Index: kmail/avscripts/kmail_sav.sh +=================================================================== +--- kmail/avscripts/kmail_sav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_sav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_fprot.sh +=================================================================== +--- kmail/avscripts/kmail_fprot.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_fprot.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_antivir.sh +=================================================================== +--- kmail/avscripts/kmail_antivir.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_antivir.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_clamav.sh +=================================================================== +--- kmail/avscripts/kmail_clamav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_clamav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE Index: kmail/keyresolver.cpp =================================================================== ---- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -1171,6 +1171,17 @@ for ( uint i = 0; i < items.size(); ++i ) { ContactPreferences& pref = lookupContactPreferences( items[i].address ); @@ -208,8 +382,8 @@ } Index: kmail/kmsender.cpp =================================================================== ---- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -519,8 +519,10 @@ .arg(mCurrentMsg->subject())); if (!mSendProc->send(mCurrentMsg)) @@ -246,10 +420,46 @@ mCurrentMsg = 0; mFailedMessages++; // Sending of message failed. +Index: knode/knode_config_identity.desktop +=================================================================== +--- knode/knode_config_identity.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -58,6 +58,7 @@ + Comment=Personal Information + Comment[be]=???????????????????????? ???????????????????? + Comment[bg]=???????????????????? ???? ?????????????? ???????????????????? ++Comment[br]=Titouro?? diouzhin + Comment[bs]=Li??ne informacije + Comment[ca]=Informaci?? personal + Comment[cs]=Osobn?? informace +Index: knode/knode_config_cleanup.desktop +=================================================================== +--- knode/knode_config_cleanup.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,6 +25,7 @@ + Name[eu]=Garbiketa + Name[fi]=Siivoaminen + Name[fr]=Nettoyage ++Name[ga]=Glan + Name[gl]=Limpeza + Name[hi]=????????????-???????????? + Name[hu]=Tiszt??t??s +Index: knode/knarticlewidget.cpp +=================================================================== +--- knode/knarticlewidget.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knarticlewidget.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include Index: kalarm/alarmcalendar.h =================================================================== ---- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -46,7 +46,7 @@ void startUpdate(); void endUpdate(); @@ -262,7 +472,7 @@ Index: Makefile.cvs =================================================================== --- Makefile.cvs (.../tags/KDE/3.4.2/kdepim) (revision 0) -+++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 442272) ++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -0,0 +1,16 @@ + +all: @@ -288,8 +498,8 @@ Index: libemailfunctions/email.cpp =================================================================== ---- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -697,14 +697,24 @@ // and outside of quoted text behind the trailing '>'. bInComment = false; @@ -329,10 +539,22 @@ break; default: if( ' ' != c ) +Index: korn/KOrn.desktop +=================================================================== +--- korn/KOrn.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ korn/KOrn.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + GenericName[eu]=Mail abisua + GenericName[fi]=Saapuneen s??hk??postin ilmoitus + GenericName[fr]=Surveillance du courrier ??lectronique ++GenericName[ga]=F??gairt R??omhphoist + GenericName[gl]=Alerta de Correo-e + GenericName[hi]=????????? ??????????????? + GenericName[hr]=Upozorenje na nove poruke Index: kmailcvt/filters.hxx =================================================================== ---- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -85,6 +85,57 @@ }; @@ -394,8 +616,8 @@ -// vim: ts=2 sw=2 et Index: kmailcvt/filter_thunderbird.cxx =================================================================== ---- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -198,7 +198,7 @@ tmp.close(); first_msg = false; @@ -407,8 +629,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_evolution_v2.cxx =================================================================== ---- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -201,7 +201,7 @@ tmp.close(); first_msg = false; @@ -420,8 +642,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_outlook.cxx =================================================================== ---- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -52,7 +52,7 @@ info->addLog(i18n("Importing new mail files...")); info->addLog(i18n("No files found for import.")); @@ -433,8 +655,8 @@ QStringList files = importDir.entryList("*.[pP][sS][tT]", QDir::Files, QDir::Name); Index: kmailcvt/filter_pmail.cxx =================================================================== ---- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -320,13 +320,13 @@ QString FilterPMail::getFolderName(QString ID) { @@ -454,8 +676,8 @@ if(_ID == search) { Index: kmailcvt/filter_oe.cxx =================================================================== ---- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -138,7 +138,7 @@ folderName = "OE-" + mailfileinfo.baseName(TRUE); if(parsedFolder) { @@ -513,8 +735,8 @@ } Index: kmailcvt/filter_mbox.cxx =================================================================== ---- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -69,8 +69,9 @@ while ( ! mbox.atEnd() ) { @@ -544,8 +766,8 @@ first_msg = false; Index: kmailcvt/filter_pmail.hxx =================================================================== ---- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -50,8 +50,18 @@ QDir dir; /** pointer to the info */ @@ -569,8 +791,8 @@ bool folderParsed; Index: kmailcvt/filter_oe.hxx =================================================================== ---- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -61,8 +61,17 @@ bool parsedFolder; /** true if the current parsing file is the folder file */ @@ -590,10 +812,73 @@ /** name of the current folder */ QString folderName; +Index: kaddressbook/interfaces/kaddressbook_xxport.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_xxport.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -21,7 +21,7 @@ + Comment[he]=???????? ??????????/???????? ???????? ???????? ?????????????? + Comment[hi]=??????-??????????????????-????????? ????????????/????????????????????? ?????????????????? + Comment[hu]=KAddressBook import??l??si/export??l??si b??v??t??modul +-Comment[is]=??forrit til a?? f??ra inn ??/??t ??r KAddressbook ++Comment[is]=KAddressbook flytja inn/??t ??forrit + Comment[it]=Plugin importa/esporta di KAddressbook + Comment[ja]=KAddressbook ???????????????/????????????????????????????????? + Comment[lt]=KAddressBook importo/eksporto priedas +Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -17,7 +17,7 @@ + Comment[fr]=Module d'??dition de contacts de KAddressBook + Comment[hi]=??????-??????????????????-????????? ????????????????????? ?????????????????? ??????????????? ?????????????????? + Comment[hu]=KAddressBook n??vjegyszerkeszt?? b??v??t??modul +-Comment[is]=KAddressbook tengili??aritils-??forrit ++Comment[is]=KAddressbook tengili??aritils ??forrit + Comment[it]=Plugin editor dei contatti di KAddressbook + Comment[ja]=KAddressbook ??????????????? ???????????? ?????????????????? ??????????????? + Comment[lt]=KAddressBook kontakt?? redaktoriaus valdikli?? priedas +Index: kaddressbook/csv-templates/yahoo.desktop +=================================================================== +--- kaddressbook/csv-templates/yahoo.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/csv-templates/yahoo.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,7 +25,7 @@ + Name[he]=???????? ?????????? ???? Yahoo! + Name[hi]=????????????! ????????? ???????????????????????? + Name[hu]=Yahoo! c??mjegyz??k +-Name[is]=Yahoo! P??stfangaskr?? ++Name[is]=Yahoo! p??stfangaskr?? + Name[it]=Rubrica indirizzi Yahoo! + Name[ja]=Yahoo! ??????????????? + Name[lt]=Yahoo! Adres?? knygut?? +Index: kaddressbook/editors/protocols/smsprotocol.desktop +=================================================================== +--- kaddressbook/editors/protocols/smsprotocol.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/editors/protocols/smsprotocol.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -19,6 +19,7 @@ + Comment[eu]=SMS protokoloa + Comment[fi]=SMS-protokolla + Comment[fr]=Protocole SMS ++Comment[ga]=Pr??tacal SMS + Comment[gl]=Protocolo SMS + Comment[he]=???????????????? SMS + Comment[hi]=?????????????????? ??????????????????????????? +Index: kaddressbook/features/distributionlist.desktop +=================================================================== +--- kaddressbook/features/distributionlist.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/features/distributionlist.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -4,6 +4,7 @@ + Name=KAB Distribution List Plugin + Name[ar]=? ?????? ??????? ?? ?????????? KAB + Name[be]=?????????????????????? KAB "?????????? ????????????????????????????????" ++Name[br]=Lugent roll ingaladur evit KAB + Name[bs]=KAB dodatak za distribucione liste + Name[ca]=Endollable de la llista de distribuci?? KAB + Name[cs]=Modul distribu??n??ho seznamu Index: libkdepim/komposer/plugins/default/defaulteditor.desktop =================================================================== ---- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,7 @@ Name[et]=Komposeri redaktor <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Fri Aug 26 10:55:23 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS (DEVEL): php.spec - add PDO (base compiled in; database driv... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 08:55:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - add PDO (base compiled in; database drivers as shared modules) ---- Files affected: SPECS: php.spec (1.467.2.4 -> 1.467.2.5) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.4 SPECS/php.spec:1.467.2.5 --- SPECS/php.spec:1.467.2.4 Thu Aug 25 21:25:13 2005 +++ SPECS/php.spec Fri Aug 26 10:55:18 2005 @@ -13,15 +13,16 @@ # - make additional headers added by mail patch configurable # - apply -hardened patch by default ? # - ftp module needs to be linked with -lssl if openssl module is enabled +# - shared pdo base # # Conditional build: %bcond_with db3 # use db3 packages instead of db (4.x) for Berkeley DB support -%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib) +%bcond_with fdf # with FDF (PDF forms) module (BR:proprietary lib) %bcond_with hardening # build with hardening patch applied (http://www.hardened-php.net/) -%bcond_with hwapi # with Hw API support (BR: proprietary libs) -%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) -%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) -%bcond_with oracle # with oracle extension module (BR: proprietary libs) +%bcond_with hwapi # with Hw API support (BR:proprietary libs) +%bcond_with interbase_inst # use InterBase install., not Firebird (BR:proprietary libs) +%bcond_with oci8 # with Oracle oci8 extension module (BR:proprietary libs) +%bcond_with oracle # with oracle extension module (BR:proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) %bcond_without curl # without CURL extension module %bcond_without imap # without IMAP extension module @@ -267,7 +268,7 @@ Summary: PHP DSO module for apache 1.3.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 1.3.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires(post,preun): %{apxs1} Requires(post,preun): %{__perl} Requires: apache1(EAPI) >= 1.3.33-2 @@ -289,7 +290,7 @@ Summary: PHP DSO module for apache 2.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 2.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: apache >= 2.0.52-2 Requires: apache(modules-api) = %{apache_modules_api} Provides: %{name} = %{epoch}:%{version}-%{release} @@ -309,7 +310,7 @@ Summary: php as FastCGI program Summary(pl): php jako program FastCGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description fcgi @@ -322,7 +323,7 @@ Summary: php as CGI program Summary(pl): php jako program CGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cgi @@ -335,7 +336,7 @@ Summary: php as CLI interpreter Summary(pl): php jako interpreter dzia?aj?cy z linii polece? Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cli @@ -976,6 +977,81 @@ Modu? PHP umo?liwiaj?cy korzystanie z perlowych wyra?e? regularnych (Perl Compatible Regular Expressions) +%package pdo-dblib +Summary: PHP Data Objects (PDO) FreeTDS support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do FreeTDS +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-dblib +This is a dynamic shared object (DSO) for PHP that will add PDO +FreeTDS support. + +%description pdo-dblib -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych FreeTDS za po?rednictwem +interfejsu PDO. + +%package pdo-mysql +Summary: PHP Data Objects (PDO) MySQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do MySQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-mysql +This is a dynamic shared object (DSO) for PHP that will add PDO MySQL +support. + +%description pdo-mysql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych MySQL za po?rednictwem +interfejsu PDO. + +%package pdo-odbc +Summary: PHP Data Objects (PDO) ODBC support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do ODBC +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-odbc +This is a dynamic shared object (DSO) for PHP that will add PDO ODBC +support. + +%description pdo-odbc -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych ODBC za po?rednictwem +interfejsu PDO. + +%package pdo-pgsql +Summary: PHP Data Objects (PDO) PostgreSQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do PostgreSQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-pgsql +This is a dynamic shared object (DSO) for PHP that will add PDO +PostgreSQL support. + +%description pdo-pgsql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych PostgreSQL za +po?rednictwem interfejsu PDO. + +%package pdo-sqlite +Summary: PHP Data Objects (PDO) SQLite support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do SQLite +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-sqlite +This is a dynamic shared object (DSO) for PHP that will add PDO SQLite +support. + +%description pdo-sqlite -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych SQLite za po?rednictwem +interfejsu PDO. + %package pgsql Summary: PostgreSQL database module for PHP Summary(pl): Modu? bazy danych PostgreSQL dla PHP @@ -1140,22 +1216,24 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} %description sqlite -SQLite is a C library that implements an embeddable SQL database engine. -Programs that link with the SQLite library can have SQL database access -without running a separate RDBMS process. - -SQLite is not a client library used to connect to a big database server. -SQLite is the server. The SQLite library reads and writes directly to -and from the database files on disk. +SQLite is a C library that implements an embeddable SQL database +engine. Programs that link with the SQLite library can have SQL +database access without running a separate RDBMS process. + +SQLite is not a client library used to connect to a big database +server. SQLite is the server. The SQLite library reads and writes +directly to and from the database files on disk. %description sqlite -l pl SQLite jest napisan? w C bibliotek? implementuj?c? osadzalny silnik bazodanowy SQL. Program linkuj?cy si? z bibliotek? SQLite mo?e mie? -dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu RDBMS. +dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu +RDBMS. SQLite to nie klient baz danych - biblioteka nie ??czy si? z serwerami -baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i zapisuje -dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na dysku. +baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i +zapisuje dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na +dysku. %package sybase Summary: Sybase DB extension module for PHP @@ -1167,8 +1245,9 @@ %description sybase This is a dynamic shared object (DSO) for PHP that will add Sybase and -MS SQL databases support through SYBDB library. Currently Sybase module -is not maintained. Using Sybase-CT module is recommended instead. +MS SQL databases support through SYBDB library. Currently Sybase +module is not maintained. Using Sybase-CT module is recommended +instead. %description sybase -l pl Modu? PHP dodaj?cy obs?ug? baz danych Sybase oraz MS SQL poprzez @@ -1252,8 +1331,8 @@ Summary: wddx extension module for PHP Summary(pl): Modu? wddx dla PHP Group: Libraries -PreReq: %{name}-session = %{epoch}:%{version}-%{release} -PreReq: %{name}-xml = %{epoch}:%{version}-%{release} +Requires: %{name}-session = %{epoch}:%{version}-%{release} +Requires: %{name}-xml = %{epoch}:%{version}-%{release} Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -1291,13 +1370,13 @@ %description xmlreader This is a dynamic shared object (DSO) for PHP that will add XML Reader support. The XMLReader extension is an XML Pull parser. The reader -acts as a cursor going forward on the document stream and stopping -at each node on the way. +acts as a cursor going forward on the document stream and stopping at +each node on the way. %description xmlreader -l pl Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik -dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy -si? naka?dym w??le po drodze. +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i +zatrzymuj?cy si? naka?dym w??le po drodze. %package xmlrpc Summary: xmlrpc extension module for PHP @@ -1465,12 +1544,15 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-zend-multibyte \ --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ + --with-inifile \ + --with-flatfile \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1481,6 +1563,18 @@ --enable-mbstring=shared,all \ --enable-mbregex \ --enable-pcntl=shared \ + --enable-pdo \ +%if %{with mssql} || %{with sybase} || %{with sybase_ct} + --with-pdo-dblib=shared \ +%endif +%if %{with interbase} && %{without interbase_inst} + --with-pdo-firebird=shared \ +%endif + --with-pdo-mysql=shared \ + %{?with_oracle:--with-pdo-oci=shared} \ + %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ + %{?with_pgsql:--with-pdo-pgsql=shared} \ + %{?with_sqlite:--with-pdo-sqlite=shared} \ --enable-posix=shared \ --enable-session \ --enable-shared \ @@ -1624,7 +1718,7 @@ libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} # install the apache modules' files -make install-headers install-build install-modules install-programs \ +%{__make} install-headers install-build install-modules install-programs \ INSTALL_ROOT=$RPM_BUILD_ROOT # install CGI @@ -2018,6 +2112,36 @@ %postun pcre %extension_postun +%post pdo-dblib +%extension_post + +%postun pdo-dblib +%extension_postun + +%post pdo-mysql +%extension_post + +%postun pdo-mysql +%extension_postun + +%post pdo-odbc +%extension_post + +%postun pdo-odbc +%extension_postun + +%post pdo-pgsql +%extension_post + +%postun pdo-pgsql +%extension_postun + +%post pdo-sqlite +%extension_post + +%postun pdo-sqlite +%extension_postun + %post pgsql %extension_post @@ -2341,8 +2465,8 @@ %if %{with apache1} %files -n apache1-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini %attr(755,root,root) %{_libdir}/apache1/libphp5.so /home/services/apache/icons/* %endif @@ -2350,8 +2474,8 @@ %if %{with apache2} %files -n apache-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini %attr(755,root,root) %{_libdir}/apache/libphp5.so /home/services/httpd/icons/* %endif @@ -2359,18 +2483,18 @@ %files fcgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.fcgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi-fcgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini %files cgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini %files cli %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cli %attr(755,root,root) %{_bindir}/php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini %{_mandir}/man1/php.1* %files common @@ -2382,7 +2506,7 @@ %dir %{_sysconfdir} %dir %{_sysconfdir}/conf.d -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini %attr(770,root,http) %dir %verify(not group mode) /var/run/php %attr(755,root,root) %{_sbindir}/php-module-install %attr(755,root,root) %{_libdir}/libphp_common-*.so @@ -2401,168 +2525,168 @@ %files bcmath %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bcmath.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini %attr(755,root,root) %{extensionsdir}/bcmath.so %files bzip2 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bz2.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini %attr(755,root,root) %{extensionsdir}/bz2.so %files calendar %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so %files ctype %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini %attr(755,root,root) %{extensionsdir}/ctype.so %if %{with curl} %files curl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/curl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini %attr(755,root,root) %{extensionsdir}/curl.so %endif %files dba %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dba.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini %attr(755,root,root) %{extensionsdir}/dba.so %files dbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so %files dom %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so %if %{with fdf} %files fdf %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fdf.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fdf.ini %attr(755,root,root) %{extensionsdir}/fdf.so %endif %files exif %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/exif.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini %attr(755,root,root) %{extensionsdir}/exif.so %files filepro %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/filepro.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filepro.ini %attr(755,root,root) %{extensionsdir}/filepro.so %files ftp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ftp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini %attr(755,root,root) %{extensionsdir}/ftp.so %files gd %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gd.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini %attr(755,root,root) %{extensionsdir}/gd.so %files gettext %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gettext.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini %attr(755,root,root) %{extensionsdir}/gettext.so %files gmp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gmp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini %attr(755,root,root) %{extensionsdir}/gmp.so %if %{with hwapi} %files hwapi %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/hwapi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hwapi.ini %attr(755,root,root) %{extensionsdir}/hwapi.so %endif %files iconv %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/iconv.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini %attr(755,root,root) %{extensionsdir}/iconv.so %if %{with imap} %files imap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/imap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini %attr(755,root,root) %{extensionsdir}/imap.so %endif %if %{with interbase} %files interbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/interbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini %attr(755,root,root) %{extensionsdir}/interbase.so %endif %if %{with ldap} %files ldap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ldap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini %attr(755,root,root) %{extensionsdir}/ldap.so %endif %files mbstring %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mbstring.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini %attr(755,root,root) %{extensionsdir}/mbstring.so %files mcrypt %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mcrypt.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini %attr(755,root,root) %{extensionsdir}/mcrypt.so %if %{with mhash} %files mhash %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mhash.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mhash.ini %attr(755,root,root) %{extensionsdir}/mhash.so %endif %files mime_magic %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mime_magic.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini %attr(755,root,root) %{extensionsdir}/mime_magic.so %if %{with ming} %files ming %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ming.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ming.ini %attr(755,root,root) %{extensionsdir}/ming.so %endif %if %{with msession} %files msession %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/msession.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini %attr(755,root,root) %{extensionsdir}/msession.so %endif %if %{with mssql} %files mssql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mssql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mssql.ini %attr(755,root,root) %{extensionsdir}/mssql.so %endif %files mysql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini %attr(755,root,root) %{extensionsdir}/mysql.so %if %{with mysqli} %files mysqli %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysqli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini %attr(755,root,root) %{extensionsdir}/mysqli.so %endif @@ -2573,28 +2697,28 @@ %if %{with oci8} %files oci8 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oci8.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini %attr(755,root,root) %{extensionsdir}/oci8.so %endif %if %{with odbc} %files odbc %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/odbc.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini %attr(755,root,root) %{extensionsdir}/odbc.so %endif %if %{with openssl} %files openssl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/openssl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini %attr(755,root,root) %{extensionsdir}/openssl.so %endif %if %{with oracle} %files oracle %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oracle.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oracle.ini %attr(755,root,root) %{extensionsdir}/oracle.so %endif @@ -2605,26 +2729,66 @@ %if %{with pcre} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.4&r2=1.467.2.5&f=u From twittner at pld-linux.org Fri Aug 26 18:26:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: man.spec - moved R: FHS >= 2.3-12 i proper place - newest F... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:26:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - moved R: FHS >= 2.3-12 i proper place - newest FHS is required only by man-man2html-cgi package ---- Files affected: SPECS: man.spec (1.105 -> 1.106) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.105 SPECS/man.spec:1.106 --- SPECS/man.spec:1.105 Tue Aug 23 22:10:58 2005 +++ SPECS/man.spec Fri Aug 26 18:26:40 2005 @@ -41,7 +41,6 @@ Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk -Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less @@ -168,6 +167,7 @@ Group: Applications/System Requires: %{name}-whatis = %{version}-%{release} Requires: man2html = %{version}-%{release} +Requires: FHS >= 2.3-12 %description -n man2html-cgi These scripts allows read man pages throught WWW browser. It uses @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106 2005/08/26 16:26:40 twittner +- moved R: FHS >= 2.3-12 i proper place - newest FHS is required only + by man-man2html-cgi package + Revision 1.105 2005/08/23 20:10:58 twittner - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.105&r2=1.106&f=u From twittner at pld-linux.org Fri Aug 26 18:34:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: kdevelop.spec - added `BuildConflicts: star'. gnutar (which... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:34:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks builds: gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ ChangeLog INSTALL NEWS README TODO No such file or directory. Cannot stat 'ChangeLog'. gnutar: No such file or directory. Cannot stat 'INSTALL'. [...] with gtar (tar pkg) everything goes OK. ---- Files affected: SPECS: kdevelop.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/kdevelop.spec diff -u SPECS/kdevelop.spec:1.101 SPECS/kdevelop.spec:1.102 --- SPECS/kdevelop.spec:1.101 Thu Jul 28 20:45:06 2005 +++ SPECS/kdevelop.spec Fri Aug 26 18:34:36 2005 @@ -42,6 +42,7 @@ BuildRequires: subversion-devel >= 1.2.0-4 #BuildRequires: unsermake >= 040511 BuildRequires: zlib-devel +BuildConflicts: star Requires: kdebase-core >= 9:%{_kdever} Requires: kdesdk-libcvsservice >= 3:%{_kdever} Requires: kdoc @@ -191,6 +192,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/26 16:34:36 twittner +- added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks + builds: + gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ + ChangeLog INSTALL NEWS README TODO + No such file or directory. Cannot stat 'ChangeLog'. + gnutar: No such file or directory. Cannot stat 'INSTALL'. + [...] + with gtar (tar pkg) everything goes OK. + Revision 1.101 2005/07/28 18:45:06 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdevelop.spec?r1=1.101&r2=1.102&f=u From arekm at pld-linux.org Fri Aug 26 11:38:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: kdelibs-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:38:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdelibs-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdelibs-branch.diff diff -u SOURCES/kdelibs-branch.diff:1.16 SOURCES/kdelibs-branch.diff:1.17 --- SOURCES/kdelibs-branch.diff:1.16 Tue Aug 2 08:02:29 2005 +++ SOURCES/kdelibs-branch.diff Fri Aug 26 11:38:27 2005 @@ -1,7 +1,7 @@ Index: libkscreensaver/kscreensaver.cpp =================================================================== ---- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -65,6 +65,7 @@ if ( w == 0 ) w = 600; if ( h == 0 ) h = 420; @@ -26,8 +26,8 @@ bool KScreenSaver::eventFilter( QObject *o, QEvent *e ) Index: kate/part/katesearch.cpp =================================================================== ---- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -130,6 +130,7 @@ searchFlags.replace = false; searchFlags.finished = false; @@ -44,10 +44,23 @@ searchFlags.backward = searchFlags.backward != back; searchFlags.fromBeginning = false; +Index: mimetypes/audio/x-scpls.desktop +=================================================================== +--- mimetypes/audio/x-scpls.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/audio/x-scpls.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -31,7 +31,7 @@ + Comment[hu]=MP3 ShoutCast-lej??tsz??si lista + Comment[id]=Playlist MP3 ShoutCast + Comment[is]=Mp3 ShoutCast lagalisti +-Comment[it]=Playlist MP3 ShoutCast ++Comment[it]=Scaletta MP3 ShoutCast + Comment[ja]=MP3 ShoutCast ?????????????????? + Comment[ko]=MP3 ?????????????????? ?????? ?????? + Comment[lt]=MP3 ShoutCast gaidara??tis Index: mimetypes/application/x-gettext.desktop =================================================================== ---- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -6,6 +6,7 @@ Comment[az]=GNU Gettext ??smar???? Kataloqu Comment[bg]=?????????????????? ???? ???????????? (GNU Gettext) @@ -56,10 +69,130 @@ Comment[bs]=GNU Gettext katalog poruka Comment[ca]=Cat??leg de missatges Gettext de GNU Comment[cs]=Katalog zpr??v (Gettext) +Index: mimetypes/application/xsd.desktop +=================================================================== +--- mimetypes/application/xsd.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/xsd.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -3,6 +3,7 @@ + Comment=W3C XML Schema + Comment[af]=W3C XML Skema + Comment[bg]=??? ?????? W3C XML ++Comment[br]=Steu??v XML W3C + Comment[bs]=W3C XML ??ema + Comment[ca]=Esquema XML W3C + Comment[cs]=W3C XML sch??ma +Index: mimetypes/application/x-executable.desktop +=================================================================== +--- mimetypes/application/x-executable.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -6,6 +6,7 @@ + Comment[az]=??cra???? Fayl + Comment[bg]=???????????????? ???????? + Comment[bn]=???????????????????????????????????? ???????????? ++Comment[br]=Restr sevenadus + Comment[bs]=Izvr??na datoteka + Comment[ca]=Fitxer executable + Comment[cs]=Spustiteln?? soubor +Index: mimetypes/application/x-executable-script.desktop +=================================================================== +--- mimetypes/application/x-executable-script.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable-script.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Comment[af]=Skrip (moontlik uitvoerbaar) + Comment[bg]=???????????? (???????????????? ????????????????) + Comment[bn]=??????????????????????????? (?????????????????? ????????????????????????????????????) ++Comment[br]=Urzhiaoueg (marteze ur sevenadus) + Comment[bs]=Skripta (mo??da izvr??iva) + Comment[ca]=Gui?? (possiblement executable) + Comment[cs]=Pravd??podobn?? spustiteln?? skript +Index: mimetypes/application/vnd.stardivision.writer-global.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.writer-global.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.writer-global.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -8,6 +8,7 @@ + Comment[af]=StarOffice skrywer Meester Dokument + Comment[bg]=???????????? ???????????????? ???? StarOffice Writer + Comment[bn]=???????????????-?? ????????? ?????????????????? ????????????????????? ????????? ++Comment[br]=Teul mestr StarOffice Writer + Comment[bs]=StarOffice Writer glavni dokument + Comment[ca]=Document mestre de l'StarOffice Writer + Comment[cs]=Hlavn?? dokument aplikace StarOffice Writer +Index: mimetypes/application/vnd.stardivision.draw.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.draw.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.draw.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[be]=?????????????? StarOffice + Comment[bg]=?????????????????????? ???? StarOffice Drawing + Comment[bn]=???????????????-?? ????????? ?????????????????? ++Comment[br]=Tresaner StarOffice + Comment[bs]=StarOffice crte?? + Comment[ca]=Dibuix de StarOffice + Comment[cs]=Kreslen?? aplikace StarOffice Draw +Index: kioslave/file/file.cc +=================================================================== +--- kioslave/file/file.cc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/file/file.cc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -1445,7 +1445,7 @@ + QString pmountProg = KGlobal::dirs()->findExe("pmount", path); + + if (pmountProg.isEmpty()) +- pmountProg = "pmount"; ++ return false; + + QCString buffer; + buffer.sprintf( "%s %s", QFile::encodeName(pmountProg).data(), +Index: kioslave/http/kcookiejar/kcookiejar.cpp +=================================================================== +--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -773,14 +773,24 @@ + while ((*cookieStr == ';') || (*cookieStr == ' ')) + { + cookieStr++; +- ++ + // Name-Value pair follows + cookieStr = parseNameValue(cookieStr, Name, Value); + + QCString cName = Name.lower().latin1(); + if (cName == "domain") + { +- lastCookie->mDomain = Value.lower(); ++ QString dom = Value.lower(); ++ // RFC2965 3.2.2: If an explicitly specified value does not ++ // start with a dot, the user agent supplies a leading dot ++ if(dom.length() && dom[0] != '.') ++ dom.prepend("."); ++ // remove a trailing dot ++ if(dom.length() > 2 && dom[dom.length()-1] == '.') ++ dom = dom.left(dom.length()-1); ++ ++ if(dom.contains('.') > 1 || dom == ".local") ++ lastCookie->mDomain = dom; + } + else if (cName == "max-age") + { +Index: kioslave/http/kcookiejar/tests/cookie_rfc.test +=================================================================== +--- kioslave/http/kcookiejar/tests/cookie_rfc.test (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/tests/cookie_rfc.test (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,6 +38,11 @@ + COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=; Version=1; Path="/"; Max-Age=0 + CHECK http://w.y.z/ Cookie: $Version=1; some_value2=foobar; $Path="/" + CLEAR COOKIES ++## Check if we prepend domain with a dot ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value2; Version=1; Path="/"; Domain=.y.z; Max-Age=3600 ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Domain=y.z.; Max-Age=3600 ++CHECK http://w.y.z/ Cookie: $Version=1; some_value=value3; $Path="/"; $Domain=".y.z" ++CLEAR COOKIES + ## Check if multiple cookies on a single line work + ## FIXME + #COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Max-Age=3600, some_value2=foobar; Version=1; Path="/"; Max-Age=3600 Index: kioslave/ftp/ftp.protocol =================================================================== ---- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -10,6 +10,7 @@ writing=true makedir=true @@ -68,10 +201,45 @@ ProxiedBy=http Icon=ftp maxInstances=2 +Index: kimgio/psd.h +=================================================================== +--- kimgio/psd.h (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kimgio/psd.h (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -10,11 +10,13 @@ + #ifndef KIMG_PSD_H + #define KIMG_PSD_H + ++#include ++ + class QImageIO; + + extern "C" { +-void kimgio_psd_read( QImageIO * ); +-void kimgio_psd_write( QImageIO * ); ++KDE_EXPORT void kimgio_psd_read( QImageIO * ); ++KDE_EXPORT void kimgio_psd_write( QImageIO * ); + } + + #endif +Index: kio/kio/connection.cpp +=================================================================== +--- kio/kio/connection.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/connection.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -252,6 +252,10 @@ + kdError(7017) << "Data read failed, errno=" << errno << endl; + return -1; + } ++ if ( !n ) { // 0 indicates end of file ++ kdError(7017) << "Connection ended unexpectedly (" << n << "/" << bytesToGo << ")" << endl; ++ return -1; ++ } + + bytesRead += n; + bytesToGo -= n; Index: kio/kio/kmimemagic.cpp =================================================================== ---- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2262,6 +2262,15 @@ tmp += "src"; r->setMimeType(tmp); @@ -90,8 +258,8 @@ KMimeMagicResult * Index: kio/misc/kpac/eventsrc =================================================================== ---- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -77,7 +77,7 @@ Name[cy]=Sgript dirprwy annilys Name[da]=Ugyldigt proxy-script @@ -110,10 +278,254 @@ Comment[eo]=La ??ar??ita prokuragordoskript estas nevalida Comment[es]=El procedimiento descargado para la configuraci??n del proxy es inv??lido Comment[et]=Alla laaditud proxy seadistuse skript on vigane +Index: kstyles/themes/light-v2.themerc +=================================================================== +--- kstyles/themes/light-v2.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v2.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 2-ci burax??l???? + Name[bn]=???????????? ??????????????????, ????????????????????? ????????????????????? ++Name[br]=Giz sklerijenn, eil stumm + Name[bs]=Light stil, druga revizija + Name[ca]=Estil Light, 2ona revisi?? + Name[cs]=Light Style, druh?? verze +Index: kstyles/themes/light-v3.themerc +=================================================================== +--- kstyles/themes/light-v3.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v3.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 3-c?? burax??l???? + Name[bn]=???????????? ??????????????????, ??????????????? ????????????????????? ++Name[br]=Giz sklerijenn, trede stumm + Name[bs]=Light stil, tre??a revizija + Name[ca]=Estil Light, 3era revisi?? + Name[cs]=Light Style, t??et?? verze +Index: kstyles/themes/highcolor.themerc +=================================================================== +--- kstyles/themes/highcolor.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/highcolor.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -62,6 +62,7 @@ + Comment[az]=Klassik t??rzin z??ngin r??ngli burax??l?????? + Comment[bg]=???????????????????? ???????? ???? ?????? ?? ???????????? ???????????????? ???? ?????????????????? + Comment[bn]=????????????????????? ???????????????????????? ?????????-??????????????? ????????????????????? ++Comment[br]=Stumm livio?? uhel ar c'hiz da gustum + Comment[bs]=Highcolor verzija klasi??nog stila + Comment[ca]=Versi?? Highcolor de l'estil cl??ssic + Comment[cs]=Mnohobarevn?? verze klasick??ho stylu +Index: kstyles/themes/beos.themerc +=================================================================== +--- kstyles/themes/beos.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/beos.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[az]=??rt??ks??z BeOS b??nz??ri t??rz + Comment[be]=?????????? ?????????????? ???? BeOS (?????? ??????) + Comment[bg]=???????? ?????? ????????, ?????????????? ???? BeOS ++Comment[br]=Giz evel BeOS anwisket + Comment[bs]=Stil bez teme, sli??an Beos-u + Comment[ca]=Estil del tipus BeOS sense temes + Comment[cs]=Styl podobn?? BeOS (bez motivu) +Index: kstyles/web/web.themerc +=================================================================== +--- kstyles/web/web.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/web/web.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -73,6 +73,7 @@ + Comment[az]=Veb p??nc??r??cik t??rzi + Comment[bg]=????????, ???????????????? ???? ?????? ???????????????? ???????????? + Comment[bn]=???????????? ??????????????? ?????????????????? ++Comment[br]=Giz widget gwiad + Comment[bs]=Stil ukrasa na webu + Comment[ca]=Estil d'objectes web + Comment[cs]=Styl prvk?? webu +Index: kabc/formats/binaryformat.cpp +=================================================================== +--- kabc/formats/binaryformat.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kabc/formats/binaryformat.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- FormatPlugin *format() ++ KDE_EXPORT FormatPlugin *format() + { + return new BinaryFormat; + } +Index: knewstuff/downloaddialog.cpp +=================================================================== +--- knewstuff/downloaddialog.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ knewstuff/downloaddialog.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -50,6 +50,7 @@ + { + QString m_providerlist; + QWidget *m_page; ++ KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; + }; + + class NumSortListViewItem : public KListViewItem +@@ -206,7 +207,6 @@ + KTabCtl *ctl; + QWidget *w_d, *w_r, *w_l; + QWidget *w2; +- KListView *lvtmp_r, *lvtmp_d, *lvtmp_l; + QTextBrowser *rt; + QString tmp; + int ret; +@@ -244,27 +244,27 @@ + QHBoxLayout *box = new QHBoxLayout(frame); + box->add(ctl); + +- lvtmp_r = new KListView(w_r); +- lvtmp_r->addColumn(i18n("Name")); +- lvtmp_r->addColumn(i18n("Version")); +- lvtmp_r->addColumn(i18n("Rating")); +- lvtmp_r->setSorting(2, false); ++ d->m_lvtmp_r = new KListView(w_r); ++ d->m_lvtmp_r->addColumn(i18n("Name")); ++ d->m_lvtmp_r->addColumn(i18n("Version")); ++ d->m_lvtmp_r->addColumn(i18n("Rating")); ++ d->m_lvtmp_r->setSorting(2, false); + +- lvtmp_d = new KListView(w_d); +- lvtmp_d->addColumn(i18n("Name")); +- lvtmp_d->addColumn(i18n("Version")); +- lvtmp_d->addColumn(i18n("Downloads")); +- lvtmp_d->setSorting(2, false); ++ d->m_lvtmp_d = new KListView(w_d); ++ d->m_lvtmp_d->addColumn(i18n("Name")); ++ d->m_lvtmp_d->addColumn(i18n("Version")); ++ d->m_lvtmp_d->addColumn(i18n("Downloads")); ++ d->m_lvtmp_d->setSorting(2, false); + +- lvtmp_l = new KListView(w_l); +- lvtmp_l->addColumn(i18n("Name")); +- lvtmp_l->addColumn(i18n("Version")); +- lvtmp_l->addColumn(i18n("Release Date")); +- lvtmp_l->setSorting(2, false); ++ d->m_lvtmp_l = new KListView(w_l); ++ d->m_lvtmp_l->addColumn(i18n("Name")); ++ d->m_lvtmp_l->addColumn(i18n("Version")); ++ d->m_lvtmp_l->addColumn(i18n("Release Date")); ++ d->m_lvtmp_l->setSorting(2, false); + +- connect(lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); + + rt = new QTextBrowser(frame); + rt->setMinimumWidth(150); +@@ -285,14 +285,14 @@ + connect(de, SIGNAL(clicked()), SLOT(slotDetails())); + + QVBoxLayout *box2 = new QVBoxLayout(w_r); +- box2->add(lvtmp_r); ++ box2->add(d->m_lvtmp_r); + QVBoxLayout *box3 = new QVBoxLayout(w_d); +- box3->add(lvtmp_d); ++ box3->add(d->m_lvtmp_d); + QVBoxLayout *box4 = new QVBoxLayout(w_l); +- box4->add(lvtmp_l); ++ box4->add(d->m_lvtmp_l); + + QValueList *v = new QValueList; +- *v << lvtmp_r << lvtmp_d << lvtmp_l; ++ *v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l; + m_map[frame] = v; + m_rts[frame] = rt; + QValueList *vb = new QValueList; +@@ -300,7 +300,7 @@ + m_buttons[frame] = vb; + m_providers[frame] = p; + +- kdDebug() << "addProvider()/end; lvtmp_r = " << lvtmp_r << endl; ++ kdDebug() << "addProvider()/end; d->m_lvtmp_r = " << d->m_lvtmp_r << endl; + + if(m_engine) slotPage(frame); + +@@ -353,7 +353,7 @@ + QDate date; + QString datestring; + int installed; +- ++ + kapp->config()->setGroup("KNewStuffStatus"); + datestring = kapp->config()->readEntry(entry->name()); + if(datestring.isNull()) installed = 0; +@@ -456,6 +456,9 @@ + { + Entry *e = getEntry(); + if(!e) return; ++ d->m_lvtmp_r->setEnabled( false ); ++ d->m_lvtmp_l->setEnabled( false ); ++ d->m_lvtmp_d->setEnabled( false ); + + kdDebug() << "download entry now" << endl; + +@@ -467,9 +470,7 @@ + else + { + m_s = new KNewStuffGeneric(e->type(), this); +- + m_entry = e; +- + KURL source = e->payload(); + KURL dest = KURL(m_s->downloadDestination(e)); + +@@ -492,7 +493,7 @@ + m_entryitem = lv_l->findItem(m_entryname, 0); + if(m_entryitem) m_entryitem->setPixmap(0, pix); + +- ++ + QPushButton *in; + in = *(m_buttons[d->m_page]->at(0)); + if(in) in->setEnabled(false); +@@ -502,7 +503,6 @@ + { + bool ret = (job->error() == 0); + KIO::FileCopyJob *cjob; +- + if(ret) + { + cjob = static_cast(job); +@@ -520,6 +520,9 @@ + KMessageBox::information(this, i18n("Installation successful."), i18n("Installation")); + } + else KMessageBox::error(this, i18n("Installation failed."), i18n("Installation")); ++ d->m_lvtmp_r->setEnabled( true ); ++ d->m_lvtmp_l->setEnabled( true ); ++ d->m_lvtmp_d->setEnabled( true ); + + delete m_s; + } +Index: kdecore/eventsrc +=================================================================== +--- kdecore/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kdecore/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -625,7 +625,7 @@ + Comment[cy]=Methu agor y ffeil penodol i'w ddarllen neu i'w ysgrifennu. + Comment[da]=Den valgte fil kan ikke ??bnes til l??sning eller skrivning + Comment[de]=Die gew??hlte Datei kann nicht zum Lesen oder Schreiben ge??ffnet werden. +-Comment[el]=???? ???????????????????? ???????????? ???? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? ++Comment[el]=???? ???????????????????? ???????????? ?????? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? + Comment[eo]=La elektita dosiero ne estas malfermebla por legado a?? skribado + Comment[es]=El archivo seleccionado no se puede abrir para leer o escribir. + Comment[et]=Valitud faili pole v??imalik avada lugemiseks v??i kirjutamiseks. +@@ -1605,6 +1605,7 @@ + Name[be]=?????????????????????????? ?????????????????????????? + Name[bg]=???????????????????? + Name[bn]=?????????????????????????????? ++Name[br]=Kemennad a titouro?? + Name[bs]=Informativna poruka + Name[ca]=Missatge informatiu + Name[cs]=Informa??n?? zpr??va Index: khtml/khtmlview.cpp =================================================================== ---- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2238,7 +2238,9 @@ guard = node; } @@ -126,8 +538,8 @@ emit m_part->nodeActivated(Node(node)); Index: khtml/html/html_formimpl.cpp =================================================================== ---- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -954,16 +954,15 @@ if (!evt->defaultHandled() && m_render && m_render->isWidget()) { @@ -151,8 +563,8 @@ } Index: khtml/ecma/kjs_events.cpp =================================================================== ---- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -635,6 +635,9 @@ return Boolean(static_cast(event).metaKey()); case Button: @@ -165,8 +577,8 @@ int domButton = static_cast(event).button(); Index: khtml/rendering/render_list.cpp =================================================================== ---- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -402,7 +402,7 @@ m_markerWidth = m_width = 0; @@ -178,8 +590,8 @@ m_width = m_markerWidth; Index: khtml/rendering/render_object.cpp =================================================================== ---- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -1697,21 +1697,22 @@ { // vertical align for table cells has a different meaning @@ -209,8 +621,8 @@ int fontheight = ref->lineHeight( firstLine ); Index: khtml/rendering/render_replaced.cpp =================================================================== ---- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -513,7 +513,7 @@ QWidget* const w = ::qt_cast(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { @@ -226,8 +638,8 @@ svn:mime-type = application/x-jar Index: kresources/kresources.desktop =================================================================== ---- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -14,6 +14,7 @@ Name[af]=KDE Hulpbronne Name[bg]=???????????????? ?????????????? @@ -244,10 +656,201 @@ Comment[bs]=Podesite KDE resurse Comment[ca]=Configura els recursos KDE Comment[cs]=Nastaven?? zdroj?? KDE +Index: dcop/dcopsignals.cpp +=================================================================== +--- dcop/dcopsignals.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ dcop/dcopsignals.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -154,7 +154,7 @@ + + list->append( current ); + conn->signalConnectionList()->append(current); +- if (senderConn) ++ if (senderConn && senderConn != conn) + senderConn->signalConnectionList()->append(current); + return true; + #else //!Q_OS_UNIX +Index: pics/crystalsvg/cr64-action-player_play.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = image/png + +Property changes on: pics/crystalsvg/cr64-action-player_play.png +___________________________________________________________________ +Name: svn:mime-type + + image/png + +Index: kdoctools/customization/pl/user.entities +=================================================================== +--- kdoctools/customization/pl/user.entities (.../tags/KDE/3.4.2/kdelibs) (revision 453462) <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Fri Aug 26 20:33:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: cairo-bug4110.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:33:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: cairo-bug4110.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:46:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: cairo.spec - updated deps (ac/am, freetype for ps/pdf backe... In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:46:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) and xcb backend (on bcond - requires not released yet xcb) - -devel doesn't obsolete standalone libpixman-devel ---- Files affected: SPECS: cairo.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.34 SPECS/cairo.spec:1.35 --- SPECS/cairo.spec:1.34 Fri Aug 26 05:55:49 2005 +++ SPECS/cairo.spec Fri Aug 26 20:46:28 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with xcb # enable XCB backend (XCB not released yet) +# Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo @@ -10,16 +14,16 @@ # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 2.54 +BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel -BuildRequires: freetype-devel >= 2.1.0 +BuildRequires: freetype-devel >= 2.1.4 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig -#BuildRequires: xcb-devel (http://freedesktop.org/software/xcb - CVS only, not released yet) +%{?with_xcb:BuildRequires: xcb-devel} BuildRequires: xrender-devel >= 0.6 BuildRequires: zlib-devel Requires: freetype >= 2.1.0 @@ -73,11 +77,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: fontconfig-devel -Requires: freetype-devel >= 2.1.0 +Requires: freetype-devel >= 2.1.4 Requires: glitz-devel >= 0.4.4 Requires: libpng-devel +%{?with_xcb:Requires: xcb-devel} Requires: xrender-devel >= 0.6 -Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -108,8 +112,7 @@ %{__automake} %configure \ --enable-gtk-doc \ - --enable-quartz \ - --enable-xcb \ + %{?with_xcb:--enable-xcb} \ --enable-glitz \ --enable-ps \ --enable-pdf \ @@ -152,6 +155,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/26 18:46:28 qboosh +- updated deps (ac/am, freetype for ps/pdf backends) +- don't try to enable quartz backend (not available on Linux) + and xcb backend (on bcond - requires not released yet xcb) +- -devel doesn't obsolete standalone libpixman-devel + Revision 1.34 2005/08/26 03:55:49 aredridel - up to 1.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Fri Aug 26 20:54:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: gnome-bluetooth-pygtk.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:54:28 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: gnome-bluetooth-pygtk.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:09:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: grabcartoons.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:09:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: grabcartoons.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u SPECS/grabcartoons.spec:1.1 SPECS/grabcartoons.spec:1.2 --- SPECS/grabcartoons.spec:1.1 Mon Aug 22 08:52:36 2005 +++ SPECS/grabcartoons.spec Fri Aug 26 21:09:36 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: commic-summarizing utility +Summary(pl): Narz?dzie do streszczania komiks?w Name: grabcartoons Version: 1.11 Release: 0.1 @@ -16,6 +17,10 @@ GrabCartoons is a comic-summarizing utility. It is modular, and it is very easy to write modules for new comics. +%description -l pl +GrabCartoons to narz?dzie do streszczania komiks?w. Jest modularne i +?atwo do niego dopisywa? modu?y do nowych komiks?w. + %prep %setup -q %patch0 -p1 @@ -33,7 +38,7 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -/usr/lib/grabcartoons +%{_prefix}/lib/grabcartoons %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -41,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:09:36 qboosh +- pl + Revision 1.1 2005/08/22 06:52:36 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grabcartoons.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:20:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: gsutil.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:20:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: gsutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/gsutil.spec diff -u SPECS/gsutil.spec:1.1 SPECS/gsutil.spec:1.2 --- SPECS/gsutil.spec:1.1 Fri Aug 19 09:39:35 2005 +++ SPECS/gsutil.spec Fri Aug 26 21:20:51 2005 @@ -1,29 +1,32 @@ # $Revision$, $Date$ Summary: A utility to save, restore and reboot Grandstream Budgetone phones +Summary(pl): Narz?dzie do zapisywania, odtwarzania i restartowania telefon?w Grandstream Budgetone Name: gsutil Version: 2.1 Release: 1 +License: GPL Group: Applications/System Source0: http://www.pkts.ca/%{name}-%{version}.tar.gz # Source0-md5: 28010ee2e2881dd6597e27659174ee6a -License: GPL URL: http://www.pkts.ca/gsutil.shtml -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -BuildArch: noarch Requires: perl Requires: perl-libwww Provides: gsutil +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A utility to dump and restore the configuration of the Grandstream Budgetone VOIP telephone, up to and including version 1.0.6.7 of the firmware. +%description -l pl +Narz?dzie do zrzucania i odtwarzania konfiguracji telefon?w VOIP +Grandstream Budgetone do wersji firmware'u 1.0.6.7 w??cznie. + %prep %setup -q -%build - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_bindir} @@ -34,8 +37,8 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/gsutil %doc README Changelog +%attr(755,root,root) %{_bindir}/gsutil %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -43,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:20:51 qboosh +- pl, unified + Revision 1.1 2005/08/19 07:39:35 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsutil.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: xprobe2-0.3.tar.gz Message-ID: <16445.1125084444@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xprobe/xprobe2-0.3.tar.gz 3ebb89ed9380038d368327816e34ec54 xprobe2-0.3.tar.gz Size: 533636 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: xprobe2.spec - updated URLs In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:27:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URLs ---- Files affected: SPECS: xprobe2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.9 SPECS/xprobe2.spec:1.10 --- SPECS/xprobe2.spec:1.9 Fri Aug 19 10:08:34 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:27:18 2005 @@ -6,10 +6,10 @@ Release: 0.1 License: GPL Group: Networking -Source0: http://www.sys-security.com/archive/tools/xprobe2/%{name}-%{version}.tar.gz +Source0: http://dl.sourceforge.net/xprobe/%{name}-%{version}.tar.gz # Source0-md5: 3ebb89ed9380038d368327816e34ec54 Patch0: %{name}-paths.patch -URL: http://www.sys-security.com/html/projects/X.html +URL: http://www.sys-security.com/index.php?page=xprobe BuildRequires: autoconf BuildRequires: libpcap-devel BuildRequires: libstdc++-devel @@ -61,7 +61,7 @@ %doc README CHANGELOG docs/modules_howto.txt %attr(755,root,root) %{_bindir}/xprobe2 %{_mandir}/man1/* -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xprobe2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xprobe2.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/26 19:27:18 qboosh +- updated URLs + Revision 1.9 2005/08/19 08:08:34 grzegorz - ups md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.9&r2=1.10&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: xprobe2.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: xprobe2.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.10 SPECS/xprobe2.spec:1.11 --- SPECS/xprobe2.spec:1.10 Fri Aug 26 21:27:18 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:28:05 2005 @@ -33,7 +33,7 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 %build cp -f /usr/share/automake/config.sub cfg-scripts/config.sub @@ -49,7 +49,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT install -D etc/xprobe2.conf $RPM_BUILD_ROOT%{_sysconfdir}/xprobe2.conf @@ -69,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 19:28:05 qboosh +- cosmetics + Revision 1.10 2005/08/26 19:27:18 qboosh - updated URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: xprobe2-gcc33.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: xprobe2-gcc33.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:34:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: idesk.spec - updated pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:34:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl ---- Files affected: SPECS: idesk.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.17 SPECS/idesk.spec:1.18 --- SPECS/idesk.spec:1.17 Mon Aug 22 18:05:09 2005 +++ SPECS/idesk.spec Fri Aug 26 21:34:23 2005 @@ -22,14 +22,18 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not provided by all window managers. The icon graphics are either from a -png or svg (vector) file and support some eyecandy effects like -transparency. Each icon can be confgured to run one or more shell +PNG or SVG (vector) file and support some eyecandy effects like +transparency. Each icon can be configured to run one or more shell commands and the actions which run those commands are completely configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie -oferowana przez wszystkie window managery. +oferowana przez wszystkich zarz?dc?w okien. Grafiki ikon pochodz? z +plik?w PNG lub (wektorowych) SVG i wspieraj? niekt?re efekty takie +jak przezroczysto??. Ka?da ikona mo?e by? skonfigurowana do +uruchamiania jednego lub wi?kszej liczby polece? pow?oki, a akcje +uruchamiaj?ce te polecenia s? w pe?ni konfigurowalne. %prep %setup -q @@ -64,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/26 19:34:23 qboosh +- updated pl + Revision 1.17 2005/08/22 16:05:09 spider - extended description ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Fri Aug 26 21:35:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <21604.1125084920@distfiles.pld-linux.org> Files fetched: 0 ALREADY GOT: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: kchmviewer.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: kchmviewer.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.3 SPECS/kchmviewer.spec:1.4 --- SPECS/kchmviewer.spec:1.3 Mon Aug 22 15:07:58 2005 +++ SPECS/kchmviewer.spec Fri Aug 26 21:45:09 2005 @@ -4,7 +4,8 @@ %bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # -Summary: KchmViewer is a chm (MS HTML help file format) viewer +Summary: KchmViewer - a CHM (MS HTML help file format) viewer +Summary(pl): KchmViewer - przegl?darka CHM (formatu plik?w pomocy MS HTML) Name: kchmviewer Version: 1.0 Release: 0.6 @@ -13,20 +14,27 @@ Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz # Source0-md5: 0f9595cbb13eb950261e660c168dc033 URL: http://kchmviewer.sourceforge.net/ +%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel -BuildRequires: zlib-devel -%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +KchmViewer is a CHM (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or Gnome. However, it may be +library, and does not depend on KDE or GNOME. However, it may be compiled with full KDE support, including KDE widgets and KIO/KHTML. +%description -l pl +KchmViewer to przegl?darka CHM (formatu plik?w pomocy MS HTML) +napisana w C++. W przeciwie?stwie do wi?kszo?ci istniej?cych +przegl?darek CHM dla Uniksa u?ywa biblioteki widget?w Trolltecha Qt i +nie zale?y od KDE czy GNOME. Jednak mo?e by? skompilowana z pe?nym +wsparciem dla KDE, w??cznie z widgetami KDE i KIO/KHTML. + %prep %setup -q @@ -56,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 19:45:09 qboosh +- pl, unified + Revision 1.3 2005/08/22 13:07:58 spider - spaces -> tabs @@ -64,4 +75,3 @@ Revision 1.1 2005/08/22 10:45:44 spider - init - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 21:48:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: kde-icons-gartoon.spec - pl, missing defattr In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:48:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing defattr ---- Files affected: SPECS: kde-icons-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-icons-gartoon.spec diff -u SPECS/kde-icons-gartoon.spec:1.2 SPECS/kde-icons-gartoon.spec:1.3 --- SPECS/kde-icons-gartoon.spec:1.2 Sat Aug 20 21:29:44 2005 +++ SPECS/kde-icons-gartoon.spec Fri Aug 26 21:48:19 2005 @@ -21,13 +21,22 @@ %description Fun looking icons with bright colors and bold outlines. +%description -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. + %package blue Summary: KDE icons - %{_name} blue +Summary(pl): Motyw ikon do KDE - %{_name} blue Group: Themes %description blue Fun looking icons with bright colors and bold outlines. Blue theme. +%description blue -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. Motyw niebieski. + %prep %install @@ -45,6 +54,7 @@ %{_iconsdir}/%{_name} %files blue +%defattr(644,root,root,755) %{_iconsdir}/%{_name}-blue %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +63,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:48:19 qboosh +- pl, missing defattr + Revision 1.2 2005/08/20 19:29:44 glen - use SVG. seems to work ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-icons-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:49:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: kde-splash-gartoon.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:49:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: kde-splash-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.2 SPECS/kde-splash-gartoon.spec:1.3 --- SPECS/kde-splash-gartoon.spec:1.2 Mon Aug 22 09:54:49 2005 +++ SPECS/kde-splash-gartoon.spec Fri Aug 26 21:49:16 2005 @@ -17,6 +17,9 @@ %description gartoon splash screen. +%description -l pl +Ekran startowy gartoon. + %prep %setup -q -n gartoonss @@ -40,6 +43,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:49:16 qboosh +- pl desc + Revision 1.2 2005/08/22 07:54:49 glen - rel 0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:58:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: shared-mime-info.spec - updated URL In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:58:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL ---- Files affected: SPECS: shared-mime-info.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/shared-mime-info.spec diff -u SPECS/shared-mime-info.spec:1.31 SPECS/shared-mime-info.spec:1.32 --- SPECS/shared-mime-info.spec:1.31 Wed Aug 17 20:14:47 2005 +++ SPECS/shared-mime-info.spec Fri Aug 26 21:57:54 2005 @@ -6,7 +6,7 @@ Release: 1 License: GPL Group: X11/Applications -#Source0: http://freedesktop.org/Software/%{name}/%{name}-%{version}.tar.gz +#Source0: http://freedesktop.org/software/shared-mime-info/%{name}-%{version}.tar.gz Source0: http://freedesktop.org/~jrb/%{name}-%{version}.tar.gz # Source0-md5: 255a20bae753ebd41e2286b01e7b86d0 Patch0: %{name}-dtd_path.patch @@ -14,6 +14,7 @@ Patch2: %{name}-dicom.patch Patch3: %{name}-polish.patch Patch4: %{name}-word.patch +URL: http://www.freedesktop.org/wiki/Software/shared-mime-info BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-dtd412-xml @@ -21,7 +22,6 @@ BuildRequires: glib2-devel BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: pkgconfig -URL: http://www.freedesktop.org/software/shared-mime-info BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/26 19:57:54 qboosh +- updated URL + Revision 1.31 2005/08/17 18:14:47 adgor - 0.16 (unofficial) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/shared-mime-info.spec?r1=1.31&r2=1.32&f=u From qboosh at pld-linux.org Fri Aug 26 22:00:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: libcontainer.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 20:00:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libcontainer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libcontainer.spec diff -u SPECS/libcontainer.spec:1.1 SPECS/libcontainer.spec:1.2 --- SPECS/libcontainer.spec:1.1 Sun Aug 21 00:53:13 2005 +++ SPECS/libcontainer.spec Fri Aug 26 22:00:08 2005 @@ -3,8 +3,8 @@ # Conditional build: %bcond_without static_libs # don't build static libraries # -Summary: Simple C library that provides linked lists, stacks, queues and binary trees. -Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych. +Summary: Simple C library that provides linked lists, stacks, queues and binary trees +Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych Name: libcontainer Version: 0.1.0 Release: 0.1 @@ -25,7 +25,12 @@ bubble sort at the moment). There is a slight lack of documentation but there are some examples in the test/ directory. -#%%description -l pl +%description -l pl +Libcontainer to prosta biblioteka C, kt?rej mo?na u?ywa? w aplikacjach +do obs?ugi list wi?zanych, stos?w, kolejek i drzew binarnych. Autor +chcia?by jeszcze popracowa? nad ni? nieco wi?cej (listy wi?zane +obs?uguj? aktualnie tylko sortowanie b?belkowe). S? pewne braki w +dokumentacji, ale jest troch? przyk?ad?w w katalogu test/. %package devel Summary: Header files for libcontainer library @@ -98,7 +103,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 20:00:08 qboosh +- pl desc + Revision 1.1 2005/08/20 22:53:13 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcontainer.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 22:17:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: template-php-pecl.spec, template-php4-pecl.spec - add neede... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add needed rpmbuild(macros) >= 1.228 for %service macro ---- Files affected: SPECS: template-php-pecl.spec (1.11 -> 1.12) , template-php4-pecl.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.11 SPECS/template-php-pecl.spec:1.12 --- SPECS/template-php-pecl.spec:1.11 Fri Aug 26 18:15:39 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.11 2005/08/26 16:15:39 adamg - conf.d support ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.4 SPECS/template-php4-pecl.spec:1.5 --- SPECS/template-php4-pecl.spec:1.4 Fri Aug 26 18:14:52 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php4-devel +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.4 2005/08/26 16:14:52 adamg - move %define calls to the top of the file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Fri Aug 26 22:18:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: template-php-pecl.spec - this is for php5 In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:18:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - this is for php5 ---- Files affected: SPECS: template-php-pecl.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.12 SPECS/template-php-pecl.spec:1.13 --- SPECS/template-php-pecl.spec:1.12 Fri Aug 26 22:17:12 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:55 2005 @@ -52,13 +52,13 @@ rm -rf $RPM_BUILD_ROOT %post -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart %postun if [ "$1" = 0 ]; then - [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart - [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart + [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart fi %files @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/26 20:17:55 glen +- this is for php5 + Revision 1.12 2005/08/26 20:17:12 glen - add needed rpmbuild(macros) >= 1.228 for %service macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Fri Aug 26 23:01:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: libsl.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:01:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libsl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libsl.spec diff -u SPECS/libsl.spec:1.1 SPECS/libsl.spec:1.2 --- SPECS/libsl.spec:1.1 Sun Aug 21 01:08:17 2005 +++ SPECS/libsl.spec Fri Aug 26 23:01:28 2005 @@ -6,7 +6,7 @@ %bcond_without static_libs # don't build static libraries # Summary: A small and flexible linked list implementation -Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej. +Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej Name: libsl Version: 0.3.2 Release: 0.1 @@ -30,7 +30,16 @@ nodes. It also means that a push can't fail because memory couldn't be allocated for the container node. -#%%description -l pl +%description -l pl +sl to wydajna pami?ciowo biblioteka og?lnych list wi?zanych. Nie u?ywa +w?z??w kontenerowych. Zamiast tego wymaga wska?nika do nast?pnego +elementu bezpo?rednio w strukturze danych, z kt?rej chce si? utworzy? +listy (lub stosy). Mo?e to da? znacz?c? oszcz?dno?? pami?ci przy +tworzeniu d?ugich list ma?ych struktur. Pozwala tak?e na szybkie +operacje "push" i "pop", jako ?e nie ma potrzeby przydzielania i +zwalniania pami?ci dla w?z??w kontenerowych. Oznacza to tak?e, ?e +operacja "push" nie mo?e nie powie?? si? z powodu niemo?no?ci +przydzielenia pami?ci na w?ze? kontenerowy. %package devel Summary: Header files for libsl library @@ -104,7 +113,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 21:01:28 qboosh +- pl desc + Revision 1.1 2005/08/20 23:08:17 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsl.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 23:30:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: lighttpd.spec - pl for new mod_* subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:30:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new mod_* subpackages ---- Files affected: SPECS: lighttpd.spec (1.123 -> 1.124) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.123 SPECS/lighttpd.spec:1.124 --- SPECS/lighttpd.spec:1.123 Thu Aug 25 08:40:33 2005 +++ SPECS/lighttpd.spec Fri Aug 26 23:29:59 2005 @@ -117,6 +117,7 @@ %package mod_compress Summary: Output Compression +Summary(pl): Kompresja wyj?cia Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/compress.html Requires: %{name} = %{version}-%{release} @@ -127,11 +128,21 @@ Only static content is supported up to now. -The server negotiates automaticly which compression method is used. +The server negotiates automatically which compression method is used. Supported are gzip, deflate, bzip. +%description mod_compress -l pl +Kompresja wyj?cia zmniejsza obci??enie sieci i mo?e poprawi? ca?kowit? +przepustowo?? serwera WWW. + +Jak na razie obs?ugiwana jest tylko statyczna tre??. + +Serwer automatycznie negocjuje, kt?ra metoda kompresji jest u?ywana. +Obs?ugiwane s? gzip, deflate i bzip. + %package mod_cml Summary: Cache Meta Language module +Summary(pl): Modu? Cache Meta Language Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/cml.html Requires: %{name} = %{version}-%{release} @@ -141,8 +152,13 @@ side and building a page from its fragments on the other side using LUA. +%description mod_cml -l pl +CML to metaj?zyk s?u??cy z jednej strony do opisu zale?no?ci strony i +z drugiej strony do budowania strony z fragment?w przy u?yciu LUA. + %package mod_mysql_vhost Summary: MySQL based vhosting +Summary(pl): vhosty oparte na MySQL-u Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/mysqlvhost.html Requires: %{name} = %{version}-%{release} @@ -150,8 +166,12 @@ %description mod_mysql_vhost This module provides virtual hosts (vhosts) based on a MySQL table. +%description mod_mysql_vhost -l pl +Ten modu? udost?pnia wirtualne hosty (vhosty) oparte na tabeli MySQL. + %package mod_trigger_b4_dl Summary: Trigger before Download +Summary(pl): Wyzwalacz przed ?ci?ganiem Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/trigger_b4_dl.html Requires: %{name} = %{version}-%{release} @@ -159,8 +179,12 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%description mod_trigger_b4_dl -l pl +Jeszcze jeden modu? blokuj?cy bezpo?rednie linkowanie. + %package mod_webdav Summary: WebDAV module for lighttpd +Summary(pl): Modu? WebDAV dla libghttpd Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/webdav.html Requires: %{name} = %{version}-%{release} @@ -181,6 +205,20 @@ So far mounting a webdav resource into Windows XP works and the basic litmus tests are passed. +%description mod_webdav -l pl +Modu? WebDAV to bardzo minimalistyczna implementacja RFC 2518. +Minimalistyczna oznacza, ?e jeszcze nie wszystkie operacje s? +zaimplementowane. Jak na razie s?: +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT +oraz zwyk?e GET, POST, HEAD z HTTP/1.1. + +Jak na razie montowanie zasobu webdav pod Windows XP dzia?a i +podstawowe testy lakmusowe przechodz?. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -352,6 +390,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124 2005/08/26 21:29:59 qboosh +- pl for new mod_* subpackages + Revision 1.123 2005/08/25 06:40:33 aredridel - add openssl fix (Changeset 621) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.123&r2=1.124&f=u From qboosh at pld-linux.org Sat Aug 27 00:25:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: mysql-connector-j.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 22:25:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: mysql-connector-j.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.3 SPECS/mysql-connector-j.spec:1.4 --- SPECS/mysql-connector-j.spec:1.3 Mon Aug 22 12:29:40 2005 +++ SPECS/mysql-connector-j.spec Sat Aug 27 00:25:06 2005 @@ -1,6 +1,10 @@ # $Revision$, $Date$ +# +# Conditional build: %bcond_without bindist # don't use binary distribution (not finished) -Summary: MySQL Connector/J +# +Summary: MySQL Connector/J - JDBC driver for MySQL +Summary(pl): MySQL Connector/J - sterownik JDBC dla MySQL-a Name: mysql-connector-j Version: 3.1.10 Release: 0.1 @@ -24,13 +28,28 @@ MySQL Connector/J is the official JDBC driver for MySQL. +%description -l pl +MySQL Connector/J to natywny sterownik Javy konwertuj?cy wywo?ania +JDBC (Java Database Connectivity) na protok?? sieciowy u?ywany przez +baz? danych MySQL. Pozwala programistom pracowa? z u?yciem j?zyka +programowania Java ?atwo tworz?c programy i aplety wsp??pracuj?ce z +MySQL-em i ??czy? wszystkie zbiorcze dane, nawet w ?rodowisku +heterogenicznym. MySQL Connector/J jest sterownikiem JDBC typu IV i ma +pe?ny zbi?r mo?liwo?ci JDBC obs?uguj?cy MySQL-a. + +MySQL Connector/J to oficjalny sterownik JDBC dla MySQL-a. + %package doc Summary: Documentation for MySQL Connector/J +Summary(pl): Dokumentacja dla MySQL Connector/J Group: Documentation %description doc Documentation for MySQL Connector/J. +%description doc -l pl +Dokumentacja dla MySQL Connector/J. + %prep %setup -q -n mysql-connector-java-%{version} rm -f docs/README # duplicate @@ -67,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 22:25:06 qboosh +- pl + Revision 1.3 2005/08/22 10:29:40 glen - adapterized, no extra subdir on -doc package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.3&r2=1.4&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:45 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: poppler.spec - 0.4.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:52:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.1 ---- Files affected: SPECS: poppler.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.16 SPECS/poppler.spec:1.17 --- SPECS/poppler.spec:1.16 Tue Aug 16 10:04:29 2005 +++ SPECS/poppler.spec Sat Aug 27 00:52:39 2005 @@ -9,12 +9,12 @@ Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF Name: poppler -Version: 0.4.0 +Version: 0.4.1 Release: 1 License: GPL Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: e7c7488788b8240ada090fa0406a3784 +# Source0-md5: 000c069ce0700318ba3cc1f7c4bff87f Patch0: %{name}-link.patch URL: http://poppler.freedesktop.org/ BuildRequires: autoconf >= 2.59 @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/26 22:52:39 aflinta +- 0.4.1 + Revision 1.16 2005/08/16 08:04:29 freetz - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.16&r2=1.17&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:52 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: poppler-0.4.1.tar.gz Message-ID: <16709.1125096772@distfiles.pld-linux.org> Files fetched: 1 STORED: http://poppler.freedesktop.org/poppler-0.4.1.tar.gz 000c069ce0700318ba3cc1f7c4bff87f poppler-0.4.1.tar.gz Size: 776378 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Sat Aug 27 00:57:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: evince.spec - 0.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.0 ---- Files affected: SPECS: evince.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.28 SPECS/evince.spec:1.29 --- SPECS/evince.spec:1.28 Wed Aug 17 23:33:36 2005 +++ SPECS/evince.spec Sat Aug 27 00:57:44 2005 @@ -5,21 +5,21 @@ Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince -Version: 0.3.4 +Version: 0.4.0 Release: 0.9 License: GPL v2 Group: X11/Applications/Graphics -Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 2c3177f60e6d8ed0b73168ebf9f726a5 +Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 +# Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -Patch2: %{name}-disable_dbus.patch +#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake # NOTE: disabled until less broken release -#BuildRequires: dbus-glib-devel >= 0.33 +BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -34,7 +34,7 @@ BuildRequires: libtiff-devel BuildRequires: nautilus-devel BuildRequires: pkgconfig -BuildRequires: poppler-glib-devel >= 0.4.0 +BuildRequires: poppler-glib-devel >= 0.4.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -72,7 +72,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -83,6 +83,7 @@ %configure \ --disable-static \ --disable-schemas-install \ + --enable-dbus \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -144,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/26 22:57:44 aflinta +- 0.4.0 + Revision 1.28 2005/08/17 21:33:36 freetz - forced fixed cairo version in R:, fixed subpackage descriptions, TODO added, more BRs, rel. 0.9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.28&r2=1.29&f=u From aflinta at pld-linux.org Sat Aug 27 00:57:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: evince-0.4.0.tar.bz2 Message-ID: <23056.1125097073@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/evince-0.4.0.tar.bz2 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 Size: 891605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:33:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: trean.spec - let BUILD dir identify source snap (to compare... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:33:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - let BUILD dir identify source snap (to compare them) ---- Files affected: SPECS: trean.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.5 SPECS/trean.spec:1.6 --- SPECS/trean.spec:1.5 Thu Jul 21 00:07:56 2005 +++ SPECS/trean.spec Sat Aug 27 01:33:47 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ -%define _snap 2005-05-11 -%define _rel 1.1 +%define _snap 2005-08-01 +%define _rel 1 %include /usr/lib/rpm/macros.php Summary: Horde Bookmarks application @@ -11,13 +11,13 @@ Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 # NoSource0-md5: 20f5a96682d04444d48f9307ebb08515 -# don't put snapshots to df -NoSource: 0 Source1: %{name}.conf URL: http://www.horde.org/trean/ BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) # docs say it requires 3.1, but seems work in 3.0 too @@ -36,14 +36,14 @@ %description The Trean (Bookmarks) application allows you to store, organize and manage, and most importantly access your web browser bookmarks on-line -and in one central place accessible from any web browser. +and in one central place accessible from any web browser. By storing your bookmarks here, you can access them from any browser on any machine that can access the Horde applications. This means you can easily access your bookmarks from multiple browsers, multiple machines, remote locations, etc. And if you upgrade, switch, or test out browsers, you don't have to worry about what happens to your -bookmarks or how to import them into the new browser. +bookmarks or how to import them into the new browser. The Horde Project writes web applications in PHP and releases them under the GNU General Public License. For more information (including @@ -67,7 +67,8 @@ Treana) mo?na znale?? na stronie . %prep -%setup -q -n %{name} +%setup -q -c -T -n %{name}-%{_snap} +tar zxf %{SOURCE0} --strip-components=1 rm -f config/.htaccess @@ -149,6 +150,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/26 23:33:47 glen +- let BUILD dir identify source snap (to compare them) + Revision 1.5 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sat Aug 27 01:33:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <25568.1125099239@distfiles.pld-linux.org> wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:34:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: trean.spec - license BSD In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:34:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license BSD ---- Files affected: SPECS: trean.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.6 SPECS/trean.spec:1.7 --- SPECS/trean.spec:1.6 Sat Aug 27 01:33:47 2005 +++ SPECS/trean.spec Sat Aug 27 01:34:48 2005 @@ -9,7 +9,7 @@ Name: trean Version: 0.1 Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL +License: BSD Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz # Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 @@ -45,10 +45,6 @@ out browsers, you don't have to worry about what happens to your bookmarks or how to import them into the new browser. -The Horde Project writes web applications in PHP and releases them -under the GNU General Public License. For more information (including -help with Trean) please visit . - %description -l pl Aplikacja Tream (zak?adki) pozwala na przechowywanie, organizowanie i zarz?dzanie, a co najwa?niejsze, dost?p do zak?adek przegl?darki WWW @@ -62,10 +58,6 @@ martwi? co si? stanie z zak?adkami, albo jak zaimportowa? je do nowej przegl?darki. -Projekt Horde tworzy aplikacje WWW w PHP i wydaje je na licencji GNU -Genral Public License. Wi?cej informacji (w??cznie z pomoc? dla -Treana) mo?na znale?? na stronie . - %prep %setup -q -c -T -n %{name}-%{_snap} tar zxf %{SOURCE0} --strip-components=1 @@ -150,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/26 23:34:48 glen +- license BSD + Revision 1.6 2005/08/26 23:33:47 glen - let BUILD dir identify source snap (to compare them) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sat Aug 27 01:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <26702.1125099296@distfiles.pld-linux.org> wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From undefine at pld-linux.org Sat Aug 27 03:10:50 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: aee.spec (NEW) - initital pld version, partialy based on md... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:10:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initital pld version, partialy based on mdk spec ---- Files affected: SPECS: aee.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u /dev/null SPECS/aee.spec:1.1 --- /dev/null Sat Aug 27 03:10:50 2005 +++ SPECS/aee.spec Sat Aug 27 03:10:45 2005 @@ -0,0 +1,59 @@ +# $Revision$, $Date$ +Summary: An easy to use text editor +Summary(pl): ?atwy w u?yciu edytor tekstowy +Name: aee +Version: 2.2.15b +Release: 1 +License: Artistic +Group: Applications/Editors +URL: http://mahon.cwx.net/ +Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +Patch0: %{name}-conf.patch +BuildRequires: XFree86-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +An easy to use text editor. Intended to be usable with little or no +instruction. Provides both a terminal (curses based) interface and +native X-Windows interface (in which case the executable is called +xae). Features include pop-up menus, journalling (to recover from +system crash or loss of connection), cut-and-paste, multiple buffers +(associated with files or not), and much more. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__make} both \ + OPTFLAGS="%{rpmcflags} -L%{_prefix}/X11R6/%{_lib}" + +%install +rm -rf $RPM_BUILD_ROOT +install -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} +install -D xae $RPM_BUILD_ROOT%{_bindir}/xae +install -D %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +install -D help.ae $RPM_BUILD_ROOT%{_datadir}/%{name}/help.ae +ln -sf aee $RPM_BUILD_ROOT%{_bindir}/rae +ln -sf xae $RPM_BUILD_ROOT%{_bindir}/rxae + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Artistic README.aee aee.1.ps aee.i18n.guide keypad +%attr(755,root,root) %{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/help.ae +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 01:10:45 undefine +- initital pld version, partialy based on mdk spec + ================================================================ From undefine at pld-linux.org Sat Aug 27 03:11:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 09:39:23 2005 Subject: SOURCES: aee-conf.patch (NEW) - fix patch to help file and use opt... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:11:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix patch to help file and use optflags (from mdk) ---- Files affected: SOURCES: aee-conf.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/aee-conf.patch diff -u /dev/null SOURCES/aee-conf.patch:1.1 --- /dev/null Sat Aug 27 03:11:23 2005 +++ SOURCES/aee-conf.patch Sat Aug 27 03:11:18 2005 @@ -0,0 +1,32 @@ +--- aee-2.2.15b/create.mk.aee~ 2002-09-23 06:16:04.000000000 +0200 ++++ aee-2.2.15b/create.mk.aee 2004-01-05 01:00:11.000000000 +0100 +@@ -263,7 +263,7 @@ fi + + echo "DEFINES = $termio $terminfo_exists $BSD_SELECT $catgets $select $curses " > make.aee + echo "" >> make.aee +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists" >> make.aee ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists \$(OPTFLAGS)" >> make.aee + echo "" >> make.aee + echo "" >> make.aee + echo "all : $TARGET" >> make.aee +--- aee-2.2.15b/help.c~ 1999-02-01 05:28:23.000000000 +0100 ++++ aee-2.2.15b/help.c 2004-01-05 01:06:04.000000000 +0100 +@@ -11,6 +11,7 @@ + #include "aee.h" + + char *help_file_list[4] = { ++ "/usr/share/aee/help.ae", + "/usr/local/aee/help.ae", + "/usr/local/lib/help.ae", + "~/.help.ae", +--- aee-2.2.15b/create.mk.xae~ 2002-09-23 04:16:18.000000000 +0000 ++++ aee-2.2.15b/create.mk.xae 2005-08-27 00:50:37.224401848 +0000 +@@ -185,7 +185,7 @@ + + echo "DEFINES = -DXAE -Dxae11 $catgets " > xae_dir/make.xae + echo "" >> xae_dir/make.xae +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags" >> xae_dir/make.xae ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags \$(OPTFLAGS)" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "all : xae" >> xae_dir/make.xae ================================================================ From aredridel at pld-linux.org Sat Aug 27 04:04:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:23 2005 Subject: DISTFILES: librsvg-2.11.0.tar.bz2 Message-ID: <10280.1125108298@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/librsvg-2.11.0.tar.bz2 d64df7603785440c8af39a338753bdf4 librsvg-2.11.0.tar.bz2 Size: 379647 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 04:05:00 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:23 2005 Subject: SPECS: librsvg.spec - up to 2.11.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 02:05:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.11.0 ---- Files affected: SPECS: librsvg.spec (1.84 -> 1.85) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.84 SPECS/librsvg.spec:1.85 --- SPECS/librsvg.spec:1.84 Sun Mar 20 22:43:18 2005 +++ SPECS/librsvg.spec Sat Aug 27 04:04:54 2005 @@ -13,14 +13,14 @@ Summary(ru): SVG ?????????? Summary(uk): SVG ?????????? Name: librsvg -Version: 2.9.5 -Release: 2 +Version: 2.11.0 +Release: 1 Epoch: 1 License: LGPL v2+ Vendor: GNOME Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.9/%{name}-%{version}.tar.bz2 -# Source0-md5: 44799d75e940eb4150acdae4f63cbe2a +Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: d64df7603785440c8af39a338753bdf4 URL: http://librsvg.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.85 2005/08/27 02:04:54 aredridel +- up to 2.11.0 + Revision 1.84 2005/03/20 21:43:18 aflinta - rebuild with howl 0.9.10, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.84&r2=1.85&f=u From qboosh at pld-linux.org Sat Aug 27 09:42:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: perl-File-chdir.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:42:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: perl-File-chdir.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-File-chdir.spec diff -u SPECS/perl-File-chdir.spec:1.1 SPECS/perl-File-chdir.spec:1.2 --- SPECS/perl-File-chdir.spec:1.1 Fri Aug 19 21:06:06 2005 +++ SPECS/perl-File-chdir.spec Sat Aug 27 09:42:16 2005 @@ -7,6 +7,7 @@ %define pdir File %define pnam chdir Summary: File::chdir - a more sensible way to change directories +Summary(pl): File::chdir - rozs?dniejszy spos?b zmiany katalog?w Name: perl-File-chdir Version: 0.06 Release: 1 @@ -22,9 +23,24 @@ %description File::chdir module - a more sensible way to change directories. -Perl's chdir() has the unfortunate problem of being very, very, very global. If any part of your program calls chdir() or if any library you use calls chdir(), it changes the current working directory for the whole program. +Perl's chdir() has the unfortunate problem of being very, very, very +global. If any part of your program calls chdir() or if any library +you use calls chdir(), it changes the current working directory for +the whole program. + +File::chdir gives you an alternative, $CWD and @CWD. These two +variables combine all the power of chdir(), File::Spec and Cwd. + +%description -l pl +Modu? File::chdir - rozs?dniejszy spos?b zmiany katalog?w. + +Perlowa funkcja chdir() jest problematyczna, poniewa? dzia?a bardzo, +bardzo, bardzo globalnie. Je?li dowolna cz??? programu lub dowolna +u?ywana biblioteka wywo?a chdir(), zmienia si? bie??cy katalog dla +ca?ego programu. -File::chdir gives you an alternative, $CWD and @CWD. These two variables combine all the power of chdir(), File::Spec and Cwd. +File::chdir daje alternatyw? - $CWD i @CWD. Te dwie zmienne ??cz? ca?? +pot?g? chdir(), File::Spec i Cwd. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -57,6 +73,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:42:16 qboosh +- pl + Revision 1.1 2005/08/19 19:06:06 arekm - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-File-chdir.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: POE-Component-DebugShell-1.0411.tar.gz Message-ID: <9575.1125128940@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DebugShell-1.0411.tar.gz 68aa0496f6ded9e221100c22351a05e5 POE-Component-DebugShell-1.0411.tar.gz Size: 6979 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - descs, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - descs, md5 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.2 SPECS/perl-POE-Component-DebugShell.spec:1.3 --- SPECS/perl-POE-Component-DebugShell.spec:1.2 Wed Aug 24 12:47:55 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Sat Aug 27 09:48:55 2005 @@ -6,23 +6,30 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DebugShell -Summary: POE::Component::DebugShell +Summary: POE::Component::DebugShell - interactive peeking into a running POE application +Summary(pl): POE::Component::DebugShell - interaktywne podgl?danie dzia?aj?cych aplikacji POE Name: perl-POE-Component-DebugShell Version: 1.0411 Release: 0.1 -License: other, see LICENSE +License: MIT-like (see LICENSE) Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org -BuildRequires: perl-devel >= 1:5.8.0 -BuildRequires: rpm-perlprov >= 4.1-13 +# Source0-md5: 68aa0496f6ded9e221100c22351a05e5 +URL: http://poe.perl.org/ BuildRequires: perl-POE BuildRequires: perl-POE-API-Peek +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -perl-POE-Component-DebugShell module, see poe.perl.org +This component allows for interactive peeking into a running POE +application. + +%description -l pl +Ten komponent umo?liwia interaktywne podgl?danie dzia?aj?cych +aplikacji POE. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -46,7 +53,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE +%doc Changes LICENSE %{perl_vendorlib}/POE/Component/DebugShell.pm %{_mandir}/man3/* @@ -56,9 +63,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 07:48:55 qboosh +- descs, md5 + Revision 1.2 2005/08/24 10:47:55 agaran - missing buildreq Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: POE-Component-DirWatch-0.02.tar.gz Message-ID: <16990.1125129261@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DirWatch-0.02.tar.gz d41814d4a100c10f270c09638f193ccc POE-Component-DirWatch-0.02.tar.gz Size: 4375 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u SPECS/perl-POE-Component-DirWatch.spec:1.1 SPECS/perl-POE-Component-DirWatch.spec:1.2 --- SPECS/perl-POE-Component-DirWatch.spec:1.1 Wed Aug 24 12:53:29 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Sat Aug 27 09:54:15 2005 @@ -6,27 +6,35 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DirWatch -Summary: POE::Component::DirWatch +Summary: POE::Component::DirWatch - POE directory watcher +Summary(pl): POE::Component::DirWatch - obserwowanie katalog?w w POE Name: perl-POE-Component-DirWatch Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: d41814d4a100c10f270c09638f193ccc +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -#BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback -as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as -an FTP upload directory. +POE::Component::DirWatch watches a directory for files. It creates a +separate session which invokes a user-supplied callback as soon as if +finds a file in the directory. Its primary intended use is processing +a "drop-box" style directory, such as an FTP upload directory. + +%description -l pl +POE::Component::DirWatch obserwowuje katalog pod k?tem plik?w. Tworzy +oddzieln? sesj?, kt?ra wywo?uje przekazane przez u?ytkownika wywo?anie +zwrotne zaraz jak znajdzie w katalogu plik. G??wnym zastosowaniem jest +przetwarzanie katalog?w s?u??cych do wrzucania plik?w, takich jak +katalog upload dost?pny przez FTP. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:54:15 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:53:29 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DirWatch.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:57:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: POE-Component-Logger-1.00.tar.gz Message-ID: <21271.1125129471@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-Logger-1.00.tar.gz b36cfad2d2d446103cbcf671270681ff POE-Component-Logger-1.00.tar.gz Size: 2910 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:57:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: perl-POE-Component-Logger.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-Logger.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u SPECS/perl-POE-Component-Logger.spec:1.1 SPECS/perl-POE-Component-Logger.spec:1.2 --- SPECS/perl-POE-Component-Logger.spec:1.1 Wed Aug 24 12:58:32 2005 +++ SPECS/perl-POE-Component-Logger.spec Sat Aug 27 09:57:45 2005 @@ -6,27 +6,33 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-Logger -Summary: perl(POE::Component::Logger) +Summary: POE::Component::Logger - a POE logging class +Summary(pl): POE::Component::Logger - klasa loguj?ca dla POE Name: perl-POE-Component-Logger Version: 1.00 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: b36cfad2d2d446103cbcf671270681ff +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE %if %{with tests} BuildRequires: perl-Log-Dispatch-Config %endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'perl(anything_fake_or_conditional)' - %description -POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config +A highly flexible logger component for POE that uses Log::Dispatch and +Log::Dispatch::Config for ultimate flexibility and power. + +%description -l pl +Bardzo elastyczny komponent loguj?cy dla POE, u?ywaj?cy Log::Dispatch +i Log::Dispatch::Config dla maksymalnej elastyczno?ci i mocy. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +66,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:57:45 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:58:32 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-Logger.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: perl-POE-Component-TSTP.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u SPECS/perl-POE-Component-TSTP.spec:1.1 SPECS/perl-POE-Component-TSTP.spec:1.2 --- SPECS/perl-POE-Component-TSTP.spec:1.1 Wed Aug 24 13:00:47 2005 +++ SPECS/perl-POE-Component-TSTP.spec Sat Aug 27 10:03:06 2005 @@ -6,25 +6,32 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-TSTP -Summary: POE::Component::TSTP - perl module +Summary: POE::Component::TSTP - a POE component to handle Ctrl-Z +Summary(pl): POE::Component::TSTP - komponent POE obs?uguj?cy Ctrl-Z Name: perl-POE-Component-TSTP Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: 0ac0dafa63a99b3e305e073e30bb9f22 +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE component handling SIGTSTP, ctrl-z usually. +POE component handling SIGTSTP, Ctrl-Z usually. By default, POE +applications do not respond to Ctrl-Z due to slightly strange signal +handling semantics. This module fixes that. + +%description -l pl +Komponent POE obs?uguj?cy SIGTSTP, czyli zwykle Ctrl-Z. Domy?lnie +aplikacje POE nie reaguj? na Ctrl-Z ze wzgl?du na nieco dziwn? +semantyk? obs?ugi sygna??w. Ten modu? poprawia to. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -58,6 +65,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:03:06 qboosh +- pl, md5 + Revision 1.1 2005/08/24 11:00:47 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-TSTP.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: POE-Component-TSTP-0.02.tar.gz Message-ID: <28679.1125129791@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-TSTP-0.02.tar.gz 0ac0dafa63a99b3e305e073e30bb9f22 POE-Component-TSTP-0.02.tar.gz Size: 1685 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 10:07:50 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS (DEVEL): hal.spec - prevent docs building with --without docs In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 08:07:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - prevent docs building with --without docs ---- Files affected: SPECS: hal.spec (1.75.2.3 -> 1.75.2.4) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.75.2.3 SPECS/hal.spec:1.75.2.4 --- SPECS/hal.spec:1.75.2.3 Wed Aug 3 19:29:36 2005 +++ SPECS/hal.spec Sat Aug 27 10:07:45 2005 @@ -130,7 +130,9 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ @@ -232,6 +234,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + Revision 1.75.2.3 2005/08/03 17:29:36 wiget - don't duplicate %{_datadir}/%{name}/device-manger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.75.2.3&r2=1.75.2.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:09:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pear-HTML_AJAX.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:09:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: php-pear-HTML_AJAX.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_AJAX.spec diff -u SPECS/php-pear-HTML_AJAX.spec:1.3 SPECS/php-pear-HTML_AJAX.spec:1.4 --- SPECS/php-pear-HTML_AJAX.spec:1.3 Sun Aug 21 19:33:51 2005 +++ SPECS/php-pear-HTML_AJAX.spec Sat Aug 27 10:09:13 2005 @@ -24,15 +24,27 @@ %description Provides PHP and JavaScript libraries for performing AJAX (Communication from JavaScript to your browser without reloading the -page) +page). Offers OO proxies in JavaScript of registered PHP or proxyless -operation Serialization of data sent between PHP and JavaScript is +operation. Serialization of data sent between PHP and JavaScript is provided by a driver model, currently JSON and Null encodings are -provided +provided. In PEAR status of this package is: %{_status}. +%description -l pl +Ta klasa dostarcza biblioteki PHP i JavaScript do przeprowadzania AJAX +(komunikacji z JavaScriptu do przegl?darki bez prze?adowywania +strony). + +Oferuje zorientowane obiektowo proxy w JavaScripcie z zarejestrowanym +PHP lub operacje bez proxy. Serializacja danych przesy?anych pomi?dzy +PHP i JavaScriptem jest zapewniana przez model sterownik?w, aktualnie +dostarczone s? kodowania JSON i Null. + +Ta klasa ma w PEAR status: %{_status}. + %prep %setup -q -c @@ -40,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} -cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/ +cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} cp -a %{_pearname}-%{version}/js $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/AJAX/js %{__sed} -i -e 's#@data-dir@#%{php_pear_dir}#g' -e "s#'HTML_AJAX'#'HTML'.DIRECTORY_SEPARATOR.'AJAX'#g" \ @@ -60,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 08:09:13 qboosh +- pl desc + Revision 1.3 2005/08/21 17:33:51 adamg - updated to 0.1.4 @@ -68,4 +83,3 @@ Revision 1.1 2005/08/18 18:02:15 arekm - initial package - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_AJAX.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:11:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: ERRORS: HTML_Template_IT-1.1.1.tgz Message-ID: <8083.1125130309@distfiles.pld-linux.org> FATAL: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz md5 mismatch, needed 6062a6b0cf6033b206bd62aaeb36c055, got c50e9c31b94d7ee5febdc90ec8653e13 Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: HTML_Template_IT-1.1.1.tgz Message-ID: <10124.1125130404@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz c50e9c31b94d7ee5febdc90ec8653e13 HTML_Template_IT-1.1.1.tgz Size: 18476 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pear-HTML_Template_IT.spec - really updated to 1.1.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:13:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - really updated to 1.1.1 ---- Files affected: SPECS: php-pear-HTML_Template_IT.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_Template_IT.spec diff -u SPECS/php-pear-HTML_Template_IT.spec:1.18 SPECS/php-pear-HTML_Template_IT.spec:1.19 --- SPECS/php-pear-HTML_Template_IT.spec:1.18 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-HTML_Template_IT.spec Sat Aug 27 10:13:15 2005 @@ -13,7 +13,7 @@ License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 6062a6b0cf6033b206bd62aaeb36c055 +# Source0-md5: c50e9c31b94d7ee5febdc90ec8653e13 URL: http://pear.php.net/package/HTML_Template_IT/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -94,8 +94,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/27 08:13:15 qboosh +- really updated to 1.1.1 + Revision 1.18 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[partially updated to 1.1.1] Revision 1.17 2004/12/03 22:12:19 adamg - rebuild with new PEAR provides/requires scripts ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pear-MDB2.spec - unbroken last changelog entry In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unbroken last changelog entry ---- Files affected: SPECS: php-pear-MDB2.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php-pear-MDB2.spec diff -u SPECS/php-pear-MDB2.spec:1.8 SPECS/php-pear-MDB2.spec:1.9 --- SPECS/php-pear-MDB2.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-MDB2.spec Sat Aug 27 10:17:19 2005 @@ -69,8 +69,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 08:17:19 qboosh +- unbroken last changelog entry + Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[updated to 2.0.0beta4] Revision 1.7 2005/03/26 19:06:36 adamg - install missing files (Tools/Manager/*); release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: MDB2-2.0.0beta4.tgz Message-ID: <15292.1125130651@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/MDB2-2.0.0beta4.tgz 95aee608b6c980b5c99ebbf7425c6aa8 MDB2-2.0.0beta4.tgz Size: 166279 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:21:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: rsync-segv.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:21:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: rsync-segv.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: ffmpeg.spec - sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: ffmpeg.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/ffmpeg.spec diff -u SPECS/ffmpeg.spec:1.49 SPECS/ffmpeg.spec:1.50 --- SPECS/ffmpeg.spec:1.49 Thu Aug 11 11:46:18 2005 +++ SPECS/ffmpeg.spec Sat Aug 27 10:22:52 2005 @@ -19,14 +19,16 @@ Patch2: %{name}-gcc4.patch URL: http://ffmpeg.sourceforge.net/ BuildRequires: SDL-devel +BuildRequires: faac-devel BuildRequires: freetype-devel %ifarch ppc # require version with altivec support fixed BuildRequires: gcc >= 5:3.3.2-3 %endif %{?with_imlib2:BuildRequires: imlib2-devel >= 1.1.0-2} +BuildRequires: lame-libs-devel BuildRequires: libtool >= 2:1.4d-3 -BuildRequires: faac-devel +BuildRequires: libvorbis-devel %ifarch %{ix86} %ifnarch i386 i486 BuildRequires: nasm @@ -36,8 +38,6 @@ BuildRequires: tetex BuildRequires: texinfo BuildRequires: zlib-devel -BuildRequires: lame-libs-devel -BuildRequires: libvorbis-devel %{?with_autoreqdep:BuildConflicts: libpostproc} Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -229,6 +229,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/27 08:22:52 qboosh +- sorted BRs + Revision 1.49 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.49&r2=1.50&f=u From qboosh at pld-linux.org Sat Aug 27 10:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: X11-driver-firegl-inter_module_get.patch (REMOVED), X11-d... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:27:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I suppose) ---- Files affected: SOURCES: X11-driver-firegl-inter_module_get.patch (1.1 -> NONE) (REMOVED), X11-driver-firegl-pci_name.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:30:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pear-Services_DynDNS.spec - pl cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:30:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl cosmetic ---- Files affected: SPECS: php-pear-Services_DynDNS.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pear-Services_DynDNS.spec diff -u SPECS/php-pear-Services_DynDNS.spec:1.1 SPECS/php-pear-Services_DynDNS.spec:1.2 --- SPECS/php-pear-Services_DynDNS.spec:1.1 Sun Aug 21 20:05:58 2005 +++ SPECS/php-pear-Services_DynDNS.spec Sat Aug 27 10:30:29 2005 @@ -6,7 +6,7 @@ %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - provides access to the DynDNS web service -Summary(pl): %{_pearname} - dost?p do serwis?w DynDNS +Summary(pl): %{_pearname} - dost?p do us?ugi WWW DynDNS Name: php-pear-%{_pearname} Version: 0.3.1 Release: 1 @@ -57,6 +57,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:30:29 qboosh +- pl cosmetic + Revision 1.1 2005/08/21 18:05:58 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Services_DynDNS.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:31:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: crossfire-client-big_endian.patch (REMOVED), crossfire-cl... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:31:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete (acc. to wiget) ---- Files affected: SOURCES: crossfire-client-big_endian.patch (1.1 -> NONE) (REMOVED), crossfire-client-memleak.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_free.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_darkness.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:34:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: crossfire-client.spec - new-style bcond, strict internal deps In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:34:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new-style bcond, strict internal deps ---- Files affected: SPECS: crossfire-client.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/crossfire-client.spec diff -u SPECS/crossfire-client.spec:1.35 SPECS/crossfire-client.spec:1.36 --- SPECS/crossfire-client.spec:1.35 Sun Aug 21 10:53:26 2005 +++ SPECS/crossfire-client.spec Sat Aug 27 10:34:06 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without images # don't build images package +# %define sndver 1.4.0 %define imgver 1.7.1 Summary: Crossfire client @@ -21,7 +25,7 @@ BuildRequires: autoconf BuildRequires: gtk+-devel BuildRequires: perl-base -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -53,7 +57,7 @@ Summary: Crossfire sounds Summary(pl): D?wi?ki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description sounds Some sound files and the sound server for crossfire. @@ -65,7 +69,7 @@ Summary: GTK+ Crossfire client Summary(pl): Klient Crossfire pod GTK+ Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk GTK+ client to crossfire. @@ -96,7 +100,7 @@ Summary: GTK+2 Crossfire client Summary(pl): Klient Crossfire pod GTK+2 Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk2 GTK+2 client to crossfire. @@ -123,12 +127,11 @@ przedmiot?w i walcz?c z potworami. Mog? gra? w kooperacji lub przeciwko sobie w tym samym "?wiecie". - %package images Summary: Crossfire images Summary(pl): Obrazki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description images Some images extracted from server for Crossfire. @@ -150,7 +153,7 @@ %prep %setup -q -a1 mv -f sounds cfsounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install -d images cd images tar xzf %{SOURCE2} @@ -172,7 +175,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/ -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install images/bmaps.client images/crossfire.base images/crossfire.clsc \ $RPM_BUILD_ROOT%{_datadir}/%{name} %endif @@ -196,7 +199,7 @@ %attr(755,root,root) %{_bindir}/cfsndserv* %{_datadir}/%{name}/sounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} %files images %defattr(644,root,root,755) %{_datadir}/%{name}/bmaps.client @@ -219,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/27 08:34:06 qboosh +- new-style bcond, strict internal deps + Revision 1.35 2005/08/21 08:53:26 wiget - updated to 1.8.0 (images to 1.7.1) - added gtk2 subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossfire-client.spec?r1=1.35&r2=1.36&f=u From qboosh at pld-linux.org Sat Aug 27 10:36:44 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:36:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dbx.spec diff -u SPECS/php-pecl-dbx.spec:1.1 SPECS/php-pecl-dbx.spec:1.2 --- SPECS/php-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php-pecl-dbx.spec Sat Aug 27 10:36:39 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:36:39 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:37:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php4-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:37:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php4-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-dbx.spec diff -u SPECS/php4-pecl-dbx.spec:1.1 SPECS/php4-pecl-dbx.spec:1.2 --- SPECS/php4-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php4-pecl-dbx.spec Sat Aug 27 10:37:22 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:37:22 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: Zope3.spec - pl for python- In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:33:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for python- ---- Files affected: SPECS: Zope3.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.1 SPECS/Zope3.spec:1.2 --- SPECS/Zope3.spec:1.1 Fri Aug 26 10:43:05 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:33:06 2005 @@ -1,5 +1,4 @@ # $Revision$, $Date$ - Summary: An application server and portal toolkit for building Web sites Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW @@ -75,10 +74,9 @@ eles ao inv?s desse RPM. %package -n python-zope -Summary: Python packages developed as part of the Zope 3 project. -Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Summary: Python packages developed as part of the Zope 3 project +Summary(pl): Modu?y Pythona rozwijane w projekcie Zope 3 Group: Development/Tools -Obsoletes: ZopeInterface Provides: ZopeInterface Provides: python-zope-cachedescriptors Provides: python-zope-component @@ -104,15 +102,25 @@ Provides: python-zope-tales Provides: python-zope-testing Provides: python-zope-thread +Obsoletes: ZopeInterface %description -n python-zope -The "zope" package is a pure namespace package holding packages developed as -part of the Zope 3 project. +The "zope" package is a pure namespace package holding packages +developed as part of the Zope 3 project. -Generally, the immediate subpackages of the "zope" package should be useful and -usable outside of the Zope application server. Subpackages of the "zope" -package should have minimal interdependencies, although most depend on -"zope.interface". +Generally, the immediate subpackages of the "zope" package should be +useful and usable outside of the Zope application server. Subpackages +of the "zope" package should have minimal interdependencies, although +most depend on "zope.interface". + +%description -n python-zope -l pl +Pakiet "zope" to pakiet czystej przestrzeni nazw przechowuj?cej +pakiety tworzone jako cz??? projektu Zope 3. + +Og?lnie bezpo?rednie podpakiety pakietu "zope" powinny by? przydatne i +u?ywalne poza serwerem aplikacji Zope. Podpakiety pakietu "zope" +powinny mie? minimalne zale?no?ci wzajemne, chocia? wi?kszo?? zale?y +od "zope.interface". %prep %setup -q -n Zope-%{version}%{sub_ver} @@ -250,6 +258,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:33:06 qboosh +- pl for python- + Revision 1.1 2005/08/26 08:43:05 jajcus - new, based on Zope.spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <20149.1125135207@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:35:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS (DEVEL): ingo.spec - updated to 2005-08-26 snap (many change... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:35:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-26 snap (many changes were made) - release 1 ---- Files affected: SPECS: ingo.spec (1.6 -> 1.6.4.1) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6 SPECS/ingo.spec:1.6.4.1 --- SPECS/ingo.spec:1.6 Thu Jul 21 00:07:56 2005 +++ SPECS/ingo.spec Sat Aug 27 11:35:39 2005 @@ -1,14 +1,18 @@ # $Revision$, $Date$ + +%define _snap 2005-08-26 +%define _rel 1 +# %include /usr/lib/rpm/macros.php Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo Version: 1.0.1 -Release: 1.1 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW -Source0: http://ftp.horde.org/pub/ingo/%{name}-h3-%{version}.tar.gz -# Source0-md5: 7fce229d752e5b981621e215e4fc56e8 +Source0: ftp://ftp.horde.org/pub/snaps/2005-08-26/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 32dd41dafa8b2dd0968fb6ba1e139c0a Source1: %{name}.conf Patch0: %{name}-path.patch URL: http://www.horde.org/ingo/ @@ -55,7 +59,7 @@ . %prep -%setup -q -n %{name}-h3-%{version} +%setup -q -n %{name} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -133,6 +137,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.1 2005/08/27 09:35:39 paszczus +- updated to 2005-08-26 snap (many changes were made) +- release 1 + Revision 1.6 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6&r2=1.6.4.1&f=u From paszczus at pld-linux.org Sat Aug 27 11:36:20 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: ingo-HEAD-2005-08-26.tar.gz Message-ID: <23684.1125135380@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/ingo-HEAD-2005-08-26.tar.gz 32dd41dafa8b2dd0968fb6ba1e139c0a ingo-HEAD-2005-08-26.tar.gz Size: 838918 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:39:52 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS (DEVEL): ingo.spec - it is a snap of 1.1 version In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:39:52 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - it is a snap of 1.1 version ---- Files affected: SPECS: ingo.spec (1.6.4.1 -> 1.6.4.2) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6.4.1 SPECS/ingo.spec:1.6.4.2 --- SPECS/ingo.spec:1.6.4.1 Sat Aug 27 11:35:39 2005 +++ SPECS/ingo.spec Sat Aug 27 11:39:47 2005 @@ -7,7 +7,7 @@ Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo -Version: 1.0.1 +Version: 1.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.2 2005/08/27 09:39:47 paszczus +- it is a snap of 1.1 version + Revision 1.6.4.1 2005/08/27 09:35:39 paszczus - updated to 2005-08-26 snap (many changes were made) - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6.4.1&r2=1.6.4.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: aee.spec - pl desc, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:46:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc, md5 ---- Files affected: SPECS: aee.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u SPECS/aee.spec:1.1 SPECS/aee.spec:1.2 --- SPECS/aee.spec:1.1 Sat Aug 27 03:10:45 2005 +++ SPECS/aee.spec Sat Aug 27 11:46:47 2005 @@ -6,19 +6,29 @@ Release: 1 License: Artistic Group: Applications/Editors -URL: http://mahon.cwx.net/ Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +# Source0-md5: f8c3a4196f1bfd46beb6b76d73ecb7a2 Patch0: %{name}-conf.patch +URL: http://mahon.cwx.net/ BuildRequires: XFree86-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description An easy to use text editor. Intended to be usable with little or no instruction. Provides both a terminal (curses based) interface and -native X-Windows interface (in which case the executable is called -xae). Features include pop-up menus, journalling (to recover from -system crash or loss of connection), cut-and-paste, multiple buffers -(associated with files or not), and much more. +native X Window System interface (in which case the executable is +called xae). Features include pop-up menus, journalling (to recover +from system crash or loss of connection), cut-and-paste, multiple +buffers (associated with files or not), and much more. + +%description -l pl +?atwy w u?yciu edytor tekstu. Ma by? u?ywalny z niewielk? albo i bez +?adnej instrukcji. Ma zar?wno interfejs terminalowy (oparty na +curses), jak i natywny interfejs X Window System (w tym wypadku +binarka nazywa si? xae). Mo?liwo?ci obejmuj? wyskakuj?ce menu, +kronik? (do odtwarzania danych po padzie systemu lub utracie +po??czenia), wytnij-i-wklej, wiele bufor?w (powi?zanych z plikami lub +nie) i wiele wi?cej. %prep %setup -q @@ -54,6 +64,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:46:47 qboosh +- pl desc, md5 + Revision 1.1 2005/08/27 01:10:45 undefine - initital pld version, partialy based on mdk spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aee.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: aee-2.2.15b.tar.gz Message-ID: <7234.1125136019@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mahon.cwx.net/sources/aee-2.2.15b.tar.gz f8c3a4196f1bfd46beb6b76d73ecb7a2 aee-2.2.15b.tar.gz Size: 184218 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:51:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: egroupware.spec - pl for new subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new subpackages ---- Files affected: SPECS: egroupware.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.8 SPECS/egroupware.spec:1.9 --- SPECS/egroupware.spec:1.8 Thu Aug 25 18:21:09 2005 +++ SPECS/egroupware.spec Sat Aug 27 11:51:01 2005 @@ -16,9 +16,9 @@ URL: http://www.egroupware.org/ Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-pcre Requires: php-gd Requires: php-mbstring +Requires: php-pcre BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,31 +40,47 @@ %package db-mysql Summary: eGroupware DB Driver for MySQL +Summary(pl): Sterownik bazy danych eGroupware dla MySQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mysql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mysql This virtual package provides MySQL database backend for eGroupware. +%description db-mysql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla +eGroupware. + %package db-pgsql Summary: eGroupware DB Driver for PostgreSQL +Summary(pl): Sterownik bazy danych eGroupware dla PostgreSQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-pgsql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-pgsql -This virtual package provides PostgreSQL database backend for eGroupware. +This virtual package provides PostgreSQL database backend for +eGroupware. + +%description db-pgsql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych PostgreSQL dla +eGroupware. %package db-mssql Summary: eGroupware DB Driver for MS SQL +Summary(pl): Sterownik bazy danych eGroupware dla MS SQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mssql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mssql This virtual package provides MS SQL database backend for eGroupware. +%description db-mssql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MS SQL dla +eGroupware. + %prep %setup -q -n %{name} @@ -178,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 09:51:01 qboosh +- pl for new subpackages + Revision 1.8 2005/08/25 16:21:09 glen - created virtual DB packages to let user choose just one database ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: Zope3.spec - fixed md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: Zope3.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.2 SPECS/Zope3.spec:1.3 --- SPECS/Zope3.spec:1.2 Sat Aug 27 11:33:06 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:51:39 2005 @@ -10,7 +10,7 @@ License: Zope Public License (ZPL) Group: Networking/Daemons Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz -# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +# Source0-md5: e22eeeae5de89c0eea9edabe3f2c3c4d Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -258,6 +258,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 09:51:39 qboosh +- fixed md5 + Revision 1.2 2005/08/27 09:33:06 qboosh - pl for python- ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: Zope3-3.1.0c1.tgz Message-ID: <14186.1125136318@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz e22eeeae5de89c0eea9edabe3f2c3c4d Zope3-3.1.0c1.tgz Size: 3987090 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:52:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: subversion-SWIGEXPORT.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:52:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: subversion-SWIGEXPORT.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:55:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: initng-PLD.patch (REMOVED) - outdated (I assume) In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:55:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I assume) ---- Files affected: SOURCES: initng-PLD.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:57:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: jude.spec - pl fix, unified preamble In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:57:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix, unified preamble ---- Files affected: SPECS: jude.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.6 SPECS/jude.spec:1.7 --- SPECS/jude.spec:1.6 Thu Aug 25 11:58:52 2005 +++ SPECS/jude.spec Sat Aug 27 11:57:41 2005 @@ -10,10 +10,10 @@ Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop Source2: %{name}-icon.png +NoSource: 0 URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch -NoSource: 0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -21,8 +21,8 @@ designing in JavaTM and UML1.4 (Unified Modeling Language). %description -l pl -Jude jest nowym narz?dziem obs?uguj?cym obiektowo-zorientowane -przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany +Jude jest nowym narz?dziem obs?uguj?cym zorientowane obiektowo +przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany j?zyk modelowania). %prep @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/27 09:57:41 qboosh +- pl fix, unified preamble + Revision 1.6 2005/08/25 09:58:52 heretyk - up to 1.6.2 - icon added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sat Aug 27 12:01:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: librsvg.spec - unified In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:01:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified ---- Files affected: SPECS: librsvg.spec (1.85 -> 1.86) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.85 SPECS/librsvg.spec:1.86 --- SPECS/librsvg.spec:1.85 Sat Aug 27 04:04:54 2005 +++ SPECS/librsvg.spec Sat Aug 27 12:01:34 2005 @@ -122,7 +122,7 @@ Bibliotecas est?ticas para o desenvolvimento de aplica??es com librsvg. -%package -n mozilla-plugin-rsvg +%package -n mozilla-plugin-rsvg Summary: Mozilla SVG plugin using librsvg Summary(pl): Wtyczka Mozilli do SVG wykorzystuj?ca librsvg Group: X11/Applications/Multimedia @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86 2005/08/27 10:01:34 qboosh +- unified + Revision 1.85 2005/08/27 02:04:54 aredridel - up to 2.11.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.85&r2=1.86&f=u From qboosh at pld-linux.org Sat Aug 27 12:04:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:04:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u SPECS/openldap-schema-mozillaorgperson.spec:1.1 SPECS/openldap-schema-mozillaorgperson.spec:1.2 --- SPECS/openldap-schema-mozillaorgperson.spec:1.1 Fri Aug 26 01:05:07 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Sat Aug 27 12:04:13 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Mozilla LDAP schema +Summary(pl): Schemat LDAP dla Mozilli Name: openldap-schema-mozillaorgperson Version: 0.6.3 Release: 0.2 @@ -19,6 +20,10 @@ This package contains LDAPv3 schema for use with the Mozilla Address Book. +%description -l pl +Ten pakiet zawiera schemat LDAPv3 do u?ywania z ksi??k? adresow? +Mozilli. + %prep %setup -q -c -T cp %{SOURCE0} . @@ -77,6 +82,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:04:13 qboosh +- pl + Revision 1.1 2005/08/25 23:05:07 glen - created - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap-schema-mozillaorgperson.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pecl-cpdf.spec - cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:08:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetic ---- Files affected: SPECS: php-pecl-cpdf.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u SPECS/php-pecl-cpdf.spec:1.1 SPECS/php-pecl-cpdf.spec:1.2 --- SPECS/php-pecl-cpdf.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-cpdf.spec Sat Aug 27 12:08:06 2005 @@ -3,7 +3,7 @@ %define _status stable Summary: %{_modname} - extension module for PHP -Summary(pl): %{_modname} - modu? dla php +Summary(pl): %{_modname} - modu? dla PHP Name: php-pecl-%{_modname} Version: 2.0.0 Release: 1 @@ -69,6 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:08:06 qboosh +- cosmetic + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-cpdf.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <4478.1125137290@distfiles.pld-linux.org> wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <8692.1125137465@distfiles.pld-linux.org> wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: php-pecl-dio.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:11:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: php-pecl-dio.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dio.spec diff -u SPECS/php-pecl-dio.spec:1.1 SPECS/php-pecl-dio.spec:1.2 --- SPECS/php-pecl-dio.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-dio.spec Sat Aug 27 12:11:01 2005 @@ -3,6 +3,7 @@ %define _status stable Summary: %{_modname} - Direct I/O functions +Summary(pl): %{_modname} - funkcje bezpo?redniego we/wy Name: php-pecl-%{_modname} Version: not-yet Release: 1 @@ -21,7 +22,7 @@ %define extensionsdir %{_libdir}/php %description -PHP supports the direct io functions as described in the Posix +PHP supports the direct I/O functions as described in the Posix Standard (Section 6) for performing I/O functions at a lower level than the C-Language stream I/O functions (fopen(), fread(),..). The use of the DIO functions should be considered only when direct control @@ -30,6 +31,17 @@ In PECL status of this extension is: %{_status}. +%description -l pl +PHP obs?uguje funkcje bezpo?redniego we/wy wg opisu w standardzie +POSIX (sekcji 6) do wykonywania operacji we/wy na poziomie ni?szym ni? +funkcje strumieni we/wy w j?zyku C (fopen(), fread()...). U?ycie +funkcji DIO powinno by? rozwa?ane tylko je?li potrzebna jest +bezpo?rednia kontrola nad urz?dzeniem. We wszystkich innych +przypadkach odpowiedniejsze s? standardowe funkcje operacji na +systemie plik?w. + +To rozszerzenie ma w PECL status: %{_status}. + %prep %setup -q -c @@ -66,6 +78,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:11:01 qboosh +- pl + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dio.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:19:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: ruby-open4.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:19:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ruby-open4.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u SPECS/ruby-open4.spec:1.1 SPECS/ruby-open4.spec:1.2 --- SPECS/ruby-open4.spec:1.1 Thu Aug 25 21:24:44 2005 +++ SPECS/ruby-open4.spec Sat Aug 27 12:18:59 2005 @@ -3,6 +3,7 @@ %define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') %define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') Summary: Ruby open3 with exit reporting +Summary(pl): open3 w Rubym z raportowaniem wyj?cia Name: ruby-open4 Version: 0.1.0 Release: 1 @@ -20,6 +21,9 @@ %description Ruby open3 with exit reporting. +%description -l pl +open3 w Rubym z raportowaniem wyj?cia. + %prep %setup -q -n open4-%{version} @@ -56,6 +60,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:18:59 qboosh +- pl + Revision 1.1 2005/08/25 19:24:44 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ruby-open4.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sat Aug 27 12:28:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:24 2005 Subject: PLD-doc: BuildRequires.txt - elaborate %service macros versions In-Reply-To: References: Message-ID: Author: glen Date: Sat Aug 27 10:28:51 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - elaborate %service macros versions ---- Files affected: PLD-doc: BuildRequires.txt (1.40 -> 1.41) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.40 PLD-doc/BuildRequires.txt:1.41 --- PLD-doc/BuildRequires.txt:1.40 Tue Aug 23 20:33:10 2005 +++ PLD-doc/BuildRequires.txt Sat Aug 27 12:28:46 2005 @@ -110,7 +110,10 @@ Requires(postun): /usr/sbin/groupdel # %service +# basic %service support BuildRequires: rpmbuild(macros) >= 1.228 +# %service which is one command in shell context ([ "$condition" ] || %service) +BuildRequires: rpmbuild(macros) >= 1.230 Requires(post,preun): rc-scripts # /sbin/chkconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.40&r2=1.41&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: xorg-lib-xtrans.spec - merged descs from libXtrans.spec, Ob... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from libXtrans.spec, Obsoletes: libXtrans* ---- Files affected: SPECS: xorg-lib-xtrans.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.1 SPECS/xorg-lib-xtrans.spec:1.2 --- SPECS/xorg-lib-xtrans.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 12:38:00 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # $Rev: 3233 $, $Date$ # -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Name: xorg-lib-xtrans Version: 0.99.0 Release: 0.04 @@ -20,24 +20,29 @@ %define _prefix /usr/X11R6 %description -xtrans library. +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description -l pl -Biblioteka xtrans. - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %package devel -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Group: X11/Development/Libraries Requires: xorg-proto-xproto-devel +Obsoletes: libXtrans-devel %description devel -xtrans library +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description devel -l pl -Biblioteka xtrans - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %prep %setup -q -n xtrans-%{version} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:38:00 qboosh +- merged descs from libXtrans.spec, Obsoletes: libXtrans* + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:53 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: libXtrans.spec (REMOVED) - obsoleted by xorg-lib-xtrans In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - obsoleted by xorg-lib-xtrans ---- Files affected: SPECS: libXtrans.spec (1.7 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 12:40:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:24 2005 Subject: PLD-doc: PLD-update-TODO - updated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:40:31 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - updated ---- Files affected: PLD-doc: PLD-update-TODO (1.248 -> 1.249) ---- Diffs: ================================================================ Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.248 PLD-doc/PLD-update-TODO:1.249 --- PLD-doc/PLD-update-TODO:1.248 Wed Aug 17 19:20:22 2005 +++ PLD-doc/PLD-update-TODO Sat Aug 27 12:40:26 2005 @@ -2,23 +2,24 @@ AfterStep(12) [OLD] 2.00.02 [NEW] 2.1.2 AutoIndex(11) [OLD] 2.1.1 [NEW] 2.1.2 Azureus(9) [OLD] 2.1.0.4 [NEW] 2.3.0.4 -DenyHosts(9) [OLD] 0.9.8 [NEW] 0.9.9 -EasyBMP(10) [OLD] 0.63 [NEW] 0.65 -EasyBMP(12) [OLD] 0.63 [NEW] 0.64 +BitTorrent(9) [OLD] 4.1.3 [NEW] 4.1.4 +DenyHosts(9) [OLD] 0.9.8 [NEW] 1.0.2 +EasyBMP(10) [OLD] 0.65 [NEW] 0.66 GNUnet(13) [OLD] 0.6.5 [NEW] 0.6.6 GWorkspace(9) [OLD] 0.6.5 [NEW] 0.7.1 Gauche(9) [OLD] 0.5.5 [NEW] 0.8.5 -GeoIP(9) [OLD] 1.3.12 [NEW] 1.3.13 IRRToolSet(13) [OLD] 4.7.3 [NEW] 4.8.2 ISMail(9) [OLD] 1.7.3 [NEW] 1.7.4 Isearch(9) [OLD] 1.47b [NEW] 1.47i +LabPlot(9) [OLD] 1.4.1 [NEW] 1.5.0.1 MayaVi(9) [OLD] 1.3 [NEW] 1.4 -Mesa(14) [OLD] 6.2.1 [NEW] 6.3 -Mesa(16) [OLD] 6.2.1 [NEW] 6.3 +Mesa(14) [OLD] 6.2.1 [NEW] 6.3.2 +Mesa(16) [OLD] 6.2.1 [NEW] 6.3.2 Narval-pda(11) [OLD] 20011016 [NEW] 20020927 STLport(10) [OLD] 4.6.2 [NEW] 5.0RC2 -TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.6 -TkDVD(9) [OLD] 3.6 [NEW] 3.7 +Slune(9) [OLD] 1.0.8 [NEW] 1.0.9 +TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.7 +TkDVD(9) [OLD] 3.6 [NEW] 3.8 Zope(20) [OLD] 2.7.7 [NEW] 2.8.1 Zope-CMF(14) [OLD] 1.4.7 [NEW] 1.5.3 Zope-LocalFS(11) [OLD] 1.6 [NEW] 1.7rc1 @@ -27,53 +28,63 @@ Zope-ZAAPlugins(10) [OLD] 2.3 [NEW] 2.21 Zope-ZAttachmentAttribute(10) [OLD] 2.3 [NEW] 2.21 ZopeInterface(9) [OLD] 3.0.1 [NEW] 3.1.0b1 -abcde(9) [OLD] 2.2.6 [NEW] 2.3.0 +abcde(9) [OLD] 2.2.6 [NEW] 2.3.2 aboot(10) [OLD] 0.9b [NEW] 1.0_pre20040408 adm8211(18) [OLD] 20050323 [NEW] 20050620 aegis(9) [OLD] 4.16 [NEW] 4.20 -alien(10) [OLD] 8.53 [NEW] 8.56 alleyoop(9) [OLD] 0.8.2 [NEW] 0.9.0 alltray(9) [OLD] 0.51 [NEW] 0.60 -alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b +alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b [1.0.10rc1] +alsa-lib(17) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-oss(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-tools(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-utils(13) [OLD] 1.0.9a [NEW] 1.0.10rc1 am-utils(12) [OLD] 6.0.10 [NEW] 6.1.1 amaya(9) [OLD] 8.6 [NEW] 9.2.1 -anjuta(12) [OLD] 1.2.3 [NEW] 2.0.1 +anjuta(12) [OLD] 1.2.4 [NEW] 2.0.1 antinat(9) [OLD] 0.71 [NEW] 0.90 antlr(17) [OLD] 2.7.5 [NEW] 3.0ea5 +aoetools(14) [OLD] 5 [NEW] 6 apache-mod_bt(11) [OLD] 0.0.4 [NEW] 0.0.13 apache-mod_caml(11) [OLD] 1.3.4 [NEW] 1.3.6 apache-mod_epp(16) [OLD] 1.1 [NEW] 1.2 apache-mod_perl(31) [OLD] 2.0.0 [NEW] 2.0.1 -apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.6 -apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.7 +apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apache-mod_transform(11) [OLD] 0.4.0 [NEW] 0.6.0 +apache-mod_vhs(11) [OLD] 1.0.16 [NEW] 1.0.18 apache1-mod_chroot(11) [OLD] 0.4 [NEW] 0.5 apache1-mod_mp3(13) [OLD] 0.40 [NEW] 1.2 -apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apcupsd(14) [OLD] 3.10.17 [NEW] 3.10.18 +apr(10) [OLD] 1.1.1 [NEW] 1.2.1 +apr-util(14) [OLD] 1.1.2 [NEW] 1.2.1 aptitude(14) [OLD] 0.2.11.1 [NEW] 0.3.3 aqsis(9) [OLD] 1.0.0 [NEW] 1.1.0.30062005 asa(14) [OLD] 0.1.6 [NEW] 0.1.7 aspell(12) [OLD] 0.60.2 [NEW] 0.60.3 aspell-he(11) [OLD] 0.8 [NEW] 0.9 -aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050815 +aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050824 asterisk-addons(10) [OLD] 1.0.7 [NEW] 1.0.9 +atlas(14) [OLD] 3.7.10 [NEW] 3.7.11 atmelwlandriver(22) [OLD] 3.4.1.0 [NEW] 3.4.1.1 atop(9) [OLD] 1.13 [NEW] 1.14 -audit(9) [OLD] 0.9.7 [NEW] 1.0.2 +audit(9) [OLD] 0.9.7 [NEW] 1.0.3 autodns(12) [OLD] 0.0.6 [NEW] 0.0.8 autofs(15) [OLD] 4.1.3 [NEW] 4.1.4 ayam(10) [OLD] 1.8.2 [NEW] 1.8.3 -bacula(15) [OLD] 1.36.3 [NEW] 1.37.30 +bacula(15) [OLD] 1.36.3 [NEW] 1.37.36 bacula(19) [OLD] 1.36.3 [NEW] 1.37.18 batik(9) [OLD] 1.5.1 [NEW] 1.6 bbkeys(9) [OLD] 0.8.6 [NEW] 0.9.0 +bglibs(9) [OLD] 1.024 [NEW] 1.027 bigloo(9) [OLD] 2.6b [NEW] 2.6f bigsister(19) [OLD] 0.99b2 [NEW] 0.99c3 bincimap(9) [OLD] 1.2.12final [NEW] 1.2.13final bitbake(9) [OLD] 1.2 [NEW] 1.2.1 bless(9) [OLD] 0.3.1 [NEW] 0.3.6 -bogofilter(10) [OLD] 0.94.14 [NEW] 0.95.2 +bluefish(17) [OLD] 1.0.2 [NEW] 1.0.3 +bogofilter(10) [OLD] 0.95.2 [NEW] 0.96.0 boost-jam(9) [OLD] 3.1.10 [NEW] 3.1.11 bootsplash(13) [OLD] 3.1 [NEW] 3.2 brltty(10) [OLD] 3.6.1 [NEW] 3.6.2 @@ -81,11 +92,12 @@ bsdmake(9) [OLD] 11 [NEW] 16 bttv(20) [OLD] 0.7.87 [NEW] 0.9.15 bugzilla(16) [OLD] 2.18 [NEW] 2.20 +busybox(41) [OLD] 1.00 [NEW] 1.01 bygfoot(9) [OLD] 1.8.1 [NEW] 1.9.0 cacti(14) [OLD] 0.8.6c [NEW] 0.8.6f castle-combat(9) [OLD] 0.7.4 [NEW] 0.8.0a2 cbb(10) [OLD] 0.8.1 [NEW] 0.9.5b -ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.9 +ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.10 cdl3(9) [OLD] 1.2.3 [NEW] 1.2.6 cdrdao(14) [OLD] 1.1.9 [NEW] 1.2.0 cfl(9) [OLD] 0.8.0 [NEW] 1.0 @@ -96,39 +108,46 @@ cheops-ng(9) [OLD] 0.1.12 [NEW] 0.2.2 cinelerra(11) [OLD] 1.2.1 [NEW] 1.2.2 cjc(15) [OLD] 0.5.s20050709 [NEW] 0.5.s20050724 -clamsmtp(9) [OLD] 1.4.1 [NEW] 1.5 clanbomber(9) [OLD] 1.02a [NEW] 1.05 classpath(14) [OLD] 0.16 [NEW] 0.17 clearsilver(9) [OLD] 0.9.14 [NEW] 0.10.1 click-packages(9) [OLD] 1.4 [NEW] 1.4.2 clip(28) [OLD] 1.1.13 [NEW] 1.1.14 -clusterit(9) [OLD] 2.3 [NEW] 2.3.1 -conary(9) [OLD] 0.61.6 [NEW] 0.61.7 courier-imap(9) [OLD] 4.0.3 [NEW] 4.0.4 cpqarrayd(9) [OLD] 2.0 [NEW] 2.2 -crafty(9) [OLD] 19.5 [NEW] 19.19 +crafty(9) [OLD] 19.5 [NEW] 19.20 cronosII(9) [OLD] 0.2.2.23 [NEW] 0.3.0pre9 +crossalpha-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossarm-binutils(17) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossarm-newlib(9) [OLD] 1.12.0 [NEW] 1.13.0 -crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.2 +crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.3 crossavr-gcc(14) [OLD] 3.4.2 [NEW] 4.0.1 crossavr-gdb(18) [OLD] 6.2.1 [NEW] 6.3 -crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 crossdjgpp-gcc(14) [OLD] 3.3.2 [NEW] 4.0.1 crossdjgpp-pdcurses(10) [OLD] 24 [NEW] 26 crossfire(9) [OLD] 1.6.0 [NEW] 1.8.0.maps -crossfire-client(11) [OLD] 1.7.0 [NEW] 1.8.0 -crossfire-client(15) [OLD] 1.7.0 [NEW] 1.7.1 -crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 +crossmingw32-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossmingw32-gcc(26) [OLD] 3.4.3 [NEW] 4.0.1 -crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.2 +crossmingw32-lua40(10) [OLD] 4.0.1 [NEW] 5.0.2 +crossmingw32-pcre(10) [OLD] 6.2 [NEW] 6.3 +crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.3 crossmipsel-egcs(11) [OLD] 1.0.2 [NEW] 1.1.2 crossmipsel-gcc(14) [OLD] 3.3.5 [NEW] 4.0.1 +crossppc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossppc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosss390x-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossx8664-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 ctwm(9) [OLD] 3.6 [NEW] 3.7 cyclone(11) [OLD] 0.5 [NEW] 0.8 cyclone(9) [OLD] 0.5 [NEW] 0.8.1 dansguardian(10) [OLD] 2.8.0.4 [NEW] 2.8.0.6 darcs(9) [OLD] 1.0.3 [NEW] 1.0.4pre2 darkice(9) [OLD] 0.14 [NEW] 0.15 +dbus(29) [OLD] 0.36 [NEW] 0.36.1 dcc-dccd(9) [OLD] 1.2.50 [NEW] 1.3.15 debiandoc-sgml(10) [OLD] 1.1.86 [NEW] 1.1.88 debootstrap(12) [OLD] 0.2.45 [NEW] 0.3.1.5 @@ -137,7 +156,7 @@ di(9) [OLD] 3.11 [NEW] 4.1 dibbler(11) [OLD] 0.4.0 [NEW] 0.4.1 dibbler(9) [OLD] 0.4.0 [NEW] 0.4.1 -digikamimageplugins(9) [OLD] 0.7.2 [NEW] 0.7.3 +dirac(9) [OLD] 0.5.2 [NEW] 0.5.3 directory_administrator(11) [OLD] 1.6.0 [NEW] 1.7.1 dnprogs(18) [OLD] 2.23 [NEW] 2.29 doc++(14) [OLD] 3.4.9 [NEW] 3.4.10 @@ -146,17 +165,19 @@ doom3(22) [OLD] 1.1.1286 [NEW] 1.3.1302 dopewars(18) [OLD] 1.5.9 [NEW] 1.5.10 dotproject(14) [OLD] 1.0.1 [NEW] 2.0.1 -dpkg(9) [OLD] 1.10.23 [NEW] 1.13.10 +dovecot(16) [OLD] 0.99.14 [NEW] 1.0.alpha1 +dpkg(9) [OLD] 1.10.23 [NEW] 1.13.11 drgeo(9) [OLD] 1.0.0 [NEW] 1.1.0 drivel(9) [OLD] 2.0.1 [NEW] 2.0.2 dspam(52) [OLD] 3.4.9 [NEW] 3.6.beta.1 -dumb(9) [OLD] 0.9.2 [NEW] 0.9.3 dvdisaster(12) [OLD] 0.62 [NEW] 0.63 dx(12) [OLD] 4.3.2 [NEW] 4.3.3 e-uae(9) [OLD] 0.8.27 [NEW] 0.8.28 eboard(9) [OLD] 0.9.0 [NEW] 0.9.5 +ecasound(16) [OLD] 2.4.2 [NEW] 2.4.3 eclipse-plugin-TeXlipse(9) [OLD] 1.0.2 [NEW] 1.0.4 elektra(10) [OLD] 0.4.6 [NEW] 0.5.0.4 +elm(16) [OLD] 2.5.7 [NEW] 2.5.8 emacs-erc(9) [OLD] 4.0 [NEW] 5.0.4 emacs-ess(9) [OLD] 5.2.6 [NEW] 5.2.8 emacs-mew-pkg(10) [OLD] 3.3 [NEW] 4.2 @@ -166,17 +187,20 @@ epic4(10) [OLD] 1.2.9 [NEW] 2.1.3 epiphany(13) [OLD] 1.6.4 [NEW] 1.6.5 epiphany-extensions(12) [OLD] 1.6.4 [NEW] 1.6.5 -etherape(10) [OLD] 0.9.0 [NEW] 0.9.2 +etherape(10) [OLD] 0.9.0 [NEW] 0.9.3 etherboot(10) [OLD] 5.3.7 [NEW] 5.4.0 everybuddy(10) [OLD] 0.2.1beta6 [NEW] 0.4.3 [DEAD URL] evms(9) [OLD] 2.3.4 [NEW] 2.5.3 +evolution-exchange(16) [OLD] 2.3.7 [NEW] 2.3.8 exifprobe(9) [OLD] 1.2.6 [NEW] 2.0.1 exim-lite(11) [OLD] 4.51 [NEW] 4.52 expect(15) [OLD] 5.42.1 [NEW] 5.43.0 extace(9) [OLD] 1.5.0 [NEW] 1.9.3 -fax4CUPS(9) [OLD] 1.24 [NEW] 1.25 +fakeroot(10) [OLD] 1.4.2 [NEW] 1.4.3 +fax4CUPS(9) [OLD] 1.24 [NEW] 1.26 feh(9) [OLD] 1.3.2 [NEW] 1.3.4 fftrader(9) [OLD] 0.65 [NEW] 0.66 +file(35) [OLD] 4.14 [NEW] 4.15 flow-tools(9) [OLD] 0.67 [NEW] 0.68 fluxconf(14) [OLD] 0.9.7 [NEW] 0.9.8 fmio(9) [OLD] 1.2.29 [NEW] 2.0.8 @@ -185,24 +209,24 @@ foomatic-db(10) [OLD] 20050405 [NEW] 20050721 foomatic-db-engine(11) [OLD] 3.0.1 [NEW] 3.0.2 forgate(10) [OLD] 0.9 [NEW] 0.9b -fox(9) [OLD] 1.4.16 [NEW] [1.5.6 DEVEL] +fox(9) [OLD] 1.4.17 [NEW] [1.5.7 DEVEL] freenx(9) [OLD] 0.4.0 [NEW] 0.4.2 freeradius(15) [OLD] 1.0.2 [NEW] 1.0.4 freeswan(19) [OLD] 2.04 [NEW] 2.06 fspclient(10) [OLD] 0.90.0 [NEW] 0.91.0 fsplib(13) [OLD] 0.6 [NEW] 0.7 -fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.13 +fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.14 gDesklets(9) [OLD] 0.35 [NEW] 0.35.2 gai(16) [OLD] 0.5.8 [NEW] 0.5.10 gallery(16) [OLD] 1.4.4 [NEW] 1.5 gaphor(9) [OLD] 0.7.0 [NEW] 0.7.0.1 -gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.5 +gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.6 gcl(14) [OLD] 2.6.6 [NEW] 2.6.7 gcx(9) [OLD] 0.8.8 [NEW] 0.9.2 gdal(13) [OLD] 1.2.6 [NEW] 1.3.0 geneweb(18) [OLD] 4.09 [NEW] 4.10 genius(9) [OLD] 0.7.2 [NEW] 0.7.4 -gg2(20) [OLD] 2.2.6 [NEW] 2.2.7 +geos(9) [OLD] 2.1.3 [NEW] 2.1.4 ghemical(14) [OLD] 1.01 [NEW] 1.90 ghostpcl(9) [OLD] 1.38p1 [NEW] 1.41 giFT-gnutella(12) [OLD] 0.0.9.2 [NEW] 0.0.10.1 @@ -210,15 +234,17 @@ giFToxic(9) [OLD] 0.0.9 [NEW] 0.0.10 gkrellm-bgchg(9) [OLD] 0.1.4 [NEW] 0.1.5 gkrellm-pmu(9) [OLD] 2.3 [NEW] 2.4 -gksu(10) [OLD] 1.2.2 [NEW] 1.3.3 +gksu(10) [OLD] 1.2.2 [NEW] 1.3.4 glchess(9) [OLD] 0.4.7 [NEW] 0.8.6 gliv(10) [OLD] 1.9.2 [NEW] 1.9.3 global(14) [OLD] 4.7 [NEW] 4.8.6 +gmime(13) [OLD] 2.1.15 [NEW] 2.1.16 gnocatan(9) [OLD] 0.8.1.43 [NEW] 0.8.1.59, pioneers-0.9.19 gnofract4d(9) [OLD] 2.7 [NEW] 2.9 gnomad2(10) [OLD] 2.6.3 [NEW] 2.8.0 gnome-applet-bubblemon(9) [OLD] 1.2.6 [NEW] 1.2.9 -gnome-applet-netspeed(10) [OLD] 0.12.1 [NEW] 0.13 +gnome-applet-quick-lounge(9) [OLD] 2.10.0 [NEW] 2.10.1 +gnome-applet-timer(12) [OLD] 1.0 [NEW] 1.1.1 gnome-btdownload(9) [OLD] 0.0.20 [NEW] 0.0.22 gnome-chemistry-utils(13) [OLD] 0.2.5 [NEW] 0.5.0 gnome-crystal(9) [OLD] 0.6.1 [NEW] 0.6.5 @@ -227,12 +253,11 @@ gnome-mag(9) [OLD] 0.12.0 [NEW] 0.12.1 gnome-mud(9) [OLD] 0.10.5 [NEW] 0.10.7 gnome-network(13) [OLD] 1.99.2 [NEW] 1.99.5 -gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0.1 +gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0-1 gnome-telnet(9) [OLD] 2.4 [NEW] 2.5 [DEAD URL] gnome-themes(9) [OLD] 2.10.1 [NEW] 2.10.2 gnomemm(9) [OLD] 1.2.2 [NEW] 1.2.4 gnu.getopt(9) [OLD] 1.0.9 [NEW] 1.0.11 -gnubiff(13) [OLD] 2.1.3 [NEW] 2.1.4 gnue-appserver(10) [OLD] 0.4.1 [NEW] 0.4.2 gnue-common(9) [OLD] 0.5.14 [NEW] 0.6.0 gnue-designer(9) [OLD] 0.5.6 [NEW] 0.5.7 @@ -242,7 +267,6 @@ gnugk(9) [OLD] 2.0.8 [NEW] 2.2.1 gnugo(9) [OLD] 3.4 [NEW] 3.6 gnuitar(9) [OLD] 0.3.1 [NEW] 0.3.2 -gnupg(20) [OLD] 1.4.1 [NEW] 1.4.2 gnuserv(10) [OLD] 3.12.6 [NEW] 3.12.7 gnusound(9) [OLD] 0.7.1 [NEW] 0.7.4 gofish(9) [OLD] 0.22 [NEW] 1.0 @@ -255,13 +279,14 @@ gretl(9) [OLD] 1.2.4 [NEW] 1.4.1 grisbi(12) [OLD] 0.5.5 [NEW] 0.5.7 grub(24) [OLD] 0.97 [NEW] 1.90 +gsasl(15) [OLD] 0.2.6 [NEW] 0.2.7 gsdl(16) [OLD] 2.39 [NEW] 2.40 gsoap(9) [OLD] 2.7 [NEW] 2.7.1 gstreamer(9) [OLD] 0.8.10 [NEW] 0.9.1 gstreamer-ffmpeg(17) [OLD] 0.8.5 [NEW] 0.8.6 gtk+-directfb(10) [OLD] 1.3.4 [NEW] 2.0.9-2 +gtk+2(23) [OLD] 2.6.9 [NEW] 2.6.10 gtk-gnutella(10) [OLD] 0.95 [NEW] 0.95.4 -gtk-sharp2(12) [OLD] 1.9.1 [NEW] 1.9.3 gtk-theme-4Missy(9) [OLD] 1.2 [NEW] 1.2.x gtk-theme-engine-Xenophilia(9) [OLD] 0.8 [NEW] 1.2.x gtkatlantic(9) [OLD] 0.4.0 [NEW] 0.4.1 @@ -274,7 +299,7 @@ gtm(12) [OLD] 0.4.11 [NEW] 0.4.12 guarddog(9) [OLD] 2.4.0 [NEW] 2.5.0 gveejay(10) [OLD] 0.4.7 [NEW] 0.7 -gwenview(9) [OLD] 1.1.8 [NEW] 1.2.91 +gwenview(9) [OLD] 1.1.8 [NEW] 1.2.92 gwhere(15) [OLD] 0.1.6 [NEW] 0.2.1 gxmlviewer(9) [OLD] 1.2.0 [NEW] 1.3.3 gxmms(16) [OLD] 0.2.1 [NEW] 0.3.0 @@ -285,37 +310,40 @@ hk_classes(15) [OLD] 0.7.4 [NEW] 0.7.4a hnb(9) [OLD] 1.8.1 [NEW] 1.9.17 honeyd(12) [OLD] 0.8 [NEW] 1.0 -horde(20) [OLD] 3.0.4 [NEW] 3.0.5 hostap-utils(10) [OLD] 0.3.7 [NEW] 0.4.0 -hostapd(10) [OLD] 0.2.5 [NEW] 0.4.3 -howto(11) [OLD] 20050718 [NEW] 20050815 -howto-html(11) [OLD] 20050718 [NEW] 20050815 +hostapd(10) [OLD] 0.2.5 [NEW] 0.4.4 +howto(11) [OLD] 20050718 [NEW] 20050825 +howto-html(11) [OLD] 20050718 [NEW] 20050825 +hpijs(13) [OLD] 1.7.1 [NEW] 2.1.4 html2ps(10) [OLD] 1.0b3 [NEW] 1.0b4 hypersrc(9) [OLD] 4.4.15 [NEW] 5.4.18 icc(16) [OLD] 8.0.055 [NEW] 8.1.021 +icecast(14) [OLD] 2.2.0 [NEW] 2.3.0.rc1 icewm(29) [OLD] 1.2.20 [NEW] 1.2.23 ifp-line(12) [OLD] 0.2.4.5 [NEW] 0.2.4.6 iftop(10) [OLD] 0.16 [NEW] 0.17pre1 im-ja(9) [OLD] 1.3 [NEW] 1.4 +imap(15) [OLD] 2004e [NEW] 2004f imapsync(10) [OLD] 1.133 [NEW] 1.139 imcom(10) [OLD] 1.33 [NEW] 1.34 imwheel(11) [OLD] 0.9.9 [NEW] 1.0.0pre12 +inkscape(16) [OLD] 0.42 [NEW] 0.42.2 ip-filter(9) [OLD] 3.3.12 [NEW] 4.1.9 ipcad(9) [OLD] 3.6.5 [NEW] 3.6.6 -ipcalc(10) [OLD] 0.38 [NEW] 0.40 ipmiutil(9) [OLD] 1.5.8 [NEW] 1.6.7 -ipsec-tools(16) [OLD] 0.6 [NEW] 0.6.1rc1 iptables(27) [OLD] 1.3.2 [NEW] 1.3.3 ircd-hybrid(22) [OLD] 7.0.3 [NEW] 7.1.1 ircd-ptlink(16) [OLD] 6.19.3 [NEW] 6.19.4 irrd(9) [OLD] 2.2.2 [NEW] 2.2.6 ispell(14) [OLD] 3.2.06 [NEW] 3.3.02 -ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050815 +ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050825 +iv(9) [OLD] 1.2.1 [NEW] 1.3.2 ivtools(9) [OLD] 1.1.3 [NEW] 1.2.2 j(10) [OLD] 0.19.0 [NEW] 0.21.0 -jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050809 -jahshaka(9) [OLD] 1.9a3 [NEW] 1.9a9 +jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050821 +jahshaka(9) [OLD] 1.9a3 [NEW] 2.0.RC1 jakarta-commons-daemon(9) [OLD] 1.0 [NEW] 1.0.1 +jakarta-regexp(9) [OLD] 1.3 [NEW] 1.4 jakarta-struts(9) [OLD] 1.2.6 [NEW] 1.2.7 jamvm(9) [OLD] 1.3.0 [NEW] 1.3.2 java-access-bridge(9) [OLD] 1.4.2 [NEW] 1.4.5 @@ -331,17 +359,19 @@ kbear(9) [OLD] 2.1.1 [NEW] 3.0alpha1b kde-style-dotcurve(10) [OLD] 0.2.1 [NEW] 1.0rc1 kde-theme-gorilla(11) [OLD] 1.0 [NEW] 1.4 [inny Source0 URL] +kdesvn(9) [OLD] 0.5.0 [NEW] 0.5.3 kernel-char-kbde(9) [OLD] 1.0.0 [NEW] 1.1.2 kernel-misc-acerhk(17) [OLD] 0.5.18 [NEW] 0.5.27 kernel-misc-mwavem(16) [OLD] 1.0.4 [NEW] 20010714.tar.gz kernel-mosix(40) [OLD] 2.4.22 [NEW] 2.4.31 kernel-net-e100(21) [OLD] 2.3.33 [NEW] 3.4.14 kernel-net-e1000(17) [OLD] 6.0.60 [NEW] 6.1.16 -kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.1 +kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.4 kernel-pcmcia-orinoco-usb(15) [OLD] 0.0.8 [NEW] 0.1.3 kernel-video-drm(16) [OLD] 4.3.0 [NEW] 4.4.0 kernel24-video-em8300(11) [OLD] 0.14.0 [NEW] 0.15.0 kgcc(9) [OLD] 3.2.2 [NEW] 4.0.1 +kmediafactory(9) [OLD] 0.3.0 [NEW] 0.4.0 kmyfirewall(9) [OLD] 0.9.6.2 [NEW] 1.0beta1 kmymoney2(9) [OLD] 0.6.4 [NEW] 0.8 koha(12) [OLD] 1.2.2 [NEW] 2.2.3 @@ -354,19 +384,18 @@ latd(10) [OLD] 1.21 [NEW] 1.23.1 lbreakout2(9) [OLD] 2.5.2 [NEW] 2.6beta lcdf-typetools(9) [OLD] 2.17 [NEW] 2.34 -ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc1 +ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc2 leafnode(10) [OLD] 1.11.2 [NEW] 1.11.3 lg(213) [OLD] 110 [NEW] 117 -libXrender(9) [OLD] 0.8.4 [NEW] 0.9.0 libapreq(10) [OLD] 1.3 [NEW] 1.33 libapreq2(13) [OLD] 2.05 [NEW] 2.06 libdnet(12) [OLD] 1.8 [NEW] 1.10 libdockapp(13) [OLD] 0.5.0 [NEW] 0.6.1 -libdomainkeys(9) [OLD] 0.66 [NEW] 0.67 libetpan(9) [OLD] 0.37 [NEW] 0.38 libfpx(14) [OLD] 1.2.0.12 [NEW] 1.2.0.13 libhome(9) [OLD] 0.8.1 [NEW] 0.10 libhttpd(9) [OLD] 1.3 [NEW] 1.4 +libifp(9) [OLD] 1.0.0.1 [NEW] 1.0.0.2 libinklevel(9) [OLD] 0.6.4 [NEW] 0.6.5rc1 liblzf(10) [OLD] 1.5 [NEW] 1.51 libmath++(9) [OLD] 0.0.3 [NEW] 0.0.4 @@ -391,10 +420,12 @@ lirc(19) [OLD] 0.7.1 [NEW] 0.7.2 lire(12) [OLD] 1.3 [NEW] 2.0.1 lmp(9) [OLD] 0.2.99.10 [NEW] 0.3.0.pre1 -lms(19) [OLD] 1.6.2 [NEW] [1.7.2] +lms(19) [OLD] 1.6.3 [NEW] [1.7.2] log4cpp(9) [OLD] 0.3.4b [NEW] 0.3.5rc3 logfmon(10) [OLD] 0.4 [NEW] 0.7 logtool(9) [OLD] 1.1.0 [NEW] 1.3.1 +lout(11) [OLD] 3.30 [NEW] 3.31 +luma(9) [OLD] 2.2 [NEW] 2.2.1 lurker(10) [OLD] 0.8 [NEW] 1.3 lynx(15) [OLD] 2.8.5rel.1 [NEW] 2.8.6dev.13 lyx(12) [OLD] 1.3.5 [NEW] 1.3.6 @@ -406,18 +437,19 @@ manedit(9) [OLD] 0.5.12 [NEW] 0.6.1 mangoquest(9) [OLD] 0.6.3a [NEW] 0.6.4 mantis(14) [OLD] 0.19.2 [NEW] 1.0.0rc1 -mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.8 +mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.9 +md5deep(9) [OLD] 1.7 [NEW] 1.8 mdbtools(14) [OLD] 0.5 [NEW] 0.6pre1 mdns-scan(10) [OLD] 0.1 [NEW] 0.4 mecab(12) [OLD] 0.80 [NEW] 0.82pre2 mediawiki(16) [OLD] 1.4.7 [NEW] [1.5beta4] +mercurial(9) [OLD] 0.6b [NEW] 0.6c messagewall(9) [OLD] 1.0.8 [NEW] 1.1.0 [DEAD URL] metabar(9) [OLD] 0.7 [NEW] 0.8 metakit(9) [OLD] 2.4.9.3 [NEW] 2.4.9.4 mftrace(9) [OLD] 1.1.10 [NEW] 1.1.16 min12xxw(9) [OLD] 0.0.7 [NEW] 0.0.8 mixmaster(9) [OLD] 2.9.0 [NEW] 3.0b2 -mldonkey(38) [OLD] 2.6.1 [NEW] 2.6.2 mlkit(9) [OLD] 4.1.1 [NEW] 4.1.4 mlton(12) [OLD] 20021122 [NEW] 20030625 mm3d(13) [OLD] 1.1.6 [NEW] 1.1.8 @@ -425,41 +457,37 @@ moinmoin(12) [OLD] 1.3.4 [NEW] 1.3.5 molden(9) [OLD] 4.3 [NEW] 4.4 monopd(9) [OLD] 0.9.2 [NEW] 0.9.3 -monotone(13) [OLD] 0.21 [NEW] 0.22 -motion(15) [OLD] 3.1.19 [NEW] 3.2.2 +motion(15) [OLD] 3.1.19 [NEW] 3.2.3 mp1e(13) [OLD] 1.9.4 [NEW] 1.9.7cvs mpich(9) [OLD] 1.2.6 [NEW] 1.2.7 mpich2(9) [OLD] 0.97 [NEW] 1.0.2p1 mrouted(9) [OLD] 3.9beta3+IOS12 [NEW] -mrtg(19) [OLD] 2.12.1 [NEW] 2.12.2 mrxvt(10) [OLD] 0.3.13 [NEW] 0.4.1 -msmtp(9) [OLD] 1.4.3 [NEW] 1.4.4 msyslog(9) [OLD] 1.09c [NEW] 1.09d -mtd(9) [OLD] 20050624 [NEW] 20050815 +mt-st(16) [OLD] 0.9 [NEW] 0.9b +mtd(9) [OLD] 20050624 [NEW] 20050825 multipath-tools(10) [OLD] 0.3.3 [NEW] 0.4.4 muse(20) [OLD] 0.7.1 [NEW] 0.7.2pre2 mutt-nntp(22) [OLD] 1.4 [NEW] 1.4.2.1 muttprint(9) [OLD] 0.72c [NEW] 0.72d -mysql(30) [OLD] 4.1.13 [NEW] 4.1.13a -mysql-ruby(11) [OLD] 2.6 [NEW] 2.6.3 [2.7-beta2] +mysql-ruby(11) [OLD] 2.6 [NEW] 2.7 mysqlBind(9) [OLD] 1.8 [NEW] 1.92RC mywebftp(9) [OLD] 0.2 [NEW] 03rc3 nagios-plugins(12) [OLD] 1.4 [NEW] 1.4.1 nam(9) [OLD] 1.10 [NEW] 1.11 nautilus-cd-burner(13) [OLD] 2.10.1 [NEW] 2.10.2 -neon(13) [OLD] 0.24.7 [NEW] 0.25.2 +ndiswrapper(20) [OLD] 1.2 [NEW] 1.3rc1 netdude(9) [OLD] 0.3.3 [NEW] 0.4.6 netpbm(18) [OLD] 10.28 [NEW] 10.29 neveredit(9) [OLD] 0.7b2 [NEW] 0.8b1 +nginx(13) [OLD] 0.1.41 [NEW] 0.1.42 njamd(9) [OLD] 0.8.1 [NEW] 0.9.3pre2 nmap(19) [OLD] 3.81 [NEW] 3.84ALPHA1 nocc(9) [OLD] 0.9.6 [NEW] 0.9.7 noffle(9) [OLD] 1.0.1 [NEW] 1.2.0rc1 ns(12) [OLD] 2.27 [NEW] 2.28 nsd(10) [OLD] 2.2.1 [NEW] 2.3.0 -nss_mdns(9) [OLD] 0.3 [NEW] 0.5 nte(9) [OLD] 1.7.0 [NEW] 2.4 -nusoap(10) [OLD] 0.7.0 [NEW] 0.7.2 nut(13) [OLD] 2.0.1 [NEW] 2.0.2 oajabber(12) [OLD] 20040913 [NEW] [current] obexftp(9) [OLD] 0.10.3 [NEW] 0.10.6 @@ -468,15 +496,13 @@ ocaml-dbi(10) [OLD] 0.9.10 [NEW] 0.9.11 ocaml-equeue(11) [OLD] 1.2.3 [NEW] 2.1 ocaml-extlib(10) [OLD] 1.3 [NEW] 1.4 -ocaml-findlib(12) [OLD] 0.8.1 [NEW] 1.0.4 ocaml-gdome2-xslt(10) [OLD] 0.0.1 [NEW] 0.0.6 ocaml-lablgtk2(16) [OLD] 2.2.0 [NEW] 2.4.0 ocaml-net(9) [OLD] 0.95 [NEW] 1.1 ocaml-netclient(11) [OLD] 0.90.1 [NEW] 0.91.1 -ocaml-pcre(10) [OLD] 5.09.0 [NEW] 5.10.0 ocaml-postgres(12) [OLD] 20020409 [NEW] 20040120 -ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1 -ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1 +ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1.1 +ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1.1 ocaml-wlex(12) [OLD] 20030827 [NEW] 20040827 octave(27) [OLD] 2.1.71 [NEW] [bleeding-edge/2.9.3] octave-forge(9) [OLD] 2004.09.09 [NEW] 2005.06.13 @@ -484,16 +510,18 @@ openaether-utils(12) [OLD] 20040713 [NEW] [current] openct(9) [OLD] 0.6.4 [NEW] 0.6.5 openhpi(9) [OLD] 2.1.1 [NEW] 2.1.2 +openldap(26) [OLD] 2.3.5 [NEW] 2.3.6 opennap(9) [OLD] 0.43 [NEW] 0.44 -openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050816 +openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050826 openoffice-thesaurus-es(11) [OLD] 050128 [NEW] 050720 opensched(9) [OLD] 0.3.8 [NEW] 0.4.4 -openswan(11) [OLD] 2.3.1 [NEW] 2.4.0dr10 +openswan(11) [OLD] 2.3.1 [NEW] 2.4.0rc4 openvrml(13) [OLD] 0.15.9 [NEW] 0.15.10 -otrs(19) [OLD] 1.3.2 [NEW] 2.0.1 +ortp(11) [OLD] 0.7.0 [NEW] 0.7.1 +otrs(19) [OLD] 1.3.2 [NEW] 2.0.2 pam-pam_encfs(10) [OLD] 0.1 [NEW] 0.1.1 +pam-pam_ldap(15) [OLD] 178 [NEW] 180 pam-pam_mktemp(10) [OLD] 0.2.5 [NEW] 1.0.1 -pam-pam_mysql(12) [OLD] 0.5 [NEW] 0.6.0 parrot(10) [OLD] 0.2.0 [NEW] 0.2.3 partimage(11) [OLD] 0.6.5_beta2 [NEW] [0.7.2 - older than 0.6.5!] partysip(11) [OLD] 0.6.0 [NEW] 2.2.3 @@ -502,7 +530,7 @@ pbbuttonsd(14) [OLD] 0.6.10 [NEW] 0.7.1 pcb(10) [OLD] 20050315 [NEW] 20050609 pchar(9) [OLD] 1.4 [NEW] 1.5 -pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre1 +pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre3 pdp++(9) [OLD] 2.01 [NEW] 3.2a05 perl(60) [OLD] 5.8.7 [NEW] [5.9.2 DEVEL] perl-AcePerl(12) [OLD] 1.87 [NEW] 1.89 @@ -516,6 +544,7 @@ perl-Apache-Session-Wrapper(17) [OLD] 0.17 [NEW] 0.25 perl-Apache-Test(17) [OLD] 1.19 [NEW] 1.26 perl-Apache-VMonitor(17) [OLD] 2.01 [NEW] 2.05 +perl-Archive-Tar(31) [OLD] 1.24 [NEW] 1.26 perl-Archive-Zip(17) [OLD] 1.14 [NEW] 1.16 perl-Array-Compare(17) [OLD] 1.11 [NEW] 1.12 perl-Attribute-Persistent(16) [OLD] 1.0 [NEW] 1.1 @@ -525,8 +554,10 @@ perl-CGI-Application(16) [OLD] 4.01 [NEW] 4.03 perl-Cache-Simple-TimedExpiry(17) [OLD] 0.22 [NEW] 0.23 perl-Callback(14) [OLD] 1.05 [NEW] 1.06 -perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.18 +perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.20 +perl-Class-DBI-SQLite(17) [OLD] 0.09 [NEW] 0.10 perl-Class-ReturnValue(17) [OLD] 0.52 [NEW] 0.53 +perl-Class-Trigger(17) [OLD] 0.09 [NEW] 0.10 perl-Config-Auto(17) [OLD] 0.11 [NEW] 0.14 perl-Config-General(17) [OLD] 2.27 [NEW] 2.29 perl-Config-Simple(17) [OLD] 4.57 [NEW] 4.58 @@ -552,6 +583,7 @@ perl-Data-Library(17) [OLD] 0.1 [NEW] 0.2 perl-Data-Serializer(17) [OLD] 0.28 [NEW] 0.29 perl-DateTime(16) [OLD] 0.28 [NEW] 0.2901 +perl-DateTime-TimeZone(18) [OLD] 0.36 [NEW] 0.37 perl-Devel-Size(16) [OLD] 0.59 [NEW] 0.63 perl-Devel-Size-Report(17) [OLD] 0.07 [NEW] 0.10 perl-Device-Modem(17) [OLD] 1.43 [NEW] 1.44 @@ -572,13 +604,14 @@ perl-Getopt-ArgvFile(16) [OLD] 1.09 [NEW] 1.10 perl-Glib(15) [OLD] 1.081 [NEW] 1.093 perl-Gnome2-GConf(15) [OLD] 1.000 [NEW] 1.013 +perl-Gnome2-Print(15) [OLD] 0.94 [NEW] 0.951 perl-Gnome2-VFS(15) [OLD] 1.003 [NEW] 1.031 perl-Graph(15) [OLD] 0.20105 [NEW] 0.67 perl-GraphViz(16) [OLD] 2.01 [NEW] 2.02 <> ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/PLD-update-TODO?r1=1.248&r2=1.249&f=u From megabajt at pld-linux.org Sat Aug 27 14:00:43 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: ogle.spec - BR: sed >= 4.0, sorted BR In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:00:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: sed >= 4.0, sorted BR ---- Files affected: SPECS: ogle.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ogle.spec diff -u SPECS/ogle.spec:1.39 SPECS/ogle.spec:1.40 --- SPECS/ogle.spec:1.39 Sat Sep 11 22:01:54 2004 +++ SPECS/ogle.spec Sat Aug 27 14:00:36 2005 @@ -6,9 +6,9 @@ Release: 3 License: GPL Group: X11/Applications/Multimedia -URL: http://www.dtek.chalmers.se/~dvd/ Source0: http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz # Source0-md5: a76a9892bdb807a4bcf859d15a91f0f9 +URL: http://www.dtek.chalmers.se/~dvd/ BuildRequires: XFree86-devel BuildRequires: a52dec-libs-devel >= 0.7.3 BuildRequires: autoconf @@ -16,9 +16,10 @@ BuildRequires: libdvdcss-devel >= 1.2.2 BuildRequires: libdvdread-devel >= 0.9.4 BuildRequires: libjpeg-devel -BuildRequires: libxml2-devel >= 2.4.5 -BuildRequires: libtool BuildRequires: libmad-devel +BuildRequires: libtool +BuildRequires: libxml2-devel >= 2.4.5 +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -108,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/27 12:00:36 megabajt +- BR: sed >= 4.0, sorted BR + Revision 1.39 2004/09/11 20:01:54 adamg - slightly better approach, but still not perfect ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ogle.spec?r1=1.39&r2=1.40&f=u From arekm at pld-linux.org Sat Aug 27 14:31:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: BitTorrent.spec - up to 4.1.4 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 12:31:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.1.4 ---- Files affected: SPECS: BitTorrent.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/BitTorrent.spec diff -u SPECS/BitTorrent.spec:1.41 SPECS/BitTorrent.spec:1.42 --- SPECS/BitTorrent.spec:1.41 Sun Jul 31 08:39:53 2005 +++ SPECS/BitTorrent.spec Sat Aug 27 14:31:53 2005 @@ -2,12 +2,12 @@ Summary: BitTorrent - a tool for distributing files Summary(pl): BitTorrent - narz?dzie do rozpowszechniania plik?w Name: BitTorrent -Version: 4.1.3 +Version: 4.1.4 Release: 1 License: BitTorrent Open Source License Group: Applications/Communications Source0: http://www.bittorrent.com/dl/%{name}-%{version}.tar.gz -# Source0-md5: cd4dff145b5dea3789fa384bb94a4de9 +# Source0-md5: 1d0f85eb5cd4ac219853e2e6709f5847 Patch0: %{name}-man_pages.patch URL: http://www.bittorrent.com/ BuildRequires: python-devel @@ -64,27 +64,30 @@ find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name "*.py" | xargs rm install debian/* $RPM_BUILD_ROOT%{_mandir}/man1 +%find_lang bittorrent + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f bittorrent.lang %defattr(644,root,root,755) %doc LICENSE.txt README.txt credits.txt -%attr(755,root,root) %{_bindir}/btdownloadcurses.py -%attr(755,root,root) %{_bindir}/btdownloadheadless.py -%attr(755,root,root) %{_bindir}/btlaunchmany*.py -%attr(755,root,root) %{_bindir}/btmaketorrent.py -%attr(755,root,root) %{_bindir}/btr*.py -%attr(755,root,root) %{_bindir}/btt*.py -%attr(755,root,root) %{_bindir}/btshowmetainfo.py +%attr(755,root,root) %{_bindir}/bittorrent-console +%attr(755,root,root) %{_bindir}/bittorrent-curses +%attr(755,root,root) %{_bindir}/bittorrent-tracker +%attr(755,root,root) %{_bindir}/changetracker-console +%attr(755,root,root) %{_bindir}/launchmany-console +%attr(755,root,root) %{_bindir}/launchmany-curses +%attr(755,root,root) %{_bindir}/maketorrent-console +%attr(755,root,root) %{_bindir}/torrentinfo-console %{py_sitescriptdir}/BitTorrent %{py_sitescriptdir}/khashmir %{_mandir}/man1/* %files gui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/btdownloadgui.py -%attr(755,root,root) %{_bindir}/btmaketorrentgui.py +%attr(755,root,root) %{_bindir}/bittorrent +%attr(755,root,root) %{_bindir}/maketorrent %{_pixmapsdir}/BitTorrent-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -93,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 12:31:53 arekm +- up to 4.1.4 + Revision 1.41 2005/07/31 06:39:53 kosmo - updated to 4.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/BitTorrent.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Sat Aug 27 14:32:08 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: BitTorrent-4.1.4.tar.gz Message-ID: <7981.1125145927@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bittorrent.com/dl/BitTorrent-4.1.4.tar.gz 1d0f85eb5cd4ac219853e2e6709f5847 BitTorrent-4.1.4.tar.gz Size: 2016856 bytes -- Virtually Yours: distfiles. From megabajt at pld-linux.org Sat Aug 27 14:36:53 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: vde.spec - BR: autoconf, automake, libtool In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:36:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: autoconf, automake, libtool ---- Files affected: SPECS: vde.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/vde.spec diff -u SPECS/vde.spec:1.8 SPECS/vde.spec:1.9 --- SPECS/vde.spec:1.8 Fri Jun 24 15:38:57 2005 +++ SPECS/vde.spec Sat Aug 27 14:36:47 2005 @@ -10,6 +10,9 @@ # Source0-md5: 13337f2317a51a8c441503a0b0c908ac Patch0: %{name}-DESTDIR.patch URL: http://sourceforge.net/projects/vde/ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 12:36:47 megabajt +- BR: autoconf, automake, libtool + Revision 1.8 2005/06/24 13:38:57 ankry - pl capitalization is pointless here: unless we do s/vde/wre/g ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vde.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:24 2005 Subject: DISTFILES: scintilla166.tgz Message-ID: <5422.1125149759@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scintilla166.tgz 10a60fffbeae8408a76bb79ac7b61500 scintilla166.tgz Size: 593866 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 15:35:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:24 2005 Subject: SPECS: scintilla.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scintilla.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/scintilla.spec diff -u SPECS/scintilla.spec:1.16 SPECS/scintilla.spec:1.17 --- SPECS/scintilla.spec:1.16 Sat Jun 18 17:25:10 2005 +++ SPECS/scintilla.spec Sat Aug 27 15:35:50 2005 @@ -6,13 +6,13 @@ Summary: Free source code editing component for GTK+ and Win32 Summary(pl): Wolnodost?pna kontrolka edycyjna dla GTK+ i Win32 Name: scintilla -Version: 1.63 +Version: 1.66 %define fver %(echo %{version} | tr -d .) Release: 1 License: BSD-like Group: Libraries Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz -# Source0-md5: 9122e70a41181f0b2e54e19f8236c68b +# Source0-md5: 10a60fffbeae8408a76bb79ac7b61500 Patch0: %{name}-make.patch URL: http://scintilla.org/ %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 13:35:50 arekm +- up to 1.66 + Revision 1.16 2005/06/18 15:25:10 zbyniu - BR: libtool, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scintilla.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:24 2005 Subject: SOURCES: scintilla-make.patch - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SOURCES: scintilla-make.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/scintilla-make.patch diff -u SOURCES/scintilla-make.patch:1.7 SOURCES/scintilla-make.patch:1.8 --- SOURCES/scintilla-make.patch:1.7 Tue Apr 5 17:59:41 2005 +++ SOURCES/scintilla-make.patch Sat Aug 27 15:35:53 2005 @@ -1,6 +1,6 @@ -diff -urN scintilla.org/gtk/makefile scintilla/gtk/makefile ---- scintilla.org/gtk/makefile 2005-04-01 02:54:34.000000000 +0200 -+++ scintilla/gtk/makefile 2005-04-05 17:53:51.782783120 +0200 +diff -urNbB scintilla.org/gtk/makefile scintilla/gtk/makefile +--- scintilla.org/gtk/makefile 2005-05-27 13:29:44.000000000 +0200 ++++ scintilla/gtk/makefile 2005-08-27 15:34:00.961960088 +0200 @@ -7,7 +7,7 @@ # To force GTK+ 2 build, define GTK2 on the make command line. # To force GTK+ 1 build, define GTK1 on the make command line. @@ -57,33 +57,33 @@ + libtool --tag=CXX --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< +.c.lo: + libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< -+ ++ #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ -LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ --LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexForth.o LexFortran.o \ --LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o \ --LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ --LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o LexPython.o \ --LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o \ --LexVHDL.o LexYAML.o +-LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ +-LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ +-LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +-LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ +-LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ +-LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o +LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo \ +LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo \ -+LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexForth.lo LexFortran.lo \ -+LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo LexLout.lo LexLua.lo \ -+LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo LexNsis.lo \ -+LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo LexPython.lo \ -+LexRuby.lo LexScriptol.lo LexSpecman.lo LexSQL.lo LexTeX.lo LexVB.lo LexVerilog.lo \ -+LexVHDL.lo LexYAML.lo ++LexCsound.lo LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo \ ++LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo \ ++LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo \ ++LexNsis.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo \ ++LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo LexSpecman.lo \ ++LexSQL.lo LexTADS3.lo LexTeX.lo LexVB.lo LexVerilog.lo LexVHDL.lo LexYAML.lo #--Autogenerated -- end of automatically generated section all: $(COMPLIB) clean: - rm -f *.o $(COMPLIB) -+ rm -f *.lo $(COMPLIB) ++ rm -f *.o *.lo $(COMPLIB) deps: $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/scintilla-make.patch?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Sat Aug 27 15:38:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: scite.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:38:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scite.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.11 SPECS/scite.spec:1.12 --- SPECS/scite.spec:1.11 Tue Apr 5 18:05:59 2005 +++ SPECS/scite.spec Sat Aug 27 15:38:30 2005 @@ -6,12 +6,12 @@ Summary: SciTE - a programmers text editor Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite -Version: 1.63 +Version: 1.66 Release: 1 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz -# Source0-md5: e92bd082788759f2a3ee629d1688cdb8 +# Source0-md5: 62ce813c59e2d0206e875549dd300ee2 Patch0: %{name}-make.patch Patch1: %{name}-desktop.patch URL: http://scintilla.org/SciTE.html @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/27 13:38:30 arekm +- up to 1.66 + Revision 1.11 2005/04/05 16:05:59 arekm - up to 1.63 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sat Aug 27 15:38:38 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: DISTFILES: scite166.tgz Message-ID: <9819.1125149918@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scite166.tgz 62ce813c59e2d0206e875549dd300ee2 scite166.tgz Size: 1259178 bytes -- Virtually Yours: distfiles. From dzeus at pld-linux.org Sat Aug 27 15:58:50 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: sylpheed.spec - up to 2.0.1 In-Reply-To: References: Message-ID: Author: dzeus Date: Sat Aug 27 13:58:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.0.1 ---- Files affected: SPECS: sylpheed.spec (1.167 -> 1.168) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167 SPECS/sylpheed.spec:1.168 --- SPECS/sylpheed.spec:1.167 Fri Jul 29 00:11:33 2005 +++ SPECS/sylpheed.spec Sat Aug 27 15:58:43 2005 @@ -12,12 +12,12 @@ Summary(pl): Szybki klient poczty bazuj?cy na GTK+ Summary(pt_BR): Um r?pido e leve cliente de email baseado em GTK+ Name: sylpheed -Version: 2.0.0 +Version: 2.0.1 Release: 1 License: GPL v2+ Group: X11/Applications/Networking Source0: http://sylpheed.good-day.net/sylpheed/v2.0/%{name}-%{version}.tar.bz2 -# Source0-md5: a7754f8820814089229b1ab5f0e4d855 +# Source0-md5: 7e8c8fdd427935349c4a57cf33fdf68a Patch0: %{name}-desktop.patch Patch1: %{name}-nolibs.patch BuildRequires: autoconf >= 2.50 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.168 2005/08/27 13:58:43 dzeus +- up to 2.0.1 + Revision 1.167 2005/07/28 22:11:33 freetz - 2.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167&r2=1.168&f=u From arekm at pld-linux.org Sat Aug 27 15:59:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: icecast.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:59:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: icecast.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/icecast.spec diff -u SPECS/icecast.spec:1.62 SPECS/icecast.spec:1.63 --- SPECS/icecast.spec:1.62 Sun May 1 19:31:30 2005 +++ SPECS/icecast.spec Sat Aug 27 15:59:00 2005 @@ -7,7 +7,7 @@ Summary(pt_BR): Um servidor de streams MP3, Ogg Name: icecast Version: 2.2.0 -Release: 1 +Release: 2 Epoch: 2 License: GPL Group: Networking/Daemons @@ -133,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/27 13:59:00 arekm +- rel 2 + Revision 1.62 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/icecast.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Sat Aug 27 15:59:12 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 09:39:25 2005 Subject: DISTFILES: sylpheed-2.0.1.tar.bz2 Message-ID: <9514.1125151152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.0/sylpheed-2.0.1.tar.bz2 7e8c8fdd427935349c4a57cf33fdf68a sylpheed-2.0.1.tar.bz2 Size: 2323171 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 16:09:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: scite.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:09:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: scite.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.12 SPECS/scite.spec:1.13 --- SPECS/scite.spec:1.12 Sat Aug 27 15:38:30 2005 +++ SPECS/scite.spec Sat Aug 27 16:09:41 2005 @@ -7,7 +7,7 @@ Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite Version: 1.66 -Release: 1 +Release: 2 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz @@ -17,7 +17,7 @@ URL: http://scintilla.org/SciTE.html %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} %{!?with_gtk1:BuildRequires: gtk+2-devel >= 1:2.0.0} -BuildRequires: scintilla-devel >= 1.63 +BuildRequires: scintilla-devel >= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 14:09:41 arekm +- rel 2 + Revision 1.12 2005/08/27 13:38:30 arekm - up to 1.66 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.12&r2=1.13&f=u From arekm at pld-linux.org Sat Aug 27 16:20:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: perl-Apache-Reload.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:20:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: perl-Apache-Reload.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/perl-Apache-Reload.spec diff -u SPECS/perl-Apache-Reload.spec:1.7 SPECS/perl-Apache-Reload.spec:1.8 --- SPECS/perl-Apache-Reload.spec:1.7 Wed Nov 3 20:36:55 2004 +++ SPECS/perl-Apache-Reload.spec Sat Aug 27 16:20:39 2005 @@ -6,7 +6,7 @@ Summary(pl): Prze?adowywanie zmodyfikowanych w trakcie pracy Apache'a modu??w Name: perl-Apache-Reload Version: 0.07 -Release: 1 +Release: 2 License: unknown Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 14:20:39 arekm +- rel 2 + Revision 1.7 2004/11/03 19:36:55 paladine - formatting ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-Apache-Reload.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Sat Aug 27 16:23:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:25 2005 Subject: SOURCES: evince-disable_dbus.patch (REMOVED) - evince finally work... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:23:56 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - evince finally works fine with dbus ---- Files affected: SOURCES: evince-disable_dbus.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Sat Aug 27 16:24:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: evince.spec - removed disable_dbus patch - works for me, re... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:24:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed disable_dbus patch - works for me, rel. 1 ---- Files affected: SPECS: evince.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.29 SPECS/evince.spec:1.30 --- SPECS/evince.spec:1.29 Sat Aug 27 00:57:44 2005 +++ SPECS/evince.spec Sat Aug 27 16:24:16 2005 @@ -6,19 +6,17 @@ Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 0.9 +Release: 1 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 # Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -# NOTE: disabled until less broken release BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript @@ -72,7 +70,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -145,6 +142,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/27 14:24:16 paladine +- removed disable_dbus patch +- works for me, rel. 1 + Revision 1.29 2005/08/26 22:57:44 aflinta - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Sat Aug 27 16:25:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:25 2005 Subject: DISTFILES: xchm-1.1.tar.gz Message-ID: <15891.1125152726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xchm/xchm-1.1.tar.gz 801ce6a079e559bc5b7d814e86861500 xchm-1.1.tar.gz Size: 331622 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 16:25:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xchm.spec - updated to 1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1 ---- Files affected: SPECS: xchm.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.36 SPECS/xchm.spec:1.37 --- SPECS/xchm.spec:1.36 Mon Jun 6 18:22:28 2005 +++ SPECS/xchm.spec Sat Aug 27 16:25:23 2005 @@ -2,12 +2,12 @@ Summary: CHM viewer for UNIX Summary(pl): Przegl?darka CHM dla Uniks?w Name: xchm -Version: 1.0 +Version: 1.1 Release: 1 License: GPL Group: Applications/File Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz -# Source0-md5: 808e87a2a00683b5142e9f74398a20b4 +# Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop URL: http://xchm.sourceforge.net/ BuildRequires: autoconf @@ -36,7 +36,6 @@ %{__automake} %configure \ WX_CONFIG_NAME=/usr/bin/wx-gtk2-ansi-config - %{__make} %install @@ -68,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/27 14:25:23 paladine +- updated to 1.1 + Revision 1.36 2005/06/06 16:22:28 koorek - updated to 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.36&r2=1.37&f=u From areq at pld-linux.org Sat Aug 27 16:26:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:25 2005 Subject: DISTFILES: chan_capi-cm-0.5.4.tar.gz Message-ID: <17655.1125152805@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/chan-capi/chan_capi-cm-0.5.4.tar.gz a7a9c0f90395909ee06528f17fc608d2 chan_capi-cm-0.5.4.tar.gz Size: 47714 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 16:26:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: asterisk-chan_capi.spec (NEW) - init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:26:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init PLD spec ---- Files affected: SPECS: asterisk-chan_capi.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u /dev/null SPECS/asterisk-chan_capi.spec:1.1 --- /dev/null Sat Aug 27 16:26:48 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 16:26:43 2005 @@ -0,0 +1,51 @@ +# $Revision$, $Date$ +Summary: Asterisk ISDN CAPI channel driver +Name: asterisk-chan_capi +Version: 0.5.4 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz +# Source0-md5: a7a9c0f90395909ee06528f17fc608d2 +URL: http://sourceforge.net/projects/chan-capi +BuildRequires: asterisk-devel +BuildRequires: capi-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP +Platform. + +%prep +%setup -q -n chan_capi-%{version} + +%build +%{__make} \ + CC="%{__cc}" \ + DEBUG="" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/usr/lib/asterisk/modules + +%{__make} install \ + INSTALL_PREFIX=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README capi.conf +/usr/lib/asterisk/modules/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 14:26:43 areq +- init PLD spec + + ================================================================ From arekm at pld-linux.org Sat Aug 27 16:37:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: openssl.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: openssl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/openssl.spec diff -u SPECS/openssl.spec:1.140 SPECS/openssl.spec:1.141 --- SPECS/openssl.spec:1.140 Sun Jul 24 18:36:14 2005 +++ SPECS/openssl.spec Sat Aug 27 16:37:04 2005 @@ -10,7 +10,7 @@ Summary(uk): ?????????? ?? ??????? ??? ?'?????? ????? Secure Sockets Layer Name: openssl Version: 0.9.7g -Release: 2 +Release: 3 License: Apache-style License Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz @@ -432,6 +432,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/27 14:37:04 arekm +- rel 3 + Revision 1.140 2005/07/24 16:36:14 qboosh - fix libdir in *.pc, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.140&r2=1.141&f=u From areq at pld-linux.org Sat Aug 27 16:44:25 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS (GCC4): gcc.spec - Release 0.3 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:44:25 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - Release 0.3 ---- Files affected: SPECS: gcc.spec (1.308.2.1 -> 1.308.2.2) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308.2.1 SPECS/gcc.spec:1.308.2.2 --- SPECS/gcc.spec:1.308.2.1 Thu Aug 25 12:47:16 2005 +++ SPECS/gcc.spec Sat Aug 27 16:44:19 2005 @@ -25,7 +25,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -Release: 0.1 +Release: 0.3 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1188,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.2 2005/08/27 14:44:19 areq +- Release 0.3 + Revision 1.308.2.1 2005/08/25 10:47:16 trojan - updated to 4.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308.2.1&r2=1.308.2.2&f=u From paszczus at pld-linux.org Sat Aug 27 17:01:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS (LINUX_2_6_11): iptables.spec - uncommented rm -f geoip (now... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 15:01:53 2005 GMT Module: SPECS Tag: LINUX_2_6_11 ---- Log message: - uncommented rm -f geoip (now builds) ---- Files affected: SPECS: iptables.spec (1.153.2.16 -> 1.153.2.17) ---- Diffs: ================================================================ Index: SPECS/iptables.spec diff -u SPECS/iptables.spec:1.153.2.16 SPECS/iptables.spec:1.153.2.17 --- SPECS/iptables.spec:1.153.2.16 Sun May 22 04:39:08 2005 +++ SPECS/iptables.spec Sat Aug 27 17:01:47 2005 @@ -136,7 +136,7 @@ %patch7 -p1 # removed broken ... -#rm -f extensions/.{set,quota,geoip}-test +rm -f extensions/.{set,quota,geoip}-test #rm -f extensions/.quota-test chmod 755 extensions/.*-test* @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.153.2.17 2005/08/27 15:01:47 paszczus +- uncommented rm -f geoip (now builds) + Revision 1.153.2.16 2005/05/22 02:39:08 averne - reverted ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iptables.spec?r1=1.153.2.16&r2=1.153.2.17&f=u From qboosh at pld-linux.org Sat Aug 27 17:05:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-util-util-macros.spec - existing Group, cleanup In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:05:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - existing Group, cleanup ---- Files affected: SPECS: xorg-util-util-macros.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.1 SPECS/xorg-util-util-macros.spec:1.2 --- SPECS/xorg-util-util-macros.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:05:06 2005 @@ -1,14 +1,11 @@ # $Revision$, $Date$ -# $Rev: 3222 $, $Date$ -# Summary: Autoconf macros for xorg Summary(pl): Makra autoconfa dla xorg Name: xorg-util-util-macros Version: 0.99.0 Release: 0.01 License: MIT -Group: X11/Development -###### Unknown group! +Group: X11/Development/Tools Source0: http://xorg.freedesktop.org/X11R7.0-RC0/util/util-macros-%{version}.tar.bz2 # Source0-md5: 5647ac7ca141725cae6c7fc73fd76dbd URL: http://xorg.freedesktop.org/ @@ -21,12 +18,11 @@ Autoconf macros for xorg. %description -l pl -Makra autoconfa dla xorg +Makra autoconfa dla xorg. %prep %setup -q -n util-macros-%{version} - %build %{__aclocal} %{__autoconf} @@ -35,29 +31,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_aclocaldir}/xorgversion.m4 - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:05:06 qboosh +- existing Group, cleanup + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.1&r2=1.2&f=u From aredridel at pld-linux.org Sat Aug 27 17:08:02 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:25 2005 Subject: DISTFILES: ndisc6-0.1.5.tar.bz2 Message-ID: <15044.1125155282@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.via.ecp.fr/~rem/ndisc6/v0.1/ndisc6-0.1.5.tar.bz2 349de20ade093e2e4017a1ad1009b6b2 ndisc6-0.1.5.tar.bz2 Size: 14931 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 17:08:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: ndisc6.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ndisc6.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u /dev/null SPECS/ndisc6.spec:1.1 --- /dev/null Sat Aug 27 17:08:04 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:07:59 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +# +Summary: Neighbor Discovery tools for IPv6 +Name: ndisc6 +Version: 0.1.5 +Release: 1 +License: GPLv2 +Group: Networking/Admin +Source0: http://people.via.ecp.fr/~rem/ndisc6/v0.1/%{name}-%{version}.tar.bz2 +# Source0-md5: 349de20ade093e2e4017a1ad1009b6b2 +URL: http://people.via.ecp.fr/~rem/ndisc6/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. + +%prep +%setup -q + +%build +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} + +install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README +%attr(755,root,root) %{_sbindir}/* +%{_mandir}/man8/* + +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 15:07:59 aredridel +- added + ================================================================ From aredridel at pld-linux.org Sat Aug 27 17:08:24 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: ndisc6.spec - adapterised In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterised ---- Files affected: SPECS: ndisc6.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.1 SPECS/ndisc6.spec:1.2 --- SPECS/ndisc6.spec:1.1 Sat Aug 27 17:07:59 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:08:19 2005 @@ -12,7 +12,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) +that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery +respectively. It is primarily meant for IPv6 networking diagnostics or +to detect rogue IPv6 nodes or routers on an Ethernet segment. %prep %setup -q @@ -36,11 +39,15 @@ %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/* +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:08:19 aredridel +- adapterised + Revision 1.1 2005/08/27 15:07:59 aredridel - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 17:45:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-util-util-macros.spec - use just name in BuildRoot In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:45:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use just name in BuildRoot ---- Files affected: SPECS: xorg-util-util-macros.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.2 SPECS/xorg-util-util-macros.spec:1.3 --- SPECS/xorg-util-util-macros.spec:1.2 Sat Aug 27 17:05:06 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:45:25 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRoot: %{tmpdir}/util-macros-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Autoconf macros for xorg. @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 15:45:25 qboosh +- use just name in BuildRoot + Revision 1.2 2005/08/27 15:05:06 qboosh - existing Group, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 18:12:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 16:12:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.1 -> 1.2) , xorg-proto-compositeproto.spec (1.2 -> 1.3) , xorg-proto-damageproto.spec (1.2 -> 1.3) , xorg-proto-dmxproto.spec (1.1 -> 1.2) , xorg-proto-evieext.spec (1.1 -> 1.2) , xorg-proto-fixesproto.spec (1.2 -> 1.3) , xorg-proto-fontcacheproto.spec (1.1 -> 1.2) , xorg-proto-fontsproto.spec (1.1 -> 1.2) , xorg-proto-glproto.spec (1.1 -> 1.2) , xorg-proto-inputproto.spec (1.1 -> 1.2) , xorg-proto-kbproto.spec (1.1 -> 1.2) , xorg-proto-panoramixproto.spec (1.2 -> 1.3) , xorg-proto-printproto.spec (1.1 -> 1.2) , xorg-proto-randrproto.spec (1.2 -> 1.3) , xorg-proto-recordproto.spec (1.2 -> 1.3) , xorg-proto-renderproto.spec (1.2 -> 1.3) , xorg-proto-resourceproto.spec (1.2 -> 1.3) , xorg-proto-scrnsaverproto.spec (1.1 -> 1.2) , xorg-proto-trapproto.spec (1.1 -> 1.2) , xorg-proto-videoproto.spec (1.1 -> 1.2) , xorg-proto-xcmiscproto.spec (1.1 -> 1.2) , xorg-proto-xextproto.spec (1.2 -> 1.3) , xorg-proto-xf86bigfontproto.spec (1.1 -> 1.2) , xorg-proto-xf86dgaproto.spec (1.1 -> 1.2) , xorg-proto-xf86driproto.spec (1.1 -> 1.2) , xorg-proto-xf86miscproto.spec (1.1 -> 1.2) , xorg-proto-xf86rushproto.spec (1.1 -> 1.2) , xorg-proto-xf86vidmodeproto.spec (1.1 -> 1.2) , xorg-proto-xproto.spec (1.2 -> 1.3) , xorg-proto-xproxymanagementprotocol.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.1 SPECS/xorg-proto-bigreqsproto.spec:1.2 --- SPECS/xorg-proto-bigreqsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3243 $, $Date$ -# Summary: BigReqs protocol and ancillary headers Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Name: xorg-proto-bigreqsproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/bigreqsproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,10 +23,9 @@ %description -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %package devel Summary: BigReqs protocol and ancillary headers -Summary(pl): bigreqsproto +Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Group: X11/Development/Libraries %description devel @@ -37,11 +34,9 @@ %description devel -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %prep %setup -q -n bigreqsproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -50,7 +45,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -58,23 +52,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/bigreqsproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.2 SPECS/xorg-proto-compositeproto.spec:1.3 --- SPECS/xorg-proto-compositeproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3259 $, $Date$ -# Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze Name: xorg-proto-compositeproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/compositeproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Composite i pomocnicze. - %package devel Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Composite i pomocnicze. - %prep %setup -q -n compositeproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/compositeproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.2 SPECS/xorg-proto-damageproto.spec:1.3 --- SPECS/xorg-proto-damageproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3262 $, $Date$ -# Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze Name: xorg-proto-damageproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/damageproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Damage i pomocnicze. - %package devel Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Damage i pomocnicze. - %prep %setup -q -n damageproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/damageproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.1 SPECS/xorg-proto-dmxproto.spec:1.2 --- SPECS/xorg-proto-dmxproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3325 $, $Date$ -# Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze Name: xorg-proto-dmxproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/dmxproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u DMX i pomocnicze. - %package devel Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze. @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u DMX i pomocnicze. - %prep %setup -q -n dmxproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/dmxproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.1 SPECS/xorg-proto-evieext.spec:1.2 --- SPECS/xorg-proto-evieext.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3274 $, $Date$ -# Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze Name: xorg-proto-evieext @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/evieext-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u EvIE i pomocnicze. - %package devel Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u EvIE i pomocnicze. - %prep %setup -q -n evieext-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/evieproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.2 SPECS/xorg-proto-fixesproto.spec:1.3 --- SPECS/xorg-proto-fixesproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3264 $, $Date$ -# Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze Name: xorg-proto-fixesproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fixesproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fixes i pomocnicze. - %package devel Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze @@ -40,11 +37,9 @@ %description devel -l pl Nag??wki protoko?u Fixes i pomocnicze. - %prep %setup -q -n fixesproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -53,7 +48,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -61,23 +55,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fixesproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.1 SPECS/xorg-proto-fontcacheproto.spec:1.2 --- SPECS/xorg-proto-fontcacheproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3275 $, $Date$ -# Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze Name: xorg-proto-fontcacheproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fontcacheproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %package devel Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %prep %setup -q -n fontcacheproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fontcacheproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.1 SPECS/xorg-proto-fontsproto.spec:1.2 --- SPECS/xorg-proto-fontsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3232 $, $Date$ -# Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze Name: xorg-proto-fontsproto @@ -15,7 +13,7 @@ BuildRequires: automake BuildRequires: pkg-config BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/fontsproto-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fonts i pomocnicze. - %package devel Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fonts i pomocnicze. - %prep %setup -q -n fontsproto-%{version} - %build %{__aclocal} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.1&r2=1.2&f=u From megabajt at pld-linux.org Sat Aug 27 19:29:10 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 09:39:25 2005 Subject: CVSROOT: users - changed email In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 17:29:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - changed email ---- Files affected: CVSROOT: users (1.387 -> 1.388) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.387 CVSROOT/users:1.388 --- CVSROOT/users:1.387 Fri Aug 26 16:07:03 2005 +++ CVSROOT/users Sat Aug 27 19:29:05 2005 @@ -148,7 +148,7 @@ matipl:matipl@ds.pg.gda.pl:Mateusz Kami?ski matkor:mateusz@ant.gliwice.pl:Mateusz Korniak matowy:matowy@tlen.pl:Mateusz Murawski -megabajt:mailinggrup@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl +megabajt:megabajt25@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl mguevara:mguevara@acn.waw.pl:Marek Guevara Braun michuz:michuz@linux.ipartner.com.pl:Micha? Zawalich mick3y:mmmick3y@gmail.com:Jakub Mateusz Mikusek ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.387&r2=1.388&f=u From wiget at pld-linux.org Sat Aug 27 19:37:45 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-lib-libXfont.spec - freebsd patch not needed on linux In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:37:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - freebsd patch not needed on linux ---- Files affected: SPECS: xorg-lib-libXfont.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.2 SPECS/xorg-lib-libXfont.spec:1.3 --- SPECS/xorg-lib-libXfont.spec:1.2 Wed Aug 17 22:10:46 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 19:37:40 2005 @@ -10,7 +10,6 @@ Group: X11/Libraries Source0: http://xorg.freedesktop.org/X11R7.0-RC0/lib/libXfont-%{version}.tar.bz2 # Source0-md5: 7566ddf06a209656c0e4814d5739e8c1 -Patch0: libXfont-freebsd.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake @@ -80,8 +79,6 @@ %prep %setup -q -n libXfont-%{version} -%patch0 -p1 - %build %{__libtoolize} @@ -138,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:37:40 wiget +- freebsd patch not needed on linux + Revision 1.2 2005/08/17 20:10:46 qboosh - Obsoletes for old xlibs or separate packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.2&r2=1.3&f=u From wiget at pld-linux.org Sat Aug 27 19:38:23 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-lib-libfontenc.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-libfontenc.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.1 SPECS/xorg-lib-libfontenc.spec:1.2 --- SPECS/xorg-lib-libfontenc.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:38:15 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xproto-devel %description devel @@ -123,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:15 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:38:53 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-lib-liblbxutil.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-liblbxutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.1 SPECS/xorg-lib-liblbxutil.spec:1.2 --- SPECS/xorg-lib-liblbxutil.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:38:48 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xextproto-devel %description devel @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:48 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:43:06 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 17:43:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - s/pkg-config/pkgconfig/ in BR: ---- Files affected: SPECS: xorg-app-appres.spec (1.1 -> 1.2) , xorg-app-bdftopcf.spec (1.1 -> 1.2) , xorg-app-beforelight.spec (1.1 -> 1.2) , xorg-app-bitmap.spec (1.1 -> 1.2) , xorg-app-editres.spec (1.1 -> 1.2) , xorg-app-fonttosfnt.spec (1.1 -> 1.2) , xorg-app-fslsfonts.spec (1.1 -> 1.2) , xorg-app-fstobdf.spec (1.1 -> 1.2) , xorg-app-iceauth.spec (1.1 -> 1.2) , xorg-app-ico.spec (1.1 -> 1.2) , xorg-app-lbxproxy.spec (1.1 -> 1.2) , xorg-app-listres.spec (1.1 -> 1.2) , xorg-app-luit.spec (1.1 -> 1.2) , xorg-app-mkfontdir.spec (1.1 -> 1.2) , xorg-app-mkfontscale.spec (1.1 -> 1.2) , xorg-app-oclock.spec (1.1 -> 1.2) , xorg-app-pclcomp.spec (1.1 -> 1.2) , xorg-app-proxymngr.spec (1.1 -> 1.2) , xorg-app-rgb.spec (1.1 -> 1.2) , xorg-app-rstart.spec (1.1 -> 1.2) , xorg-app-scripts.spec (1.1 -> 1.2) , xorg-app-setxkbmap.spec (1.1 -> 1.2) , xorg-app-showfont.spec (1.1 -> 1.2) , xorg-app-smproxy.spec (1.1 -> 1.2) , xorg-app-twm.spec (1.1 -> 1.2) , xorg-app-viewres.spec (1.1 -> 1.2) , xorg-app-x11perf.spec (1.1 -> 1.2) , xorg-app-xauth.spec (1.1 -> 1.2) , xorg-app-xbiff.spec (1.1 -> 1.2) , xorg-app-xcalc.spec (1.1 -> 1.2) , xorg-app-xclipboard.spec (1.1 -> 1.2) , xorg-app-xclock.spec (1.1 -> 1.2) , xorg-app-xcmsdb.spec (1.1 -> 1.2) , xorg-app-xconsole.spec (1.1 -> 1.2) , xorg-app-xcursorgen.spec (1.1 -> 1.2) , xorg-app-xdbedizzy.spec (1.1 -> 1.2) , xorg-app-xditview.spec (1.1 -> 1.2) , xorg-app-xdpyinfo.spec (1.1 -> 1.2) , xorg-app-xedit.spec (1.1 -> 1.2) , xorg-app-xev.spec (1.1 -> 1.2) , xorg-app-xeyes.spec (1.1 -> 1.2) , xorg-app-xf86dga.spec (1.1 -> 1.2) , xorg-app-xfd.spec (1.1 -> 1.2) , xorg-app-xfontsel.spec (1.1 -> 1.2) , xorg-app-xfs.spec (1.1 -> 1.2) , xorg-app-xfsinfo.spec (1.1 -> 1.2) , xorg-app-xfwp.spec (1.1 -> 1.2) , xorg-app-xgamma.spec (1.1 -> 1.2) , xorg-app-xgc.spec (1.1 -> 1.2) , xorg-app-xhost.spec (1.1 -> 1.2) , xorg-app-xkbcomp.spec (1.1 -> 1.2) , xorg-app-xkbevd.spec (1.1 -> 1.2) , xorg-app-xkbprint.spec (1.1 -> 1.2) , xorg-app-xkbutils.spec (1.1 -> 1.2) , xorg-app-xkill.spec (1.1 -> 1.2) , xorg-app-xlogo.spec (1.1 -> 1 .2) , xorg-app-xlsatoms.spec (1.1 -> 1.2) , xorg-app-xlsclients.spec (1.1 -> 1.2) , xorg-app-xlsfonts.spec (1.1 -> 1.2) , xorg-app-xmag.spec (1.1 -> 1.2) , xorg-app-xman.spec (1.1 -> 1.2) , xorg-app-xmessage.spec (1.1 -> 1.2) , xorg-app-xmh.spec (1.1 -> 1.2) , xorg-app-xmodmap.spec (1.1 -> 1.2) , xorg-app-xmore.spec (1.1 -> 1.2) , xorg-app-xphelloworld.spec (1.1 -> 1.2) , xorg-app-xplsprinters.spec (1.1 -> 1.2) , xorg-app-xpr.spec (1.1 -> 1.2) , xorg-app-xprehashprinterlist.spec (1.1 -> 1.2) , xorg-app-xprop.spec (1.1 -> 1.2) , xorg-app-xrandr.spec (1.1 -> 1.2) , xorg-app-xrdb.spec (1.1 -> 1.2) , xorg-app-xrefresh.spec (1.1 -> 1.2) , xorg-app-xset.spec (1.1 -> 1.2) , xorg-app-xsetmode.spec (1.1 -> 1.2) , xorg-app-xsetpointer.spec (1.1 -> 1.2) , xorg-app-xsetroot.spec (1.1 -> 1.2) , xorg-app-xsm.spec (1.1 -> 1.2) , xorg-app-xstdcmap.spec (1.1 -> 1.2) , xorg-app-xtrap.spec (1.1 -> 1.2) , xorg-app-xvidtune.spec (1.1 -> 1.2) , xorg-app-xvinfo.spec (1.1 -> 1.2) , xorg-app-xwd.spec (1.1 -> 1.2) , xorg-app-xwininfo.spec (1.1 -> 1.2) , xorg-app-xwud.spec (1.1 -> 1.2) , xorg-font-encodings.spec (1.1 -> 1.2) , xorg-font-font-adobe-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-type1.spec (1.1 -> 1.2) , xorg-font-font-alias.spec (1.1 -> 1.2) , xorg-font-font-arabic-misc.spec (1.1 -> 1.2) , xorg-font-font-bh-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-ttf.spec (1.1 -> 1.2) , xorg-font-font-bh-type1.spec (1.1 -> 1.2) , xorg-font-font-bitstream-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-type1.spec (1.1 -> 1.2) , xorg-font-font-cronyx-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-cursor-misc.spec (1.1 -> 1.2) , xorg-font-font-daewoo-misc.spec (1.1 -> 1.2) , xorg-font-font-dec-misc.spec (1.1 -> 1.2) , xorg -font-font-ibm-type1.spec (1.1 -> 1.2) , xorg-font-font-isas-misc.spec (1.1 -> 1.2) , xorg-font-font-jis-misc.spec (1.1 -> 1.2) , xorg-font-font-micro-misc.spec (1.1 -> 1.2) , xorg-font-font-misc-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-misc-misc.spec (1.1 -> 1.2) , xorg-font-font-mutt-misc.spec (1.1 -> 1.2) , xorg-font-font-schumacher-misc.spec (1.1 -> 1.2) , xorg-font-font-screen-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-sony-misc.spec (1.1 -> 1.2) , xorg-font-font-sun-misc.spec (1.1 -> 1.2) , xorg-font-font-util.spec (1.1 -> 1.2) , xorg-font-font-winitzki-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-xfree86-type1.spec (1.1 -> 1.2) , xorg-lib-libFS.spec (1.1 -> 1.2) , xorg-lib-libICE.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.2 -> 1.3) , xorg-lib-libX11.spec (1.2 -> 1.3) , xorg-lib-libXScrnSaver.spec (1.1 -> 1.2) , xorg-lib-libXTrap.spec (1.1 -> 1.2) , xorg-lib-libXau.spec (1.2 -> 1.3) , xorg-lib-libXaw.spec (1.2 -> 1.3) , xorg-lib-libXcomposite.spec (1.2 -> 1.3) , xorg-lib-libXcursor.spec (1.2 -> 1.3) , xorg-lib-libXdamage.spec (1.2 -> 1.3) , xorg-lib-libXdmcp.spec (1.2 -> 1.3) , xorg-lib-libXevie.spec (1.1 -> 1.2) , xorg-lib-libXext.spec (1.2 -> 1.3) , xorg-lib-libXfixes.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.1 -> 1.2) , xorg-lib-libXft.spec (1.2 -> 1.3) , xorg-lib-libXi.spec (1.2 -> 1.3) , xorg-lib-libXinerama.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.2 -> 1.3) , xorg-lib-libXpm.spec (1.2 -> 1.3) , xorg-lib-libXprintAppUtil.spec (1.1 -> 1.2) , xorg-lib-libXprintUtil.spec (1.1 -> 1.2) , xorg-lib-libXrandr.spec (1.2 -> 1.3) , xorg-lib-libXrender.spec (1.2 -> 1.3) , xorg-lib-libXres.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.2 -> 1.3) , xorg-lib-libXtst.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.2 -> 1.3) , xorg-lib-libXvMC.spec (1.1 -> 1.2) , xorg-lib-libXxf86dga.spec (1.1 -> 1.2) , xorg-lib-libXxf86misc.spec (1.1 -> 1.2) , xorg-lib-libXxf86vm.spec (1.1 -> 1.2) , xorg-lib-libdmx.spec (1.1 -> 1.2) , xorg-lib-libfontenc.s pec (1.2 -> 1.3) , xorg-lib-liblbxutil.spec (1.2 -> 1.3) , xorg-lib-liboldX.spec (1.1 -> 1.2) , xorg-lib-libxkbfile.spec (1.1 -> 1.2) , xorg-lib-libxkbui.spec (1.1 -> 1.2) , xorg-lib-xtrans.spec (1.2 -> 1.3) , xorg-proto-bigreqsproto.spec (1.2 -> 1.3) , xorg-proto-compositeproto.spec (1.3 -> 1.4) , xorg-proto-damageproto.spec (1.3 -> 1.4) , xorg-proto-dmxproto.spec (1.2 -> 1.3) , xorg-proto-evieext.spec (1.2 -> 1.3) , xorg-proto-fixesproto.spec (1.3 -> 1.4) , xorg-proto-fontcacheproto.spec (1.2 -> 1.3) , xorg-proto-fontsproto.spec (1.2 -> 1.3) , xorg-proto-glproto.spec (1.2 -> 1.3) , xorg-proto-inputproto.spec (1.2 -> 1.3) , xorg-proto-kbproto.spec (1.2 -> 1.3) , xorg-proto-panoramixproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.2 -> 1.3) , xorg-proto-randrproto.spec (1.3 -> 1.4) , xorg-proto-recordproto.spec (1.3 -> 1.4) , xorg-proto-renderproto.spec (1.3 -> 1.4) , xorg-proto-resourceproto.spec (1.3 -> 1.4) , xorg-proto-scrnsaverproto.spec (1.2 -> 1.3) , xorg-proto-trapproto.spec (1.2 -> 1.3) , xorg-proto-videoproto.spec (1.2 -> 1.3) , xorg-proto-xcmiscproto.spec (1.2 -> 1.3) , xorg-proto-xextproto.spec (1.3 -> 1.4) , xorg-proto-xf86bigfontproto.spec (1.2 -> 1.3) , xorg-proto-xf86dgaproto.spec (1.2 -> 1.3) , xorg-proto-xf86driproto.spec (1.2 -> 1.3) , xorg-proto-xf86miscproto.spec (1.2 -> 1.3) , xorg-proto-xf86rushproto.spec (1.2 -> 1.3) , xorg-proto-xf86vidmodeproto.spec (1.2 -> 1.3) , xorg-proto-xproto.spec (1.3 -> 1.4) , xorg-proto-xproxymanagementprotocol.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.1 SPECS/xorg-app-appres.spec:1.2 --- SPECS/xorg-app-appres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.1 SPECS/xorg-app-bdftopcf.spec:1.2 --- SPECS/xorg-app-bdftopcf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.1 SPECS/xorg-app-beforelight.spec:1.2 --- SPECS/xorg-app-beforelight.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.1 SPECS/xorg-app-bitmap.spec:1.2 --- SPECS/xorg-app-bitmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.1 SPECS/xorg-app-editres.spec:1.2 --- SPECS/xorg-app-editres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.1 SPECS/xorg-app-fonttosfnt.spec:1.2 --- SPECS/xorg-app-fonttosfnt.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.1 SPECS/xorg-app-fslsfonts.spec:1.2 --- SPECS/xorg-app-fslsfonts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.1 SPECS/xorg-app-fstobdf.spec:1.2 --- SPECS/xorg-app-fstobdf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.1 SPECS/xorg-app-iceauth.spec:1.2 --- SPECS/xorg-app-iceauth.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.1 SPECS/xorg-app-ico.spec:1.2 --- SPECS/xorg-app-ico.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/ico-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.1 SPECS/xorg-app-lbxproxy.spec:1.2 --- SPECS/xorg-app-lbxproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 19:42:47 2005 @@ -20,7 +20,7 @@ BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel BuildRoot: %{tmpdir}/lbxproxy-%{version}-root-%(id -u -n) @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.1 SPECS/xorg-app-listres.spec:1.2 --- SPECS/xorg-app-listres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/listres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.1 SPECS/xorg-app-luit.spec:1.2 --- SPECS/xorg-app-luit.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/luit-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.1 SPECS/xorg-app-mkfontdir.spec:1.2 --- SPECS/xorg-app-mkfontdir.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 19:42:47 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontdir-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.1 SPECS/xorg-app-mkfontscale.spec:1.2 --- SPECS/xorg-app-mkfontscale.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: freetype-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontscale-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.1 SPECS/xorg-app-oclock.spec:1.2 --- SPECS/xorg-app-oclock.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/oclock-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.1 SPECS/xorg-app-pclcomp.spec:1.2 --- SPECS/xorg-app-pclcomp.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/pclcomp-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.1 SPECS/xorg-app-proxymngr.spec:1.2 --- SPECS/xorg-app-proxymngr.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRoot: %{tmpdir}/proxymngr-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.1 SPECS/xorg-app-rgb.spec:1.2 --- SPECS/xorg-app-rgb.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel BuildRoot: %{tmpdir}/rgb-%{version}-root-%(id -u -n) @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.1 SPECS/xorg-app-rstart.spec:1.2 --- SPECS/xorg-app-rstart.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/rstart-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.1 SPECS/xorg-app-scripts.spec:1.2 --- SPECS/xorg-app-scripts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/scripts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.1 SPECS/xorg-app-setxkbmap.spec:1.2 --- SPECS/xorg-app-setxkbmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/setxkbmap-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.1 SPECS/xorg-app-showfont.spec:1.2 --- SPECS/xorg-app-showfont.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/showfont-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.1 SPECS/xorg-app-smproxy.spec:1.2 --- SPECS/xorg-app-smproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/smproxy-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.1 SPECS/xorg-app-twm.spec:1.2 --- SPECS/xorg-app-twm.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/twm-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 19:56:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:25 2005 Subject: SPECS: xorg-lib-libdmx.spec, xorg-lib-libfontenc.spec, xorg-lib-li... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 17:56:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, ported back to Linux ---- Files affected: SPECS: xorg-lib-libdmx.spec (1.2 -> 1.3) , xorg-lib-libfontenc.spec (1.3 -> 1.4) , xorg-lib-libFS.spec (1.2 -> 1.3) , xorg-lib-libICE.spec (1.3 -> 1.4) , xorg-lib-liblbxutil.spec (1.3 -> 1.4) , xorg-lib-liboldX.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.3 -> 1.4) , xorg-lib-libX11.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.3 -> 1.4) , xorg-lib-libXaw.spec (1.3 -> 1.4) , xorg-lib-libXcomposite.spec (1.3 -> 1.4) , xorg-lib-libXcursor.spec (1.3 -> 1.4) , xorg-lib-libXdamage.spec (1.3 -> 1.4) , xorg-lib-libXdmcp.spec (1.3 -> 1.4) , xorg-lib-libXevie.spec (1.2 -> 1.3) , xorg-lib-libXext.spec (1.3 -> 1.4) , xorg-lib-libXfixes.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.4 -> 1.5) , xorg-lib-libXft.spec (1.3 -> 1.4) , xorg-lib-libXinerama.spec (1.3 -> 1.4) , xorg-lib-libXi.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.2 -> 1.3) , xorg-lib-libxkbui.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.3 -> 1.4) , xorg-lib-libXpm.spec (1.3 -> 1.4) , xorg-lib-libXprintAppUtil.spec (1.2 -> 1.3) , xorg-lib-libXprintUtil.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.3 -> 1.4) , xorg-lib-libXrender.spec (1.3 -> 1.4) , xorg-lib-libXres.spec (1.3 -> 1.4) , xorg-lib-libXScrnSaver.spec (1.2 -> 1.3) , xorg-lib-libXTrap.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.3 -> 1.4) , xorg-lib-libXtst.spec (1.3 -> 1.4) , xorg-lib-libXvMC.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.2 -> 1.3) , xorg-lib-libXxf86misc.spec (1.2 -> 1.3) , xorg-lib-libXxf86vm.spec (1.2 -> 1.3) , xorg-lib-xtrans.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libdmx.spec diff -u SPECS/xorg-lib-libdmx.spec:1.2 SPECS/xorg-lib-libdmx.spec:1.3 --- SPECS/xorg-lib-libdmx.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libdmx.spec Sat Aug 27 19:56:05 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3328 $, $Date$ -# Summary: dmx library Summary(pl): Biblioteka dmx Name: xorg-lib-libdmx @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-dmxproto-devel -BuildRequires: xorg-lib-libXext-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-proto-dmxproto-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libdmx-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 %define _mandir %{_prefix}/man @@ -29,14 +27,13 @@ %description -l pl Biblioteka dmx. - %package devel Summary: Header files libdmx development Summary(pl): Pliki nag??wkowe do biblioteki libdmx Group: X11/Development/Libraries -Requires: xorg-lib-libdmx = %{version}-%{release} -Requires: xorg-proto-dmxproto-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXext-devel +Requires: xorg-proto-dmxproto-devel %description devel dmx library. @@ -50,12 +47,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libdmx. - %package static -Summary: Static libdmx libraries -Summary(pl): Biblioteki statyczne libdmx -Group: Development/Libraries -Requires: xorg-lib-libdmx-devel = %{version}-%{release} +Summary: Static libdmx library +Summary(pl): Biblioteka statyczna libdmx +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static dmx library. @@ -65,13 +61,11 @@ %description static -l pl Biblioteka dmx. -Pakiet zawiera statyczn? biblioteke libdmx. - +Pakiet zawiera statyczn? bibliotek? libdmx. %prep %setup -q -n libdmx-%{version} - %build %{__libtoolize} %{__aclocal} @@ -82,7 +76,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -90,40 +83,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libdmx.so.* - +%attr(755,root,root) %{_libdir}/libdmx.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdmx.so %{_libdir}/libdmx.la -%attr(755,root,wheel) %{_libdir}/libdmx.so %{_pkgconfigdir}/dmx.pc %{_mandir}/man3/*.3* - %files static %defattr(644,root,root,755) %{_libdir}/libdmx.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:05 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.3 SPECS/xorg-lib-libfontenc.spec:1.4 --- SPECS/xorg-lib-libfontenc.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3278 $, $Date$ -# Summary: fontenc library Summary(pl): Biblioteka fontenc Name: xorg-lib-libfontenc @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel -BuildRoot: %{tmpdir}/libfontenc-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka fontenc. - %package devel Summary: Header files libfontenc development Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries -Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel +Requires: zlib-devel %description devel fontenc library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libfontenc. - %package static -Summary: Static libfontenc libraries -Summary(pl): Biblioteki statyczne libfontenc -Group: Development/Libraries -Requires: xorg-lib-libfontenc-devel = %{version}-%{release} +Summary: Static libfontenc library +Summary(pl): Biblioteka statyczna libfontenc +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static fontenc library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczn? bibliotek? libfontenc. - %prep %setup -q -n libfontenc-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,40 +82,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libfontenc.so.* - +%attr(755,root,root) %{_libdir}/libfontenc.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libfontenc.so %{_libdir}/libfontenc.la -%attr(755,root,wheel) %{_libdir}/libfontenc.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/fontenc.pc - %files static %defattr(644,root,root,755) %{_libdir}/libfontenc.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.2 SPECS/xorg-lib-libFS.spec:1.3 --- SPECS/xorg-lib-libFS.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3245 $, $Date$ -# Summary: FS library Summary(pl): Biblioteka FS Name: xorg-lib-libFS @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-fontsproto-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel -BuildRoot: %{tmpdir}/libFS-%{version}-root-%(id -u -n) +BuildRequires: xorg-proto-fontsproto-devel +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka FS. - %package devel Summary: Header files libFS development Summary(pl): Pliki nag??wkowe do biblioteki libFS Group: X11/Development/Libraries -Requires: xorg-lib-libFS = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-fontsproto-devel %description devel @@ -48,12 +45,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libFS. - %package static -Summary: Static libFS libraries -Summary(pl): Biblioteki statyczne libFS -Group: Development/Libraries -Requires: xorg-lib-libFS-devel = %{version}-%{release} +Summary: Static libFS library +Summary(pl): Biblioteka statyczna libFS +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static FS library. @@ -65,11 +61,9 @@ Pakiet zawiera statyczn? bibliotek? libFS. - %prep %setup -q -n libFS-%{version} - %build %{__libtoolize} %{__aclocal} @@ -80,7 +74,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -88,40 +81,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libFS.so.* - +%attr(755,root,root) %{_libdir}/libFS.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libFS.so %{_libdir}/libFS.la -%attr(755,root,wheel) %{_libdir}/libFS.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/libfs.pc - %files static %defattr(644,root,root,755) %{_libdir}/libFS.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.3 SPECS/xorg-lib-libICE.spec:1.4 --- SPECS/xorg-lib-libICE.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ - -# Summary: Inter Client Exchange library Summary(pl): Biblioteka wymiany mi?dzy klientami Name: xorg-lib-libICE @@ -15,10 +13,10 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-util-util-macros Obsoletes: libICE -BuildRoot: %{tmpdir}/libICE-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka wymiany mi?dzy klientami. - %package devel Summary: Header files libICE development Summary(pl): Pliki nag??wkowe do biblioteki libICE Group: X11/Development/Libraries -Requires: xorg-lib-libICE = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel Obsoletes: libICE-devel @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libICE. - %package static -Summary: Static libICE libraries -Summary(pl): Biblioteki statyczne libICE -Group: Development/Libraries -Requires: xorg-lib-libICE-devel = %{version}-%{release} +Summary: Static libICE library +Summary(pl): Biblioteka statyczna libICE +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} Obsoletes: libICE-static %description static @@ -67,7 +63,6 @@ Pakiet zawiera statyczn? bibliotek? libICE. - %prep %setup -q -n libICE-%{version} @@ -93,21 +88,18 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/libICE.so.* - +%attr(755,root,root) %{_libdir}/libICE.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/ICE/*.h +%attr(755,root,root) %{_libdir}/libICE.so %{_libdir}/libICE.la -%attr(755,root,wheel) %{_libdir}/libICE.so +%{_includedir}/X11/ICE/*.h %{_pkgconfigdir}/ice.pc - %files static %defattr(644,root,root,755) %{_libdir}/libICE.a @@ -118,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.3 SPECS/xorg-lib-liblbxutil.spec:1.4 --- SPECS/xorg-lib-liblbxutil.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3331 $, $Date$ -# Summary: lbxutil library Summary(pl): Biblioteka lbxutil Name: xorg-lib-liblbxutil @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel -BuildRoot: %{tmpdir}/liblbxutil-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka lbxutil. - %package devel Summary: Header files liblbxutil development Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries -Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xextproto-devel +Requires: zlib-devel %description devel lbxutil library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki liblbxutil. - %package static -Summary: Static liblbxutil libraries -Summary(pl): Biblioteki statyczne liblbxutil -Group: Development/Libraries -Requires: xorg-lib-liblbxutil-devel = %{version}-%{release} +Summary: Static liblbxutil library +Summary(pl): Biblioteka statyczna liblbxutil +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static lbxutil library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczna bibliotek? liblbxutil. - %prep %setup -q -n liblbxutil-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,39 +82,36 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/liblbxutil.so.* - +%attr(755,root,root) %{_libdir}/liblbxutil.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liblbxutil.so %{_libdir}/liblbxutil.la -%attr(755,root,wheel) %{_libdir}/liblbxutil.so %{_pkgconfigdir}/lbxutil.pc - %files static %defattr(644,root,root,755) %{_libdir}/liblbxutil.a <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 19:57:44 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vim.spec - removed setting perms in %install - sorted %veri... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 17:57:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed setting perms in %install - sorted %verify flags ---- Files affected: SPECS: vim.spec (1.308 -> 1.309) ---- Diffs: ================================================================ Index: SPECS/vim.spec diff -u SPECS/vim.spec:1.308 SPECS/vim.spec:1.309 --- SPECS/vim.spec:1.308 Wed Aug 10 12:44:43 2005 +++ SPECS/vim.spec Sat Aug 27 19:57:38 2005 @@ -1003,17 +1003,17 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/* %if %{with static} -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim -install -m755 src/bin/vim.static $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim +install src/bin/vim.static $RPM_BUILD_ROOT/bin/vi %else -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim %endif %if %{with ispell} -install -m755 src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell +install src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell %endif -install -m755 src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd -install -m755 src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor +install src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd +install src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1 @@ -1039,19 +1039,19 @@ install %{SOURCE14} $RPM_BUILD_ROOT%{_desktopdir} %if %{with athena} -install -m755 src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena +install src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena install %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with motif} -install -m755 src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif +install src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif install %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gnome} -install -m755 src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome +install src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome install %{SOURCE13} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gtk} -install -m755 src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk +install src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk ln -sf gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/gview @@ -1065,7 +1065,7 @@ install runtime/vim48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/vim.png %if %{with kde} -install -m755 src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim +install src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim install -d $RPM_BUILD_ROOT%{_desktopdir}/kde install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22}/actions install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps @@ -1083,7 +1083,7 @@ %if %{with bonobo} install -d $RPM_BUILD_ROOT%{_libdir}/bonobo/servers install src/bin/Vim_Control.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers -install -m755 src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} +install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} %endif bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -1174,8 +1174,8 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/vimtutor %dir %{_sysconfdir}/vim -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/vimrc -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/gvimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/vimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/gvimrc %dir %{_datadir}/vim %dir %{_datadir}/vim/v* @@ -1183,8 +1183,8 @@ %doc %{_datadir}/vim/v*/doc/*.txt %lang(pl) %doc %{_datadir}/vim/v*/doc/*.plx %attr(755,root,root) %{_datadir}/vim/v*/doc/*.pl -%verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags -%lang(pl) %verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags-pl +%verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags +%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags-pl %{_datadir}/vim/v*/ftplugin %{_datadir}/vim/v*/indent %{_datadir}/vim/v*/keymap @@ -1337,6 +1337,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.309 2005/08/27 17:57:38 darekr +- removed setting perms in %install +- sorted %verify flags + Revision 1.308 2005/08/10 10:44:43 saq - awk.patch for bug#945 (avoid gawk dependency) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.308&r2=1.309&f=u From qboosh at pld-linux.org Sat Aug 27 20:00:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-data-xbitmaps.spec, xorg-data-xcursor-themes.spec, xor... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:00:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ---- Files affected: SPECS: xorg-data-xbitmaps.spec (1.1 -> 1.2) , xorg-data-xcursor-themes.spec (1.1 -> 1.2) , xorg-data-xkbdata.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xbitmaps.spec diff -u SPECS/xorg-data-xbitmaps.spec:1.1 SPECS/xorg-data-xbitmaps.spec:1.2 --- SPECS/xorg-data-xbitmaps.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xbitmaps.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3338 $, $Date$ -# Summary: X bitmaps data Summary(pl): Bitmapy dla X Name: xorg-data-xbitmaps @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config -BuildRoot: %{tmpdir}/xbitmaps-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,11 +23,9 @@ %description -l pl Bitmapy dla X. - %prep %setup -q -n xbitmaps-%{version} - %build %{__aclocal} %{__autoconf} @@ -39,7 +35,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -47,23 +42,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_includedir}/X11/bitmaps %{_pkgconfigdir}/xbitmaps.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.1 SPECS/xorg-data-xcursor-themes.spec:1.2 --- SPECS/xorg-data-xcursor-themes.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3431 $, $Date$ -# Summary: Cursor themes Summary(pl): Motywy kursor?w Name: xorg-data-xcursor-themes @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xcursorgen -BuildRoot: %{tmpdir}/xcursor-themes-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Cursor themes. @@ -24,7 +22,6 @@ %description -l pl Motywy kursor?w. - %package -n xcursor-theme-handhelds Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" @@ -36,7 +33,6 @@ %description -n xcursor-theme-handhelds -l pl Motyw kursor?w "handhelds" dla X11. - %package -n xcursor-theme-redglass Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" @@ -48,7 +44,6 @@ %description -n xcursor-theme-redglass -l pl Motyw kursor?w "redglass" dla X11. - %package -n xcursor-theme-whiteglass Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" @@ -60,11 +55,9 @@ %description -n xcursor-theme-whiteglass -l pl Motyw kursor?w "whiteglass" dla X11. - %prep %setup -q -n xcursor-themes-%{version} - %build %{__aclocal} %{__autoconf} @@ -74,18 +67,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files -n xcursor-theme-handhelds %defattr(644,root,root,755) %{_iconsdir}/handhelds @@ -98,13 +88,15 @@ %defattr(644,root,root,755) %{_iconsdir}/whiteglass - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xkbdata.spec diff -u SPECS/xorg-data-xkbdata.spec:1.1 SPECS/xorg-data-xkbdata.spec:1.2 --- SPECS/xorg-data-xkbdata.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xkbdata.spec Sat Aug 27 20:00:37 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3432 $, $Date$ -# Summary: XKB data Summary(pl): Dane dla XKB Name: xorg-data-xkbdata @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xkbcomp -BuildRoot: %{tmpdir}/xkbdata-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -26,11 +24,9 @@ %description -l pl Dane dla XKB. - %prep %setup -q -n xkbdata-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/xkb - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:37 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xbitmaps.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xkbdata.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 20:02:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-data-xcursor-themes.spec - Obsoletes for XFree86/X11 X... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:02:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) ---- Files affected: SPECS: xorg-data-xcursor-themes.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.2 SPECS/xorg-data-xcursor-themes.spec:1.3 --- SPECS/xorg-data-xcursor-themes.spec:1.2 Sat Aug 27 20:00:36 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:02:54 2005 @@ -26,6 +26,7 @@ Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" Group: Themes +Obsoletes: XcursorTheme-handhelds %description -n xcursor-theme-handhelds Cursors theme "handhelds" for X11. @@ -37,6 +38,7 @@ Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" Group: Themes +Obsoletes: XcursorTheme-redglass %description -n xcursor-theme-redglass Cursors theme "redglass" for X11. @@ -48,6 +50,7 @@ Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" Group: Themes +Obsoletes: XcursorTheme-whiteglass %description -n xcursor-theme-whiteglass Cursors theme "whiteglass" for X11. @@ -94,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:02:54 qboosh +- Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) + Revision 1.2 2005/08/27 18:00:36 qboosh - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Sat Aug 27 20:20:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: tkabber.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:20:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/tkabber.spec diff -u SPECS/tkabber.spec:1.16 SPECS/tkabber.spec:1.17 --- SPECS/tkabber.spec:1.16 Thu Nov 4 12:22:33 2004 +++ SPECS/tkabber.spec Sat Aug 27 20:20:15 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client Summary(pl): Klient Jabbera oparty o Tk Name: tkabber -Version: 0.9.7 -Release: 3 +Version: 0.9.8 +Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 41a0f24239415edb8e3d2cd86e532f38 +Source0: http://files.jabberstudio.org/%{name}/%{name}-%{version}.tar.gz +# Source0-md5: 2112b44822e4ea7d9292fddc93a89fd1 Source1: %{name}.desktop Source2: %{name}.png Icon: tkabber.xpm @@ -58,6 +58,7 @@ %prep %setup -q +sed -i -e 's#ifaceck##g' Makefile %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 18:20:15 arekm +- up to 0.9.8 + Revision 1.16 2004/11/04 11:22:33 paladine - rel 3 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 20:20:33 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: tkabber-0.9.8.tar.gz Message-ID: <28603.1125166833@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-0.9.8.tar.gz 2112b44822e4ea7d9292fddc93a89fd1 tkabber-0.9.8.tar.gz Size: 719377 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: tkabber-plugins-0.9.8.tar.gz Message-ID: <1067.1125167037@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-plugins-0.9.8.tar.gz de03ba77d6b6d28f128acf5cfdd90d28 tkabber-plugins-0.9.8.tar.gz Size: 394599 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: tkabber-plugins.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:23:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber-plugins.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/tkabber-plugins.spec diff -u SPECS/tkabber-plugins.spec:1.1 SPECS/tkabber-plugins.spec:1.2 --- SPECS/tkabber-plugins.spec:1.1 Mon Nov 22 10:55:25 2004 +++ SPECS/tkabber-plugins.spec Sat Aug 27 20:23:50 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client plugins Summary(pl): Wtyczki do Klienta Jabbera opartego o Tk Name: tkabber-plugins -Version: 0.9.7 +Version: 0.9.8 Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 837d9e3de0cd7253a1dd6e2940d103d7 +Source0: http://files.jabberstudio.org/tkabber/%{name}-%{version}.tar.gz +# Source0-md5: de03ba77d6b6d28f128acf5cfdd90d28 URL: http://tkabber.jabber.ru/ Requires: tkabber >= %{version}-%{release} BuildArch: noarch @@ -44,6 +44,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:23:50 arekm +- up to 0.9.8 + Revision 1.1 2004/11/22 09:55:25 arekm - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber-plugins.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 20:29:14 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: tidy.spec - updated to 0.20050826;fix build In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:29:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.20050826;fix build ---- Files affected: SPECS: tidy.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/tidy.spec diff -u SPECS/tidy.spec:1.41 SPECS/tidy.spec:1.42 --- SPECS/tidy.spec:1.41 Sun Jul 17 19:37:46 2005 +++ SPECS/tidy.spec Sat Aug 27 20:29:09 2005 @@ -2,15 +2,15 @@ Summary: Utility to clean up and pretty print HTML files Summary(pl): Narz?dzie do porz?dkowania kodu HTML Name: tidy -Version: 0.20041025 +Version: 0.20050826 Release: 1 Epoch: 1 License: distributable Group: Applications/Text Source0: http://tidy.sourceforge.net/src/tidy_src.tgz -# Source0-md5: bf6cd062ed43babdba5ade9378be2db3 +# Source0-md5: 7c2ee7186b0384f92f65ec61266e0661 Source1: http://tidy.sourceforge.net/docs/tidy_docs.tgz -# Source1-md5: 04338149bdd3e10753101bc5dff8acd8 +# Source1-md5: 2e6533fc48b077ff6243deaf21a781de URL: http://tidy.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -69,9 +69,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -mv -f htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 %clean rm -rf $RPM_BUILD_ROOT @@ -84,7 +81,6 @@ %doc htmldoc/* %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* -%{_mandir}/man1/* %files devel %defattr(644,root,root,755) @@ -102,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 18:29:09 darekr +- updated to 0.20050826;fix build + Revision 1.41 2005/07/17 17:37:46 darekr - unify sourceforge URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tidy.spec?r1=1.41&r2=1.42&f=u From darekr at pld-linux.org Sat Aug 27 20:29:16 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: tidy_src.tgz tidy_docs.tgz Message-ID: <8564.1125167356@distfiles.pld-linux.org> Files fetched: 2 STORED: http://tidy.sourceforge.net/src/tidy_src.tgz 7c2ee7186b0384f92f65ec61266e0661 tidy_src.tgz Size: 255812 bytes STORED: http://tidy.sourceforge.net/docs/tidy_docs.tgz 2e6533fc48b077ff6243deaf21a781de tidy_docs.tgz Size: 150359 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 20:42:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-font-encodings.spec, xorg-font-font-adobe-100dpi.spec, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, better Group; TODO: use PLD fonts infrastructure ---- Files affected: SPECS: xorg-font-encodings.spec (1.2 -> 1.3) , xorg-font-font-adobe-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-type1.spec (1.2 -> 1.3) , xorg-font-font-alias.spec (1.2 -> 1.3) , xorg-font-font-arabic-misc.spec (1.2 -> 1.3) , xorg-font-font-bh-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-ttf.spec (1.2 -> 1.3) , xorg-font-font-bh-type1.spec (1.2 -> 1.3) , xorg-font-font-bitstream-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-type1.spec (1.2 -> 1.3) , xorg-font-font-cronyx-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-cursor-misc.spec (1.2 -> 1.3) , xorg-font-font-daewoo-misc.spec (1.2 -> 1.3) , xorg-font-font-dec-misc.spec (1.2 -> 1.3) , xorg-font-font-ibm-type1.spec (1.2 -> 1.3) , xorg-font-font-isas-misc.spec (1.2 -> 1.3) , xorg-font-font-jis-misc.spec (1.2 -> 1.3) , xorg-font-font-micro-misc.spec (1.2 -> 1.3) , xorg-font-font-misc-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-misc-misc.spec (1.2 -> 1.3) , xorg-font-font-mutt-misc.spec (1.2 -> 1.3) , xorg-font-font-schumacher-misc.spec (1.2 -> 1.3) , xorg-font-font-screen-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-sony-misc.spec (1.2 -> 1.3) , xorg-font-font-sun-misc.spec (1.2 -> 1.3) , xorg-font-font-util.spec (1.2 -> 1.3) , xorg-font-font-winitzki-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-xfree86-type1.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-font-encodings.spec diff -u SPECS/xorg-font-encodings.spec:1.2 SPECS/xorg-font-encodings.spec:1.3 --- SPECS/xorg-font-encodings.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-encodings.spec Sat Aug 27 20:42:17 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# $Rev: 3433 $, $Date$ -# -Summary: encodings -Summary(pl): encodings +Summary: X font encodings database +Summary(pl): Baza kodowa? font?w X Name: xorg-font-encodings Version: 0.99.0 Release: 0.02 @@ -14,23 +12,21 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-mkfontscale BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/encodings-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -encodings +X font encodings database. %description -l pl -encodings - +Baza kodowa? font?w X. %prep %setup -q -n encodings-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -39,29 +35,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_fontsdir}/encodings - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-100dpi.spec diff -u SPECS/xorg-font-font-adobe-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3190 $, $Date$ -# -Summary: font-adobe-100dpi -Summary(pl): font-adobe-100dpi +Summary: adobe-100dpi font +Summary(pl): Font adobe-100dpi Name: xorg-font-font-adobe-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-100dpi-%{version}.tar.bz2 # Source0-md5: a54f67c67177d2759efe92ad1f68a162 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-100dpi +adobe-100dpi font. %description -l pl -font-adobe-100dpi - +Font adobe-100dpi. %prep %setup -q -n font-adobe-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-75dpi.spec diff -u SPECS/xorg-font-font-adobe-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3189 $, $Date$ -# -Summary: font-adobe-75dpi -Summary(pl): font-adobe-75dpi +Summary: adobe-75dpi font +Summary(pl): Font adobe-75dpi Name: xorg-font-font-adobe-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-75dpi-%{version}.tar.bz2 # Source0-md5: 46c7a56e2085c087ca84f6836d91fd9c URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-75dpi +adobe-75dpi font. %description -l pl -font-adobe-75dpi - +Font adobe-75dpi. %prep %setup -q -n font-adobe-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-100dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3192 $, $Date$ -# -Summary: font-adobe-utopia-100dpi -Summary(pl): font-adobe-utopia-100dpi +Summary: adobe-utopia-100dpi font +Summary(pl): Font adobe-utopia-100dpi Name: xorg-font-font-adobe-utopia-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-100dpi-%{version}.tar.bz2 # Source0-md5: 71ef49367ab5a43209ecfd931aaf5d72 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-100dpi +adobe-utopia-100dpi font. %description -l pl -font-adobe-utopia-100dpi - +Font adobe-utopia-100dpi. %prep %setup -q -n font-adobe-utopia-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-75dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3191 $, $Date$ -# -Summary: font-adobe-utopia-75dpi -Summary(pl): font-adobe-utopia-75dpi +Summary: adobe-utopia-75dpi font +Summary(pl): Font adobe-utopia-75dpi Name: xorg-font-font-adobe-utopia-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-75dpi-%{version}.tar.bz2 # Source0-md5: c7084294f3038a5d26ffbafc2651864d URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-75dpi +adobe-utopia-75dpi font. %description -l pl -font-adobe-utopia-75dpi - +Font adobe-utopia-75dpi. %prep %setup -q -n font-adobe-utopia-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-type1.spec diff -u SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 SPECS/xorg-font-font-adobe-utopia-type1.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-type1.spec Sat Aug 27 20:42:17 2005 @@ -1,38 +1,34 @@ # $Revision$, $Date$ -# $Rev: 3193 $, $Date$ -# -Summary: font-adobe-utopia-type1 -Summary(pl): font-adobe-utopia-type1 +Summary: adobe-utopia-type1 font +Summary(pl): Font adobe-utopia-type1 Name: xorg-font-font-adobe-utopia-type1 Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-type1-%{version}.tar.bz2 # Source0-md5: 05e63b72340f34611de54db6940cb050 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: fontconfig +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-app-bdftopcf BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-type1-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-type1 +adobe-utopia-type1 font. %description -l pl -font-adobe-utopia-type1 - +Font adobe-utopia-type1. %prep %setup -q -n font-adobe-utopia-type1-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,29 +37,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/Type1/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-alias.spec diff -u SPECS/xorg-font-font-alias.spec:1.2 SPECS/xorg-font-font-alias.spec:1.3 --- SPECS/xorg-font-font-alias.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-alias.spec Sat Aug 27 20:42:17 2005 @@ -1,33 +1,29 @@ # $Revision$, $Date$ -# $Rev: 3194 $, $Date$ -# -Summary: font-alias -Summary(pl): font-alias +Summary: X font alias databases +Summary(pl): Baza alias?w font?w X Name: xorg-font-font-alias Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-alias-%{version}.tar.bz2 # Source0-md5: 31344a6fad2a6ec4c8ab995231d5a746 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-alias-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-alias +X font alias databases. %description -l pl -font-alias - +Baza alias?w font?w X. %prep %setup -q -n font-alias-%{version} - %build %{__aclocal} %{__autoconf} @@ -36,18 +32,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/fonts.alias @@ -55,13 +48,15 @@ %{_libdir}/X11/fonts/cyrillic/fonts.alias %{_libdir}/X11/fonts/misc/fonts.alias - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-arabic-misc.spec diff -u SPECS/xorg-font-font-arabic-misc.spec:1.2 SPECS/xorg-font-font-arabic-misc.spec:1.3 --- SPECS/xorg-font-font-arabic-misc.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-arabic-misc.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3195 $, $Date$ -# -Summary: font-arabic-misc -Summary(pl): font-arabic-misc +Summary: arabic-misc font +Summary(pl): Font arabic-misc Name: xorg-font-font-arabic-misc Version: 0.99.0 Release: 0.01 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 20:46:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-lib-libSM.spec, xorg-lib-libXdamage.spec, xorg-lib-lib... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:46:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - just name in BuildRoot ---- Files affected: SPECS: xorg-lib-libSM.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.4 SPECS/xorg-lib-libSM.spec:1.5 --- SPECS/xorg-lib-libSM.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-xtrans-devel BuildRequires: xorg-util-util-macros Obsoletes: libSM -BuildRoot: %{tmpdir}/libSM-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.4 SPECS/xorg-lib-libXdamage.spec:1.5 --- SPECS/xorg-lib-libXdamage.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-proto-damageproto-devel BuildRequires: xorg-util-util-macros Obsoletes: libXdamage -BuildRoot: %{tmpdir}/libXdamage-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.3 SPECS/xorg-lib-libXprintAppUtil.spec:1.4 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 20:46:09 2005 @@ -15,7 +15,7 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXprintUtil-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libXprintAppUtil-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.4 SPECS/xorg-lib-xtrans.spec:1.5 --- SPECS/xorg-lib-xtrans.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 20:46:09 2005 @@ -13,7 +13,7 @@ BuildRequires: automake BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/xtrans-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -81,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 20:48:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SOURCES: ncurses-ac_hack.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:48:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: ncurses-ac_hack.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sat Aug 27 20:49:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: mysql-ruby.spec - up to 2.7 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 18:49:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.7 ---- Files affected: SPECS: mysql-ruby.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/mysql-ruby.spec diff -u SPECS/mysql-ruby.spec:1.10 SPECS/mysql-ruby.spec:1.11 --- SPECS/mysql-ruby.spec:1.10 Mon Aug 15 11:07:00 2005 +++ SPECS/mysql-ruby.spec Sat Aug 27 20:48:57 2005 @@ -4,12 +4,12 @@ Summary: MySQL module for Ruby Summary(pl): Modu? MySQL dla j?zyka Ruby Name: mysql-ruby -Version: 2.6 +Version: 2.7 Release: 1 License: GPL Group: Development/Languages Source0: http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz -# Source0-md5: 1eefc5a170de0752816c5092869426b1 +# Source0-md5: c6668900e68f0d6a137612c818d5fd01 URL: http://www.tmtm.org/mysql/ruby/ BuildRequires: mysql-devel BuildRequires: ruby @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/27 18:48:57 aredridel +- up to 2.7 + Revision 1.10 2005/08/15 09:07:00 qboosh - updated Source0 URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-ruby.spec?r1=1.10&r2=1.11&f=u From aredridel at pld-linux.org Sat Aug 27 20:49:17 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: mysql-ruby-2.7.tar.gz Message-ID: <3202.1125168557@distfiles.pld-linux.org> Files fetched: 1 STORED: http://tmtm.org/downloads/mysql/ruby/mysql-ruby-2.7.tar.gz c6668900e68f0d6a137612c818d5fd01 mysql-ruby-2.7.tar.gz Size: 29620 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sat Aug 27 20:50:52 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-font-font-util.spec - kill /usr/X11R6 In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 18:50:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-font-font-util.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-font-font-util.spec diff -u SPECS/xorg-font-font-util.spec:1.3 SPECS/xorg-font-font-util.spec:1.4 --- SPECS/xorg-font-font-util.spec:1.3 Sat Aug 27 20:42:17 2005 +++ SPECS/xorg-font-font-util.spec Sat Aug 27 20:50:47 2005 @@ -15,10 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man -%define _datadir /usr/share - %description Font utilities. @@ -62,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:50:47 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 18:42:17 qboosh - cleanups, better Group; TODO: use PLD fonts infrastructure ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 20:58:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: cedega-commercial.spec - fix URL In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:58:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix URL ---- Files affected: SPECS: cedega-commercial.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/cedega-commercial.spec diff -u SPECS/cedega-commercial.spec:1.14 SPECS/cedega-commercial.spec:1.15 --- SPECS/cedega-commercial.spec:1.14 Mon Jul 25 22:20:58 2005 +++ SPECS/cedega-commercial.spec Sat Aug 27 20:58:11 2005 @@ -10,7 +10,7 @@ Source0: cedega_%{version}-1.i386.tgz # NoSource0-md5: 589a5d4a698e8c7336c67c1afb6d986d NoSource: 0 -URL: http://www.transgaming.com +URL: http://www.transgaming.com/ BuildRequires: sed >= 4.0 BuildRequires: tar Requires: OpenGL @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/27 18:58:11 darekr +- fix URL + Revision 1.14 2005/07/25 20:20:58 adamg - updated to 4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cedega-commercial.spec?r1=1.14&r2=1.15&f=u From darekr at pld-linux.org Sat Aug 27 21:32:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SOURCES: vim2html-VIM_HOME.patch (NEW) - fix VIM_HOME variable In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:32:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix VIM_HOME variable ---- Files affected: SOURCES: vim2html-VIM_HOME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vim2html-VIM_HOME.patch diff -u /dev/null SOURCES/vim2html-VIM_HOME.patch:1.1 --- /dev/null Sat Aug 27 21:32:03 2005 +++ SOURCES/vim2html-VIM_HOME.patch Sat Aug 27 21:31:57 2005 @@ -0,0 +1,12 @@ +--- vim2html-1.46/vim2html.orig 2005-08-27 21:24:57.000000000 +0200 ++++ vim2html-1.46/vim2html 2005-08-27 21:25:18.000000000 +0200 +@@ -16,7 +16,8 @@ + + #### begin user settings #### + +-VIM_HOME="`find /usr/share/vim -type d -mindepth 1 -maxdepth 1|sort|tail -1`" ++ ++VIM_HOME="`find /usr/share/vim -mindepth 1 -maxdepth 1 -type d |sort|head -1`" + # normally, no need to change this + + SYNTAX="$VIM_HOME/syntax/2html.vim" ================================================================ From wiget at pld-linux.org Sat Aug 27 21:33:04 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:33:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.3 -> 1.4) , xorg-proto-compositeproto.spec (1.4 -> 1.5) , xorg-proto-damageproto.spec (1.4 -> 1.5) , xorg-proto-dmxproto.spec (1.3 -> 1.4) , xorg-proto-evieext.spec (1.3 -> 1.4) , xorg-proto-fixesproto.spec (1.4 -> 1.5) , xorg-proto-fontcacheproto.spec (1.3 -> 1.4) , xorg-proto-fontsproto.spec (1.3 -> 1.4) , xorg-proto-inputproto.spec (1.3 -> 1.4) , xorg-proto-kbproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.3 -> 1.4) , xorg-proto-randrproto.spec (1.4 -> 1.5) , xorg-proto-recordproto.spec (1.4 -> 1.5) , xorg-proto-renderproto.spec (1.4 -> 1.5) , xorg-proto-resourceproto.spec (1.4 -> 1.5) , xorg-proto-scrnsaverproto.spec (1.3 -> 1.4) , xorg-proto-trapproto.spec (1.3 -> 1.4) , xorg-proto-videoproto.spec (1.3 -> 1.4) , xorg-proto-xcmiscproto.spec (1.3 -> 1.4) , xorg-proto-xextproto.spec (1.4 -> 1.5) , xorg-proto-xf86bigfontproto.spec (1.3 -> 1.4) , xorg-proto-xf86dgaproto.spec (1.3 -> 1.4) , xorg-proto-xf86driproto.spec (1.3 -> 1.4) , xorg-proto-xf86miscproto.spec (1.3 -> 1.4) , xorg-proto-xf86rushproto.spec (1.3 -> 1.4) , xorg-proto-xf86vidmodeproto.spec (1.3 -> 1.4) , xorg-proto-xproto.spec (1.4 -> 1.5) , xorg-proto-xproxymanagementprotocol.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.3 SPECS/xorg-proto-bigreqsproto.spec:1.4 --- SPECS/xorg-proto-bigreqsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description BigReqs protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.4 SPECS/xorg-proto-compositeproto.spec:1.5 --- SPECS/xorg-proto-compositeproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Composite protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.4 SPECS/xorg-proto-damageproto.spec:1.5 --- SPECS/xorg-proto-damageproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Damage protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.3 SPECS/xorg-proto-dmxproto.spec:1.4 --- SPECS/xorg-proto-dmxproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description DMX protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.3 SPECS/xorg-proto-evieext.spec:1.4 --- SPECS/xorg-proto-evieext.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description EvIE protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.4 SPECS/xorg-proto-fixesproto.spec:1.5 --- SPECS/xorg-proto-fixesproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fixes protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.3 SPECS/xorg-proto-fontcacheproto.spec:1.4 --- SPECS/xorg-proto-fontcacheproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fontcache protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.3 SPECS/xorg-proto-fontsproto.spec:1.4 --- SPECS/xorg-proto-fontsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fonts protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-inputproto.spec diff -u SPECS/xorg-proto-inputproto.spec:1.3 SPECS/xorg-proto-inputproto.spec:1.4 --- SPECS/xorg-proto-inputproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-inputproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Input protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-kbproto.spec diff -u SPECS/xorg-proto-kbproto.spec:1.3 SPECS/xorg-proto-kbproto.spec:1.4 --- SPECS/xorg-proto-kbproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-kbproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description KB protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-printproto.spec diff -u SPECS/xorg-proto-printproto.spec:1.3 SPECS/xorg-proto-printproto.spec:1.4 --- SPECS/xorg-proto-printproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-printproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Print protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-randrproto.spec diff -u SPECS/xorg-proto-randrproto.spec:1.4 SPECS/xorg-proto-randrproto.spec:1.5 --- SPECS/xorg-proto-randrproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-randrproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Randr protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-recordproto.spec diff -u SPECS/xorg-proto-recordproto.spec:1.4 SPECS/xorg-proto-recordproto.spec:1.5 --- SPECS/xorg-proto-recordproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-recordproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Record protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-renderproto.spec diff -u SPECS/xorg-proto-renderproto.spec:1.4 SPECS/xorg-proto-renderproto.spec:1.5 --- SPECS/xorg-proto-renderproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-renderproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Render protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-resourceproto.spec diff -u SPECS/xorg-proto-resourceproto.spec:1.4 SPECS/xorg-proto-resourceproto.spec:1.5 --- SPECS/xorg-proto-resourceproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-resourceproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Resource protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-scrnsaverproto.spec diff -u SPECS/xorg-proto-scrnsaverproto.spec:1.3 SPECS/xorg-proto-scrnsaverproto.spec:1.4 --- SPECS/xorg-proto-scrnsaverproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-scrnsaverproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description ScrnSaver protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-trapproto.spec diff -u SPECS/xorg-proto-trapproto.spec:1.3 SPECS/xorg-proto-trapproto.spec:1.4 --- SPECS/xorg-proto-trapproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-trapproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Trap protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-videoproto.spec diff -u SPECS/xorg-proto-videoproto.spec:1.3 SPECS/xorg-proto-videoproto.spec:1.4 --- SPECS/xorg-proto-videoproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-videoproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Video protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xcmiscproto.spec diff -u SPECS/xorg-proto-xcmiscproto.spec:1.3 SPECS/xorg-proto-xcmiscproto.spec:1.4 --- SPECS/xorg-proto-xcmiscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xcmiscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XCMisc protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xextproto.spec diff -u SPECS/xorg-proto-xextproto.spec:1.4 SPECS/xorg-proto-xextproto.spec:1.5 --- SPECS/xorg-proto-xextproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xextproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XExt protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86bigfontproto.spec diff -u SPECS/xorg-proto-xf86bigfontproto.spec:1.3 SPECS/xorg-proto-xf86bigfontproto.spec:1.4 --- SPECS/xorg-proto-xf86bigfontproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86bigfontproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86BigFont protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86dgaproto.spec diff -u SPECS/xorg-proto-xf86dgaproto.spec:1.3 SPECS/xorg-proto-xf86dgaproto.spec:1.4 --- SPECS/xorg-proto-xf86dgaproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86dgaproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DGA protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86driproto.spec diff -u SPECS/xorg-proto-xf86driproto.spec:1.3 SPECS/xorg-proto-xf86driproto.spec:1.4 --- SPECS/xorg-proto-xf86driproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86driproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DRI protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86miscproto.spec diff -u SPECS/xorg-proto-xf86miscproto.spec:1.3 SPECS/xorg-proto-xf86miscproto.spec:1.4 --- SPECS/xorg-proto-xf86miscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86miscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Misc protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86rushproto.spec diff -u SPECS/xorg-proto-xf86rushproto.spec:1.3 SPECS/xorg-proto-xf86rushproto.spec:1.4 --- SPECS/xorg-proto-xf86rushproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86rushproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Rush protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 21:33:31 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vim2html.spec - updated to 1.46 - added -VIM_HOME patch, fi... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:33:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.46 - added -VIM_HOME patch, fixed Source0 ---- Files affected: SPECS: vim2html.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/vim2html.spec diff -u SPECS/vim2html.spec:1.1 SPECS/vim2html.spec:1.2 --- SPECS/vim2html.spec:1.1 Sun May 2 13:41:10 2004 +++ SPECS/vim2html.spec Sat Aug 27 21:33:26 2005 @@ -2,13 +2,14 @@ Summary: Vim-editable file converter to HTML Summary(pl): Konwerter edytowalnych plik?w Vima do formatu HTML Name: vim2html -Version: 1.42 +Version: 1.46 Release: 1 License: GPL v2 Group: Applications/Text -Source0: http://norlug.org/~chipster/download_handler/cat5/%{name}-%{version}.tar.gz -# Source0-md5: da1a1c79b17181fdf3d69f2417f90e0b -URL: http://norlug.org/~chipster/vim2html +Source0: http://norlug.org/~chipster/resources/vim2html/%{name}-%{version}.tar.gz +# Source0-md5: 4fcccd28b2a28519bdc65e90120c7204 +URL: http://norlug.org/~chipster/vim2html/ +Patch0: %{name}-VIM_HOME.patch Requires: tidy BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -51,6 +53,10 @@ * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 19:33:26 darekr +- updated to 1.46 +- added -VIM_HOME patch, fixed Source0 + Revision 1.1 2004/05/02 11:41:10 yogib - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim2html.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 21:34:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: vim2html-1.46.tar.gz Message-ID: <6091.1125171251@distfiles.pld-linux.org> Files fetched: 1 STORED: http://norlug.org/~chipster/resources/vim2html/vim2html-1.46.tar.gz 4fcccd28b2a28519bdc65e90120c7204 vim2html-1.46.tar.gz Size: 12065 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sat Aug 27 21:38:15 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vis5d.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:38:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vis5d.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/vis5d.spec diff -u SPECS/vis5d.spec:1.17 SPECS/vis5d.spec:1.18 --- SPECS/vis5d.spec:1.17 Wed Mar 30 17:27:46 2005 +++ SPECS/vis5d.spec Sat Aug 27 21:38:10 2005 @@ -31,7 +31,7 @@ Summary: Vis5d - sample data Summary(pl): Vis5d - przyk?adowe dane Group: X11/Applications -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description data Sample data. @@ -43,7 +43,7 @@ Summary: Vis5d development information Summary(pl): Vis5d - informacje dla programist?w Group: Development -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel Vis5d development information. API and script info. @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/27 19:38:10 darekr +- strict deps + Revision 1.17 2005/03/30 15:27:46 darekr - missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vis5d.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sat Aug 27 21:38:14 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-lib-libFS.spec, xorg-lib-libICE.spec, xorg-lib-libSM.s... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:38:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-lib-libFS.spec (1.3 -> 1.4) , xorg-lib-libICE.spec (1.4 -> 1.5) , xorg-lib-libSM.spec (1.5 -> 1.6) , xorg-lib-libX11.spec (1.4 -> 1.5) , xorg-lib-libXScrnSaver.spec (1.3 -> 1.4) , xorg-lib-libXTrap.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.4 -> 1.5) , xorg-lib-libXaw.spec (1.4 -> 1.5) , xorg-lib-libXcomposite.spec (1.4 -> 1.5) , xorg-lib-libXcursor.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.5 -> 1.6) , xorg-lib-libXdmcp.spec (1.4 -> 1.5) , xorg-lib-libXevie.spec (1.3 -> 1.4) , xorg-lib-libXext.spec (1.4 -> 1.5) , xorg-lib-libXfixes.spec (1.4 -> 1.5) , xorg-lib-libXfont.spec (1.5 -> 1.6) , xorg-lib-libXfontcache.spec (1.3 -> 1.4) , xorg-lib-libXft.spec (1.4 -> 1.5) , xorg-lib-libXi.spec (1.4 -> 1.5) , xorg-lib-libXinerama.spec (1.4 -> 1.5) , xorg-lib-libXmu.spec (1.4 -> 1.5) , xorg-lib-libXp.spec (1.4 -> 1.5) , xorg-lib-libXpm.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.4 -> 1.5) , xorg-lib-libXprintUtil.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.4 -> 1.5) , xorg-lib-libXrender.spec (1.4 -> 1.5) , xorg-lib-libXres.spec (1.4 -> 1.5) , xorg-lib-libXt.spec (1.4 -> 1.5) , xorg-lib-libXtst.spec (1.4 -> 1.5) , xorg-lib-libXv.spec (1.4 -> 1.5) , xorg-lib-libXvMC.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.3 -> 1.4) , xorg-lib-libXxf86misc.spec (1.3 -> 1.4) , xorg-lib-libXxf86vm.spec (1.3 -> 1.4) , xorg-lib-libdmx.spec (1.3 -> 1.4) , xorg-lib-libfontenc.spec (1.4 -> 1.5) , xorg-lib-liblbxutil.spec (1.4 -> 1.5) , xorg-lib-liboldX.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.3 -> 1.4) , xorg-lib-libxkbui.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.3 SPECS/xorg-lib-libFS.spec:1.4 --- SPECS/xorg-lib-libFS.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description FS library. @@ -109,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.4 SPECS/xorg-lib-libICE.spec:1.5 --- SPECS/xorg-lib-libICE.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ Obsoletes: libICE BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Inter Client Exchange library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.5 SPECS/xorg-lib-libSM.spec:1.6 --- SPECS/xorg-lib-libSM.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libSM BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Session Management library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libX11.spec diff -u SPECS/xorg-lib-libX11.spec:1.4 SPECS/xorg-lib-libX11.spec:1.5 --- SPECS/xorg-lib-libX11.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libX11.spec Sat Aug 27 21:38:03 2005 @@ -26,9 +26,6 @@ Obsoletes: libX11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X11 Base library. @@ -126,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXScrnSaver.spec diff -u SPECS/xorg-lib-libXScrnSaver.spec:1.3 SPECS/xorg-lib-libXScrnSaver.spec:1.4 --- SPECS/xorg-lib-libXScrnSaver.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXScrnSaver.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description XScrnSaver library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXTrap.spec diff -u SPECS/xorg-lib-libXTrap.spec:1.3 SPECS/xorg-lib-libXTrap.spec:1.4 --- SPECS/xorg-lib-libXTrap.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXTrap.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XTrap library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXau.spec diff -u SPECS/xorg-lib-libXau.spec:1.4 SPECS/xorg-lib-libXau.spec:1.5 --- SPECS/xorg-lib-libXau.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXau.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXau BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xau - Authorization Protocol for X. @@ -112,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXaw.spec diff -u SPECS/xorg-lib-libXaw.spec:1.4 SPECS/xorg-lib-libXaw.spec:1.5 --- SPECS/xorg-lib-libXaw.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXaw.spec Sat Aug 27 21:38:03 2005 @@ -20,9 +20,6 @@ Obsoletes: libXaw BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Athena Widgets library. @@ -118,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcomposite.spec diff -u SPECS/xorg-lib-libXcomposite.spec:1.4 SPECS/xorg-lib-libXcomposite.spec:1.5 --- SPECS/xorg-lib-libXcomposite.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcomposite.spec Sat Aug 27 21:38:03 2005 @@ -20,8 +20,6 @@ Obsoletes: libXcomposite BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Composite extension library. @@ -114,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcursor.spec diff -u SPECS/xorg-lib-libXcursor.spec:1.4 SPECS/xorg-lib-libXcursor.spec:1.5 --- SPECS/xorg-lib-libXcursor.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcursor.spec Sat Aug 27 21:38:03 2005 @@ -21,9 +21,6 @@ Obsoletes: xcursor BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Cursor - client-side cursor loading library. @@ -120,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.5 SPECS/xorg-lib-libXdamage.spec:1.6 --- SPECS/xorg-lib-libXdamage.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdamage BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Damage extension library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXdmcp.spec diff -u SPECS/xorg-lib-libXdmcp.spec:1.4 SPECS/xorg-lib-libXdmcp.spec:1.5 --- SPECS/xorg-lib-libXdmcp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdmcp.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdmcp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Display Manager Control Protocol library. @@ -113,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXevie.spec diff -u SPECS/xorg-lib-libXevie.spec:1.3 SPECS/xorg-lib-libXevie.spec:1.4 --- SPECS/xorg-lib-libXevie.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXevie.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Evie extension library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXext.spec diff -u SPECS/xorg-lib-libXext.spec:1.4 SPECS/xorg-lib-libXext.spec:1.5 --- SPECS/xorg-lib-libXext.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXext.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXext BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfixes.spec diff -u SPECS/xorg-lib-libXfixes.spec:1.4 SPECS/xorg-lib-libXfixes.spec:1.5 --- SPECS/xorg-lib-libXfixes.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfixes.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXfixes BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Fixes extension library. @@ -114,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.5 SPECS/xorg-lib-libXfont.spec:1.6 --- SPECS/xorg-lib-libXfont.spec:1.5 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 21:38:03 2005 @@ -22,8 +22,6 @@ Obsoletes: libXfont BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X font library used by the X server. @@ -124,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfontcache.spec diff -u SPECS/xorg-lib-libXfontcache.spec:1.3 SPECS/xorg-lib-libXfontcache.spec:1.4 --- SPECS/xorg-lib-libXfontcache.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfontcache.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xfontcache library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXft.spec diff -u SPECS/xorg-lib-libXft.spec:1.4 SPECS/xorg-lib-libXft.spec:1.5 --- SPECS/xorg-lib-libXft.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXft.spec Sat Aug 27 21:38:03 2005 @@ -23,9 +23,6 @@ Obsoletes: xft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xft is a font rendering library for X. @@ -127,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXi.spec diff -u SPECS/xorg-lib-libXi.spec:1.4 SPECS/xorg-lib-libXi.spec:1.5 --- SPECS/xorg-lib-libXi.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXi.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXi BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Input extension library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXinerama.spec diff -u SPECS/xorg-lib-libXinerama.spec:1.4 SPECS/xorg-lib-libXinerama.spec:1.5 --- SPECS/xorg-lib-libXinerama.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXinerama.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXinerama BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Xinerama extension library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXmu.spec diff -u SPECS/xorg-lib-libXmu.spec:1.4 SPECS/xorg-lib-libXmu.spec:1.5 --- SPECS/xorg-lib-libXmu.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXmu.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXmu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Miscellaneous Utilities library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXp.spec diff -u SPECS/xorg-lib-libXp.spec:1.4 SPECS/xorg-lib-libXp.spec:1.5 --- SPECS/xorg-lib-libXp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXp.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description DtPrint extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXpm.spec diff -u SPECS/xorg-lib-libXpm.spec:1.4 SPECS/xorg-lib-libXpm.spec:1.5 --- SPECS/xorg-lib-libXpm.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXpm.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: xpm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Pixmap library. @@ -130,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.4 SPECS/xorg-lib-libXprintAppUtil.spec:1.5 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.4 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 21:38:03 2005 @@ -17,8 +17,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XprintAppUtil library. @@ -108,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXprintUtil.spec diff -u SPECS/xorg-lib-libXprintUtil.spec:1.3 SPECS/xorg-lib-libXprintUtil.spec:1.4 --- SPECS/xorg-lib-libXprintUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintUtil.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.5&r2=1.6&f=u From darekr at pld-linux.org Sat Aug 27 21:51:43 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: darkstat.spec - removed NEWS from %doc (see ChangeLog) In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:51:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed NEWS from %doc (see ChangeLog) ---- Files affected: SPECS: darkstat.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/darkstat.spec diff -u SPECS/darkstat.spec:1.4 SPECS/darkstat.spec:1.5 --- SPECS/darkstat.spec:1.4 Thu Aug 4 10:22:49 2005 +++ SPECS/darkstat.spec Sat Aug 27 21:51:36 2005 @@ -42,7 +42,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog README %attr(755,root,root) %{_sbindir}/* %{_mandir}/man1/* @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:51:36 darekr +- removed NEWS from %doc (see ChangeLog) + Revision 1.4 2005/08/04 08:22:49 nail2k - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkstat.spec?r1=1.4&r2=1.5&f=u From areq at pld-linux.org Sat Aug 27 22:00:32 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: linux-2.6.12.5.tar.bz2 mISDN-CVS-2005-07-06.tar.bz2 Message-ID: <12167.1125172832@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.5.tar.bz2 076f0dc714112c764c790fbaef19e228 linux-2.6.12.5.tar.bz2 STORED: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-CVS-2005-07-06.tar.bz2 f8892d49e00e3fa26e65e22084edd472 mISDN-CVS-2005-07-06.tar.bz2 Size: 259290 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 22:00:29 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS (LINUX_2_6): kernel.spec - add mISDN (ix86 only) In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:00:29 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - add mISDN (ix86 only) ---- Files affected: SPECS: kernel.spec (1.441.2.1168 -> 1.441.2.1169) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1168 SPECS/kernel.spec:1.441.2.1169 --- SPECS/kernel.spec:1.441.2.1168 Fri Aug 26 14:52:05 2005 +++ SPECS/kernel.spec Sat Aug 27 22:00:19 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.4 +%define _rel 0.5 %define _netfilter_snap 20050801 @@ -115,6 +115,7 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 +%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -168,6 +169,10 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config +Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 +# Source100-md5: f8892d49e00e3fa26e65e22084edd472 + + Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -621,7 +626,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} +%setup -q -n linux-%{version}%{_rc} -a 100 %patch0 -p1 %patch1 -p0 @@ -743,6 +748,12 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig +# mISDN +%ifarch %{ix86} +cd mISDN-%{mISDN_version} +./std2kern -k ../ +%endif + %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1490,6 +1501,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1169 2005/08/27 20:00:19 areq +- add mISDN (ix86 only) + Revision 1.441.2.1168 2005/08/26 12:52:05 baggins - uncommented atm patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1168&r2=1.441.2.1169&f=u From wiget at pld-linux.org Sat Aug 27 22:00:58 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:00:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, kill /usr/X11R6 ---- Files affected: SPECS: xorg-app-appres.spec (1.2 -> 1.3) , xorg-app-bdftopcf.spec (1.2 -> 1.3) , xorg-app-beforelight.spec (1.2 -> 1.3) , xorg-app-bitmap.spec (1.2 -> 1.3) , xorg-app-editres.spec (1.2 -> 1.3) , xorg-app-fonttosfnt.spec (1.2 -> 1.3) , xorg-app-fslsfonts.spec (1.2 -> 1.3) , xorg-app-fstobdf.spec (1.2 -> 1.3) , xorg-app-iceauth.spec (1.2 -> 1.3) , xorg-app-ico.spec (1.2 -> 1.3) , xorg-app-lbxproxy.spec (1.2 -> 1.3) , xorg-app-listres.spec (1.2 -> 1.3) , xorg-app-luit.spec (1.2 -> 1.3) , xorg-app-mkfontdir.spec (1.2 -> 1.3) , xorg-app-mkfontscale.spec (1.2 -> 1.3) , xorg-app-oclock.spec (1.2 -> 1.3) , xorg-app-pclcomp.spec (1.2 -> 1.3) , xorg-app-proxymngr.spec (1.2 -> 1.3) , xorg-app-rgb.spec (1.2 -> 1.3) , xorg-app-rstart.spec (1.2 -> 1.3) , xorg-app-scripts.spec (1.2 -> 1.3) , xorg-app-setxkbmap.spec (1.2 -> 1.3) , xorg-app-showfont.spec (1.2 -> 1.3) , xorg-app-smproxy.spec (1.2 -> 1.3) , xorg-app-twm.spec (1.2 -> 1.3) , xorg-app-viewres.spec (1.2 -> 1.3) , xorg-app-x11perf.spec (1.2 -> 1.3) , xorg-app-xauth.spec (1.2 -> 1.3) , xorg-app-xbiff.spec (1.2 -> 1.3) , xorg-app-xcalc.spec (1.2 -> 1.3) , xorg-app-xclipboard.spec (1.2 -> 1.3) , xorg-app-xclock.spec (1.2 -> 1.3) , xorg-app-xcmsdb.spec (1.2 -> 1.3) , xorg-app-xconsole.spec (1.2 -> 1.3) , xorg-app-xcursorgen.spec (1.2 -> 1.3) , xorg-app-xdbedizzy.spec (1.2 -> 1.3) , xorg-app-xditview.spec (1.2 -> 1.3) , xorg-app-xdpyinfo.spec (1.2 -> 1.3) , xorg-app-xedit.spec (1.2 -> 1.3) , xorg-app-xev.spec (1.2 -> 1.3) , xorg-app-xeyes.spec (1.2 -> 1.3) , xorg-app-xf86dga.spec (1.2 -> 1.3) , xorg-app-xfd.spec (1.2 -> 1.3) , xorg-app-xfontsel.spec (1.2 -> 1.3) , xorg-app-xfs.spec (1.2 -> 1.3) , xorg-app-xfsinfo.spec (1.2 -> 1.3) , xorg-app-xfwp.spec (1.2 -> 1.3) , xorg-app-xgamma.spec (1.2 -> 1.3) , xorg-app-xgc.spec (1.2 -> 1.3) , xorg-app-xhost.spec (1.2 -> 1.3) , xorg-app-xkbcomp.spec (1.2 -> 1.3) , xorg-app-xkbevd.spec (1.2 -> 1.3) , xorg-app-xkbprint.spec (1.2 -> 1.3) , xorg-app-xkbutils.spec (1.2 -> 1.3) , xorg-app-xkill.spec (1.2 -> 1.3) , xorg-app-xlogo.spec (1.2 -> 1 .3) , xorg-app-xlsatoms.spec (1.2 -> 1.3) , xorg-app-xlsclients.spec (1.2 -> 1.3) , xorg-app-xlsfonts.spec (1.2 -> 1.3) , xorg-app-xmag.spec (1.2 -> 1.3) , xorg-app-xman.spec (1.2 -> 1.3) , xorg-app-xmessage.spec (1.2 -> 1.3) , xorg-app-xmh.spec (1.2 -> 1.3) , xorg-app-xmodmap.spec (1.2 -> 1.3) , xorg-app-xmore.spec (1.2 -> 1.3) , xorg-app-xphelloworld.spec (1.2 -> 1.3) , xorg-app-xplsprinters.spec (1.2 -> 1.3) , xorg-app-xpr.spec (1.2 -> 1.3) , xorg-app-xprehashprinterlist.spec (1.2 -> 1.3) , xorg-app-xprop.spec (1.2 -> 1.3) , xorg-app-xrandr.spec (1.2 -> 1.3) , xorg-app-xrdb.spec (1.2 -> 1.3) , xorg-app-xrefresh.spec (1.2 -> 1.3) , xorg-app-xset.spec (1.2 -> 1.3) , xorg-app-xsetmode.spec (1.2 -> 1.3) , xorg-app-xsetpointer.spec (1.2 -> 1.3) , xorg-app-xsetroot.spec (1.2 -> 1.3) , xorg-app-xsm.spec (1.2 -> 1.3) , xorg-app-xstdcmap.spec (1.2 -> 1.3) , xorg-app-xtrap.spec (1.2 -> 1.3) , xorg-app-xvidtune.spec (1.2 -> 1.3) , xorg-app-xvinfo.spec (1.2 -> 1.3) , xorg-app-xwd.spec (1.2 -> 1.3) , xorg-app-xwininfo.spec (1.2 -> 1.3) , xorg-app-xwud.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.2 SPECS/xorg-app-appres.spec:1.3 --- SPECS/xorg-app-appres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3335 $, $Date$ -# Summary: appres application Summary(pl): Aplikacja appres Name: xorg-app-appres @@ -17,10 +15,7 @@ BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description appres application. @@ -28,12 +23,10 @@ %description -l pl Aplikacja appres. - %prep %setup -q -n appres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -43,30 +36,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/appres %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.2 SPECS/xorg-app-bdftopcf.spec:1.3 --- SPECS/xorg-app-bdftopcf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3336 $, $Date$ -# Summary: bdftopcf application Summary(pl): Aplikacja bdftopcf Name: xorg-app-bdftopcf @@ -16,10 +14,7 @@ BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bdftopcf application. @@ -27,11 +22,9 @@ %description -l pl Aplikacja bdftopcf. - %prep %setup -q -n bdftopcf-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,30 +34,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.2 SPECS/xorg-app-beforelight.spec:1.3 --- SPECS/xorg-app-beforelight.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3339 $, $Date$ -# Summary: beforelight application Summary(pl): Aplikacja beforelight Name: xorg-app-beforelight @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description beforelight application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja beforelight. - %prep %setup -q -n beforelight-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light %attr(755,root,wheel) %{_bindir}/beforelight %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.2 SPECS/xorg-app-bitmap.spec:1.3 --- SPECS/xorg-app-bitmap.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3345 $, $Date$ -# Summary: bitmap application Summary(pl): Aplikacja bitmap Name: xorg-app-bitmap @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bitmap application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja bitmap. - %prep %setup -q -n bitmap-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,18 +37,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* @@ -63,13 +53,15 @@ %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.2 SPECS/xorg-app-editres.spec:1.3 --- SPECS/xorg-app-editres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3340 $, $Date$ -# Summary: editres application Summary(pl): Aplikacja editres Name: xorg-app-editres @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description editres application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja editres. - %prep %setup -q -n editres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.2 SPECS/xorg-app-fonttosfnt.spec:1.3 --- SPECS/xorg-app-fonttosfnt.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3341 $, $Date$ -# Summary: fonttosfnt application Summary(pl): Aplikacja fonttosfnt Name: xorg-app-fonttosfnt @@ -20,10 +18,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fonttosfnt application. @@ -31,12 +26,10 @@ %description -l pl Aplikacja fonttosfnt. - %prep %setup -q -n fonttosfnt-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -46,30 +39,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.2 SPECS/xorg-app-fslsfonts.spec:1.3 --- SPECS/xorg-app-fslsfonts.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3342 $, $Date$ -# Summary: fslsfonts application Summary(pl): Aplikacja fslsfonts Name: xorg-app-fslsfonts @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fslsfonts application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fslsfonts. - %prep %setup -q -n fslsfonts-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.2 SPECS/xorg-app-fstobdf.spec:1.3 --- SPECS/xorg-app-fstobdf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3344 $, $Date$ -# Summary: fstobdf application Summary(pl): Aplikacja fstobdf Name: xorg-app-fstobdf @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fstobdf application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fstobdf. - %prep %setup -q -n fstobdf-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.2 SPECS/xorg-app-iceauth.spec:1.3 --- SPECS/xorg-app-iceauth.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3346 $, $Date$ -# Summary: iceauth application Summary(pl): Aplikacja iceauth Name: xorg-app-iceauth @@ -8,7 +6,6 @@ Release: 0.02 License: MIT Group: X11/Application -###### Unknown group! Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/iceauth-%{version}.tar.bz2 # Source0-md5: 64ac4d6ebaf4eec9cdc4d968e0e9840b Patch0: iceauth-man.patch @@ -19,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) - <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.2&r2=1.3&f=u From darekr at pld-linux.org Sat Aug 27 22:01:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vkeybd.spec - kill obsolete "-c" install option In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:01:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill obsolete "-c" install option ---- Files affected: SPECS: vkeybd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vkeybd.spec diff -u SPECS/vkeybd.spec:1.13 SPECS/vkeybd.spec:1.14 --- SPECS/vkeybd.spec:1.13 Fri Nov 5 08:29:06 2004 +++ SPECS/vkeybd.spec Sat Aug 27 22:01:32 2005 @@ -47,8 +47,8 @@ %{__make} install-all \ DESTDIR=$RPM_BUILD_ROOT -install -c %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd -install -c %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd +install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} mv $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd.png rm -f $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_* @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:01:32 darekr +- kill obsolete "-c" install option + Revision 1.13 2004/11/05 07:29:06 ankry - amd64 build fix, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vkeybd.spec?r1=1.13&r2=1.14&f=u From areq at pld-linux.org Sat Aug 27 22:01:34 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:26 2005 Subject: SOURCES (LINUX_2_6): kernel-i386-smp.config, kernel-i386.config - ... In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:01:34 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - MISDN ---- Files affected: SOURCES: kernel-i386-smp.config (1.59.10.104 -> 1.59.10.105) , kernel-i386.config (1.82.10.109 -> 1.82.10.110) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.104 SOURCES/kernel-i386-smp.config:1.59.10.105 --- SOURCES/kernel-i386-smp.config:1.59.10.104 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386-smp.config Sat Aug 27 22:01:28 2005 @@ -1122,6 +1122,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1464,7 +1465,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.109 SOURCES/kernel-i386.config:1.82.10.110 --- SOURCES/kernel-i386.config:1.82.10.109 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386.config Sat Aug 27 22:01:28 2005 @@ -1136,6 +1136,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1480,7 +1481,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.104&r2=1.59.10.105&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.109&r2=1.82.10.110&f=u From wiget at pld-linux.org Sat Aug 27 22:04:21 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:04:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - standard permisions to binaries ---- Files affected: SPECS: xorg-app-appres.spec (1.3 -> 1.4) , xorg-app-bdftopcf.spec (1.3 -> 1.4) , xorg-app-beforelight.spec (1.3 -> 1.4) , xorg-app-bitmap.spec (1.3 -> 1.4) , xorg-app-editres.spec (1.3 -> 1.4) , xorg-app-fonttosfnt.spec (1.3 -> 1.4) , xorg-app-fslsfonts.spec (1.3 -> 1.4) , xorg-app-fstobdf.spec (1.3 -> 1.4) , xorg-app-iceauth.spec (1.3 -> 1.4) , xorg-app-ico.spec (1.3 -> 1.4) , xorg-app-lbxproxy.spec (1.3 -> 1.4) , xorg-app-listres.spec (1.3 -> 1.4) , xorg-app-luit.spec (1.3 -> 1.4) , xorg-app-mkfontdir.spec (1.3 -> 1.4) , xorg-app-mkfontscale.spec (1.3 -> 1.4) , xorg-app-oclock.spec (1.3 -> 1.4) , xorg-app-pclcomp.spec (1.3 -> 1.4) , xorg-app-proxymngr.spec (1.3 -> 1.4) , xorg-app-rgb.spec (1.3 -> 1.4) , xorg-app-rstart.spec (1.3 -> 1.4) , xorg-app-scripts.spec (1.3 -> 1.4) , xorg-app-setxkbmap.spec (1.3 -> 1.4) , xorg-app-showfont.spec (1.3 -> 1.4) , xorg-app-smproxy.spec (1.3 -> 1.4) , xorg-app-twm.spec (1.3 -> 1.4) , xorg-app-viewres.spec (1.3 -> 1.4) , xorg-app-x11perf.spec (1.3 -> 1.4) , xorg-app-xauth.spec (1.3 -> 1.4) , xorg-app-xbiff.spec (1.3 -> 1.4) , xorg-app-xcalc.spec (1.3 -> 1.4) , xorg-app-xclipboard.spec (1.3 -> 1.4) , xorg-app-xclock.spec (1.3 -> 1.4) , xorg-app-xcmsdb.spec (1.3 -> 1.4) , xorg-app-xconsole.spec (1.3 -> 1.4) , xorg-app-xcursorgen.spec (1.3 -> 1.4) , xorg-app-xdbedizzy.spec (1.3 -> 1.4) , xorg-app-xditview.spec (1.3 -> 1.4) , xorg-app-xdpyinfo.spec (1.3 -> 1.4) , xorg-app-xedit.spec (1.3 -> 1.4) , xorg-app-xev.spec (1.3 -> 1.4) , xorg-app-xeyes.spec (1.3 -> 1.4) , xorg-app-xf86dga.spec (1.3 -> 1.4) , xorg-app-xfd.spec (1.3 -> 1.4) , xorg-app-xfontsel.spec (1.3 -> 1.4) , xorg-app-xfs.spec (1.3 -> 1.4) , xorg-app-xfsinfo.spec (1.3 -> 1.4) , xorg-app-xfwp.spec (1.3 -> 1.4) , xorg-app-xgamma.spec (1.3 -> 1.4) , xorg-app-xgc.spec (1.3 -> 1.4) , xorg-app-xhost.spec (1.3 -> 1.4) , xorg-app-xkbcomp.spec (1.3 -> 1.4) , xorg-app-xkbevd.spec (1.3 -> 1.4) , xorg-app-xkbprint.spec (1.3 -> 1.4) , xorg-app-xkbutils.spec (1.3 -> 1.4) , xorg-app-xkill.spec (1.3 -> 1.4) , xorg-app-xlogo.spec (1.3 -> 1 .4) , xorg-app-xlsatoms.spec (1.3 -> 1.4) , xorg-app-xlsclients.spec (1.3 -> 1.4) , xorg-app-xlsfonts.spec (1.3 -> 1.4) , xorg-app-xmag.spec (1.3 -> 1.4) , xorg-app-xman.spec (1.3 -> 1.4) , xorg-app-xmessage.spec (1.3 -> 1.4) , xorg-app-xmh.spec (1.3 -> 1.4) , xorg-app-xmodmap.spec (1.3 -> 1.4) , xorg-app-xmore.spec (1.3 -> 1.4) , xorg-app-xphelloworld.spec (1.3 -> 1.4) , xorg-app-xplsprinters.spec (1.3 -> 1.4) , xorg-app-xpr.spec (1.3 -> 1.4) , xorg-app-xprehashprinterlist.spec (1.3 -> 1.4) , xorg-app-xprop.spec (1.3 -> 1.4) , xorg-app-xrandr.spec (1.3 -> 1.4) , xorg-app-xrdb.spec (1.3 -> 1.4) , xorg-app-xrefresh.spec (1.3 -> 1.4) , xorg-app-xset.spec (1.3 -> 1.4) , xorg-app-xsetmode.spec (1.3 -> 1.4) , xorg-app-xsetpointer.spec (1.3 -> 1.4) , xorg-app-xsetroot.spec (1.3 -> 1.4) , xorg-app-xsm.spec (1.3 -> 1.4) , xorg-app-xstdcmap.spec (1.3 -> 1.4) , xorg-app-xtrap.spec (1.3 -> 1.4) , xorg-app-xvidtune.spec (1.3 -> 1.4) , xorg-app-xvinfo.spec (1.3 -> 1.4) , xorg-app-xwd.spec (1.3 -> 1.4) , xorg-app-xwininfo.spec (1.3 -> 1.4) , xorg-app-xwud.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.3 SPECS/xorg-app-appres.spec:1.4 --- SPECS/xorg-app-appres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/appres +%attr(755,root,root) %{_bindir}/appres %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.3 SPECS/xorg-app-bdftopcf.spec:1.4 --- SPECS/xorg-app-bdftopcf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/bdftopcf +%attr(755,root,root) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.3 SPECS/xorg-app-beforelight.spec:1.4 --- SPECS/xorg-app-beforelight.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light -%attr(755,root,wheel) %{_bindir}/beforelight +%attr(755,root,root) %{_bindir}/beforelight %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.3 SPECS/xorg-app-bitmap.spec:1.4 --- SPECS/xorg-app-bitmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.3 SPECS/xorg-app-editres.spec:1.4 --- SPECS/xorg-app-editres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.3 SPECS/xorg-app-fonttosfnt.spec:1.4 --- SPECS/xorg-app-fonttosfnt.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.3 SPECS/xorg-app-fslsfonts.spec:1.4 --- SPECS/xorg-app-fslsfonts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.3 SPECS/xorg-app-fstobdf.spec:1.4 --- SPECS/xorg-app-fstobdf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.3 SPECS/xorg-app-iceauth.spec:1.4 --- SPECS/xorg-app-iceauth.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.3 SPECS/xorg-app-ico.spec:1.4 --- SPECS/xorg-app-ico.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.3 SPECS/xorg-app-lbxproxy.spec:1.4 --- SPECS/xorg-app-lbxproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 22:04:01 2005 @@ -54,7 +54,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.3 SPECS/xorg-app-listres.spec:1.4 --- SPECS/xorg-app-listres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.3 SPECS/xorg-app-luit.spec:1.4 --- SPECS/xorg-app-luit.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.3 SPECS/xorg-app-mkfontdir.spec:1.4 --- SPECS/xorg-app-mkfontdir.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 22:04:01 2005 @@ -44,7 +44,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.3 SPECS/xorg-app-mkfontscale.spec:1.4 --- SPECS/xorg-app-mkfontscale.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.3 SPECS/xorg-app-oclock.spec:1.4 --- SPECS/xorg-app-oclock.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.3 SPECS/xorg-app-pclcomp.spec:1.4 --- SPECS/xorg-app-pclcomp.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.3 SPECS/xorg-app-proxymngr.spec:1.4 --- SPECS/xorg-app-proxymngr.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/proxymngr/pmconfig %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.3 SPECS/xorg-app-rgb.spec:1.4 --- SPECS/xorg-app-rgb.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/rgb.txt %{_mandir}/man1/*.1* @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.3 SPECS/xorg-app-rstart.spec:1.4 --- SPECS/xorg-app-rstart.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 22:04:01 2005 @@ -47,9 +47,9 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/rstart/config -%attr(755,root,wheel) %{_libdir}/X11/rstart/rstartd.real +%attr(755,root,root) %{_libdir}/X11/rstart/rstartd.real %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.3 SPECS/xorg-app-scripts.spec:1.4 --- SPECS/xorg-app-scripts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.3 SPECS/xorg-app-setxkbmap.spec:1.4 --- SPECS/xorg-app-setxkbmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.3 SPECS/xorg-app-showfont.spec:1.4 --- SPECS/xorg-app-showfont.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.3 SPECS/xorg-app-smproxy.spec:1.4 --- SPECS/xorg-app-smproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.3 SPECS/xorg-app-twm.spec:1.4 --- SPECS/xorg-app-twm.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 22:04:57 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vera.spec - cosmetics, added %doc In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics, added %doc ---- Files affected: SPECS: vera.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/vera.spec diff -u SPECS/vera.spec:1.7 SPECS/vera.spec:1.8 --- SPECS/vera.spec:1.7 Fri Jul 11 14:28:24 2003 +++ SPECS/vera.spec Sat Aug 27 22:04:52 2005 @@ -9,8 +9,8 @@ Source0: ftp://ftp.gnu.org/gnu/vera/%{name}-%{version}.tar.gz # Source0-md5: ed6120dd9739c71580a92868a34776b0 Patch0: %{name}-direntry.patch -BuildRequires: texinfo URL: http://www.sacredchao.net/software/reed/ +BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -29,6 +29,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_infodir} + install vera.info* $RPM_BUILD_ROOT%{_infodir} %clean @@ -42,6 +43,7 @@ %files %defattr(644,root,root,755) +%doc README %{_infodir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -50,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:04:52 darekr +- cosmetics, added %doc + Revision 1.7 2003/07/11 12:28:24 ankry - URL fixes and other cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vera.spec?r1=1.7&r2=1.8&f=u From darekr at pld-linux.org Sat Aug 27 22:16:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vdkbuilder.spec - added -devel subpackage In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:16:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -devel subpackage ---- Files affected: SPECS: vdkbuilder.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.13 SPECS/vdkbuilder.spec:1.14 --- SPECS/vdkbuilder.spec:1.13 Sun Oct 31 15:59:29 2004 +++ SPECS/vdkbuilder.spec Sat Aug 27 22:16:00 2005 @@ -28,6 +28,18 @@ VDKBuilder jest narz?dziem RAD bazuj?cym na VDK, bibliotece wrapuj?cej znan? bibliotek? widget?w - GTK+. +%package devel +Summary: Header files for vdkbuilder +Summary(pl): Pliki nag??wkowe bibliotek vdkbuilder +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +vdkbuilder header files. + +%description devel -l pl +Pliki nag??wkowe blibliotek vdkbuilder. + %prep %setup -q @@ -58,18 +70,24 @@ %doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* -%{_libdir}/lib*.la -%{_includedir}/vdkb2 %{_mandir}/man1/* %{_pixmapsdir}/*.png %{_datadir}/vdkb2 +%files devel +%defattr(644,root,root,755) +%{_libdir}/lib*.la +%{_includedir}/vdkb2 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:16:00 darekr +- added -devel subpackage + Revision 1.13 2004/10/31 14:59:29 paladine - spaces->tabs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.13&r2=1.14&f=u From darekr at pld-linux.org Sat Aug 27 22:17:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: vdk.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:17:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vdk.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.22 SPECS/vdk.spec:1.23 --- SPECS/vdk.spec:1.22 Sat Nov 27 19:52:09 2004 +++ SPECS/vdk.spec Sat Aug 27 22:17:16 2005 @@ -37,7 +37,7 @@ Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: gtk+2-devel >= 2.0.0 %description devel @@ -50,7 +50,7 @@ Summary: VDK static libraries Summary(pl): Biblioteki statyczne VDK Group: X11/Development/Libraries -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{version}-%{release} %description static VDK static libraries. @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:17:16 darekr +- strict deps + Revision 1.22 2004/11/27 18:52:09 saq - massive attack: add missing gtk+2-devel epoch in BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sat Aug 27 22:23:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SOURCES: xchm-pl.po-update.patch (NEW) - pl.po update In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:23:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - pl.po update ---- Files affected: SOURCES: xchm-pl.po-update.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchm-pl.po-update.patch diff -u /dev/null SOURCES/xchm-pl.po-update.patch:1.1 --- /dev/null Sat Aug 27 22:23:50 2005 +++ SOURCES/xchm-pl.po-update.patch Sat Aug 27 22:23:45 2005 @@ -0,0 +1,32 @@ +--- xchm-1.1/po/pl.po.orig 2005-08-26 22:39:37.000000000 +0200 ++++ xchm-1.1/po/pl.po 2005-08-27 20:55:48.746583032 +0200 +@@ -1,15 +1,15 @@ + # Polish translation for xchm. + # This file is distributed under the same license as the xchm package. +-# Jakub Bogusz , 2004. ++# Jakub Bogusz , 2004-2005. + # + # vi:encoding=utf-8 + # + msgid "" + msgstr "" +-"Project-Id-Version: xchm 0.9\n" ++"Project-Id-Version: xchm 1.1\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-08-26 23:39+0300\n" +-"PO-Revision-Date: 2004-03-01 22:50+0100\n" ++"PO-Revision-Date: 2005-08-27 20:52+0200\n" + "Last-Translator: Jakub Bogusz \n" + "Language-Team: Polish \n" + "MIME-Version: 1.0\n" +@@ -241,9 +241,8 @@ + msgstr "W &ty??" + + #: src/chmhtmlwindow.cpp:43 +-#, fuzzy + msgid "Copy &link location" +-msgstr "&Kopiuj zaznaczenie" ++msgstr "Kopiuj po??o??enie &odno??nika" + + #: src/chmhtmlwindow.cpp:46 + msgid "&Copy selection" ================================================================ From qboosh at pld-linux.org Sat Aug 27 22:24:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: xchm.spec - added pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added pl.po-update patch ---- Files affected: SPECS: xchm.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.37 SPECS/xchm.spec:1.38 --- SPECS/xchm.spec:1.37 Sat Aug 27 16:25:23 2005 +++ SPECS/xchm.spec Sat Aug 27 22:24:44 2005 @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz # Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop +Patch0: %{name}-pl.po-update.patch URL: http://xchm.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -27,6 +28,9 @@ %prep %setup -q +%patch0 -p1 + +rm -f po/stamp-po %build %{__gettextize} @@ -67,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:24:44 qboosh +- added pl.po-update patch + Revision 1.37 2005/08/27 14:25:23 paladine - updated to 1.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.37&r2=1.38&f=u From arekm at pld-linux.org Sat Aug 27 22:28:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: dspam.spec - add verbose bcond In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 20:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add verbose bcond ---- Files affected: SPECS: dspam.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/dspam.spec diff -u SPECS/dspam.spec:1.37 SPECS/dspam.spec:1.38 --- SPECS/dspam.spec:1.37 Wed Aug 10 15:48:34 2005 +++ SPECS/dspam.spec Sat Aug 27 22:28:06 2005 @@ -18,6 +18,7 @@ %bcond_with pgsql # enable PostgreSQL storage driver (disable sqlite/mysql driver) %bcond_with sqlite # enable SQLite3 storage driver %bcond_with daemon +%bcond_with verbose %if %{with mysql} && %{with pgsql} %undefine with_pgsql @@ -178,6 +179,7 @@ %{__autoconf} %{__automake} %configure \ + %{?with_verbose: --enable-debug --enable-verbose-debug} \ --enable-trusted-user-security \ --enable-bayesian-dobly \ --enable-chained-tokens \ @@ -368,6 +370,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:28:06 arekm +- add verbose bcond + Revision 1.37 2005/08/10 13:48:34 glen - make it possible to have all db backend bconds on at same time (for future) - fixes to make vim syntax work properly ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.37&r2=1.38&f=u From qboosh at pld-linux.org Sat Aug 27 22:41:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SOURCES: man-man2html.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:41:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: man-man2html.patch (1.8 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:26 2005 Subject: DISTFILES: Sman-0.96.tar.gz Message-ID: <17354.1125175619@distfiles.pld-linux.org> Files fetched: 1 STORED: http://joshr.com/src/sman/Sman-0.96.tar.gz fe3bf53899b35dd7b0e736ea290d4641 Sman-0.96.tar.gz Size: 27053 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: Sman.spec - up to 0.96 In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:46:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.96 ---- Files affected: SPECS: Sman.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.2 SPECS/Sman.spec:1.3 --- SPECS/Sman.spec:1.2 Wed Aug 24 19:50:07 2005 +++ SPECS/Sman.spec Sat Aug 27 22:46:54 2005 @@ -7,13 +7,13 @@ Summary: Searcher for Man pages Summary(pl): Wyszukiwarka stron Man Name: Sman -Version: 0.95 +Version: 0.96 Release: 0.1 # "same as perl" License: Artistic Group: Development/Languages/Perl Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz -# Source0-md5: b786338eba068a4a110bf2bbda51e695 +# Source0-md5: fe3bf53899b35dd7b0e736ea290d4641 URL: http://joshr.com/src/sman/ BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib @@ -121,6 +121,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:46:54 twittner +- up to 0.96 + Revision 1.2 2005/08/24 17:50:07 qboosh - pl, missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 22:47:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: serialmail.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:47:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: serialmail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/serialmail.spec diff -u SPECS/serialmail.spec:1.22 SPECS/serialmail.spec:1.23 --- SPECS/serialmail.spec:1.22 Sat Jul 23 17:58:55 2005 +++ SPECS/serialmail.spec Sat Aug 27 22:47:52 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # TODO # - check license -Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities. -Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty. +Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities +Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty Name: serialmail Version: 0.75 Release: 1 @@ -16,13 +16,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -serialmail is a collection of tools for passing mail across serial links. It -works with qmail: you use qmail to deliver messages to a maildir, and then -serialmail to deliver messages out of the maildir. +serialmail is a collection of tools for passing mail across serial +links. It works with qmail: you use qmail to deliver messages to a +maildir, and then serialmail to deliver messages out of the maildir. serialmail supports SMTP, including ESMTP PIPELINING, and QMTP. -#description -l pl +%description -l pl +serialmail to zestaw narz?dzi do przekazywania poczty po ??czach +szeregowych. Dzia?a z qmailem - qmaila u?ywa si? do dostarczania +wiadomo?ci do maildir?w, a nast?pnie serialmaila do dostarczania +wiadomo?ci z maildir?w. %prep %setup -q @@ -61,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:47:52 qboosh +- pl desc + Revision 1.22 2005/07/23 15:58:55 glen - more appropriate license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/serialmail.spec?r1=1.22&r2=1.23&f=u From twittner at pld-linux.org Sat Aug 27 22:50:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:26 2005 Subject: SPECS: Sman.spec - added _noautoreq 'perl(Sman::IndexVersion)' In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq 'perl(Sman::IndexVersion)' ---- Files affected: SPECS: Sman.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.3 SPECS/Sman.spec:1.4 --- SPECS/Sman.spec:1.3 Sat Aug 27 22:46:54 2005 +++ SPECS/Sman.spec Sat Aug 27 22:50:23 2005 @@ -24,6 +24,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'perl(Sman::IndexVersion)' + %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:50:23 twittner +- added _noautoreq 'perl(Sman::IndexVersion)' + Revision 1.3 2005/08/27 20:46:54 twittner - up to 0.96 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 22:50:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: ayam.spec - removed unused prefix define, some cleanups In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:50:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed unused prefix define, some cleanups ---- Files affected: SPECS: ayam.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/ayam.spec diff -u SPECS/ayam.spec:1.7 SPECS/ayam.spec:1.8 --- SPECS/ayam.spec:1.7 Thu Jul 21 12:57:24 2005 +++ SPECS/ayam.spec Sat Aug 27 22:50:22 2005 @@ -16,8 +16,6 @@ BuildRequires: tk-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define prefix /usr - %description Ayam is a free (as in free speech, BSD-licensed) 3D modelling environment for the RenderMan interface. Free means that neither the @@ -75,13 +73,12 @@ %build mv src/affine/src/write.c src/affine/src/write.cpp -# TODO: optflags %{__make} -C src -f Makefile.shared clean +# TODO: optflags %{__make} -C src -f Makefile.shared %install rm -rf $RPM_BUILD_ROOT -# create directories if necessary install -d $RPM_BUILD_ROOT %{__make} -C src -f Makefile.shared install \ @@ -93,16 +90,9 @@ %files %defattr(644,root,root,755) %doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO - -# if _sysconfdir != /etc: -#%%dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/* - %attr(755,root,root) %{_bindir}/* - %{_datadir}/%{name} - -# initscript and its config %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} @@ -112,6 +102,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:50:22 qboosh +- removed unused prefix define, some cleanups + Revision 1.7 2005/07/21 10:57:24 cieciwa - removed precompilant and building oncagain. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ayam.spec?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sat Aug 27 22:57:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: syslogger.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:57:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: syslogger.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/syslogger.spec diff -u SPECS/syslogger.spec:1.4 SPECS/syslogger.spec:1.5 --- SPECS/syslogger.spec:1.4 Wed May 28 15:02:09 2003 +++ SPECS/syslogger.spec Sat Aug 27 22:56:58 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -Summary: copy lines from stdin to syslog -Summary(pl): kopiowanie linii ze standardowego wej?cia do sysloga +# TODO: optflags +Summary: Copy lines from stdin to syslog +Summary(pl): Kopiowanie linii ze standardowego wej?cia do sysloga Name: syslogger Version: 1.03 Release: 1 @@ -13,7 +14,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Syslogger copies lines from the standard input, and logs them to syslog. +Syslogger copies lines from the standard input, and logs them to +syslog. %description -l pl Syslogger kopiuje linie ze standardowego wej?cia i zapisuje je do @@ -30,7 +32,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8} - install %{name} $RPM_BUILD_ROOT%{_bindir} install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -48,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 20:56:58 qboosh +- cosmetics + Revision 1.4 2003/05/28 13:02:09 malekith - massive attack: source-md5 @@ -60,4 +64,3 @@ Revision 1.1 2003/03/03 09:19:50 zagrodzki - initial revision - STBR - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslogger.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:01:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: OilWar.spec - cleanup/cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:01:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanup/cosmetics ---- Files affected: SPECS: OilWar.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/OilWar.spec diff -u SPECS/OilWar.spec:1.11 SPECS/OilWar.spec:1.12 --- SPECS/OilWar.spec:1.11 Mon Aug 18 10:07:52 2003 +++ SPECS/OilWar.spec Sat Aug 27 23:01:41 2005 @@ -12,10 +12,10 @@ Source2: %{name}.desktop Patch0: %{name}-am_remove_install-data-local.patch URL: http://www.2ndpoint.fi/projektit/oilwar.html -BuildRequires: autoconf -BuildRequires: automake BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel +BuildRequires: autoconf +BuildRequires: automake BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -25,17 +25,16 @@ the mother land... %description -l pl -OilWar jest prost? gr? w kt?rej strzelasz do ?o?nierzy i czo?g?w -nieprzyjaciela za pomoc? myszki. Armia wroga atakuje twoje terytorium -i stara si? ukra?? zasoby oleju. Twoja misja: zniszczy? naje?d?c?w, -chroni? olej, chroni? ojczyzn?... +OilWar jest prost? gr? w kt?rej strzela si? do ?o?nierzy i czo?g?w +nieprzyjaciela za pomoc? myszki. Armia wroga atakuje terytorium gracza +i stara si? ukra?? zasoby oleju. Misja: zniszczy? naje?d?c?w, chroni? +olej, chroni? ojczyzn?... %prep -%setup -q +%setup -q %patch0 -p1 %build -rm -f missing %{__aclocal} %{__autoconf} %{__automake} @@ -69,7 +68,11 @@ %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org + $Log$ +Revision 1.12 2005/08/27 21:01:41 qboosh +- cleanup/cosmetics + Revision 1.11 2003/08/18 08:07:52 gotar - mass commit: cosmetics (removed trailing white spaces) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/OilWar.spec?r1=1.11&r2=1.12&f=u From paladine at pld-linux.org Sat Aug 27 23:02:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: dbus.spec - updated to 0.36.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:02:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36.1 ---- Files affected: SPECS: dbus.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.93 SPECS/dbus.spec:1.94 --- SPECS/dbus.spec:1.93 Wed Aug 24 17:08:15 2005 +++ SPECS/dbus.spec Sat Aug 27 23:02:32 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.36 +Version: 0.36.1 Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: c969d0a11599e5950fb28eeed8b353ba +# Source0-md5: 48bcfc0806bb7bc914cc5cd2f7d40d69 Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -545,6 +545,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/27 21:02:32 paladine +- updated to 0.36.1 + Revision 1.93 2005/08/24 15:08:15 paladine - updated to 0.36 - removed python_types patch (already in sources) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.93&r2=1.94&f=u From paladine at pld-linux.org Sat Aug 27 23:02:44 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: dbus-0.36.1.tar.gz Message-ID: <7426.1125176564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.1.tar.gz 48bcfc0806bb7bc914cc5cd2f7d40d69 dbus-0.36.1.tar.gz Size: 1596804 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 23:11:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: capi4k-utils.spec - 2005.07.18 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 21:11:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005.07.18 ---- Files affected: SPECS: capi4k-utils.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/capi4k-utils.spec diff -u SPECS/capi4k-utils.spec:1.12 SPECS/capi4k-utils.spec:1.13 --- SPECS/capi4k-utils.spec:1.12 Sun May 22 01:43:23 2005 +++ SPECS/capi4k-utils.spec Sat Aug 27 23:11:40 2005 @@ -6,14 +6,14 @@ Summary(de): CAPI 2.0 Werkzeuge f?r verschiedene ISDN Karten Summary(pl): Biblioteki i narz?dzia konfiguracyjne CAPI 2.0 Name: capi4k-utils -Version: 2004.10.06 -Release: 3 +Version: 2005.07.18 +Release: 1 License: GPL Group: Applications/Communications -Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2004-10-06.tar.gz -# Source0-md5: 54992ff362ca44629fdf59773a6864cd +Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2005-07-18.tar.gz +# Source0-md5: c745759b6b3d64e19763727176648cdf Source1: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES -# Source1-md5: 054b9f2bf1b0c0fc1eb5010ca0c9380d +# Source1-md5: 03739a0170eba14f03f7dc7ccc58bba8 Source10: capi.conf Source11: capi.init Patch0: %{name}-make.patch @@ -259,6 +259,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 21:11:40 areq +- 2005.07.18 + Revision 1.12 2005/05/21 23:43:23 averne - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/capi4k-utils.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sat Aug 27 23:12:01 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: capi4k-utils-2005-07-18.tar.gz CHANGES Message-ID: <20352.1125177121@distfiles.pld-linux.org> Files fetched: 2 STORED: ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz c745759b6b3d64e19763727176648cdf capi4k-utils-2005-07-18.tar.gz Size: 862826 bytes STORED: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES 03739a0170eba14f03f7dc7ccc58bba8 CHANGES Size: 10191 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 23:15:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: xorg-lib-libXvMC.spec - it contains libXvMCW as well - obso... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:15:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - it contains libXvMCW as well - obsolete standalone version ---- Files affected: SPECS: xorg-lib-libXvMC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXvMC.spec diff -u SPECS/xorg-lib-libXvMC.spec:1.4 SPECS/xorg-lib-libXvMC.spec:1.5 --- SPECS/xorg-lib-libXvMC.spec:1.4 Sat Aug 27 21:38:03 2005 +++ SPECS/xorg-lib-libXvMC.spec Sat Aug 27 23:15:17 2005 @@ -17,6 +17,8 @@ BuildRequires: xorg-lib-libXv-devel BuildRequires: xorg-proto-videoproto-devel BuildRequires: xorg-util-util-macros +Provides: libXvMCW = %{version} +Obsoletes: libXvMCW BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,6 +33,8 @@ Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXv-devel +Provides: libXvMCW-devel = %{version} +Obsoletes: libXvMCW-devel %description devel XvMC library. @@ -49,16 +53,18 @@ Summary(pl): Biblioteki statyczne libXvMC Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Provides: libXvMCW-static = %{version} +Obsoletes: libXvMCW-static %description static XvMC library. -This package contains the static libXvMC library. +This package contains the static libXvMC libraries. %description static -l pl Biblioteka XvMC. -Pakiet zawiera statyczn? bibliotek? libXvMC. +Pakiet zawiera statyczne biblioteki libXvMC. %prep %setup -q -n libXvMC-%{version} @@ -108,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:15:17 qboosh +- it contains libXvMCW as well - obsolete standalone version + Revision 1.4 2005/08/27 19:38:03 wiget - kill /usr/X11R6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:18:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: ndisc6.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:18:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ndisc6.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.2 SPECS/ndisc6.spec:1.3 --- SPECS/ndisc6.spec:1.2 Sat Aug 27 17:08:19 2005 +++ SPECS/ndisc6.spec Sat Aug 27 23:18:50 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -# +# TODO: optflags Summary: Neighbor Discovery tools for IPv6 +Summary(pl): Narz?dzia do rozpoznawania s?siad?w dla IPv6 Name: ndisc6 Version: 0.1.5 Release: 1 @@ -17,6 +18,14 @@ respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +%description -l pl +ndisc6 zawiera dwa ma?e narz?dzia dzia?aj?ce z linii polece? (ndisc6 i +rdisc6) wykonuj?ce odpowiednio ICMPv6 Neighbor Discovery +(rozpoznawanie s?siad?w) i ICMPv6 Router Discovery (rozpoznawanie +router?w). S? przeznaczone g??wnie do diagnostyki sieci IPv6 oraz +wykrywania bezprawnych w?z??w lub router?w IPv6 w segmencie sieci +Ethernet. + %prep %setup -q @@ -28,7 +37,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} -install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -45,9 +54,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 21:18:50 qboosh +- pl + Revision 1.2 2005/08/27 15:08:19 aredridel - adapterised Revision 1.1 2005/08/27 15:07:59 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 23:20:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: asterisk-chan_capi.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:20:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: asterisk-chan_capi.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u SPECS/asterisk-chan_capi.spec:1.1 SPECS/asterisk-chan_capi.spec:1.2 --- SPECS/asterisk-chan_capi.spec:1.1 Sat Aug 27 16:26:43 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 23:20:30 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Asterisk ISDN CAPI channel driver +Summary(pl): Sterownik kana?u CAPI ISDN dla Asteriska Name: asterisk-chan_capi Version: 0.5.4 Release: 0.1 @@ -7,7 +8,7 @@ Group: Applications Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz # Source0-md5: a7a9c0f90395909ee06528f17fc608d2 -URL: http://sourceforge.net/projects/chan-capi +URL: http://sourceforge.net/projects/chan-capi/ BuildRequires: asterisk-devel BuildRequires: capi-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -16,6 +17,10 @@ ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP Platform. +%description -l pl +Sterownik kana?u CAPI ISDN (chan_capi) dla Asteriska - platformy VOIP +o otwartych ?r?d?ach. + %prep %setup -q -n chan_capi-%{version} @@ -45,7 +50,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 21:20:30 qboosh +- pl + Revision 1.1 2005/08/27 14:26:43 areq - init PLD spec - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asterisk-chan_capi.spec?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Sat Aug 27 23:25:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: hal-pld_policy.patch In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:25:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: ---- Files affected: SOURCES: hal-pld_policy.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.1 SOURCES/hal-pld_policy.patch:1.2 --- SOURCES/hal-pld_policy.patch:1.1 Sun Aug 7 21:53:42 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:25:53 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sat Aug 27 23:28:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: SPE.spec - up to 0.7.5.c (new working url for Source0) - SP... In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:28:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.5.c (new working url for Source0) - SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} - added desktop and icon files ---- Files affected: SPECS: SPE.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.15 SPECS/SPE.spec:1.16 --- SPECS/SPE.spec:1.15 Thu Jun 2 20:14:45 2005 +++ SPECS/SPE.spec Sat Aug 27 23:28:16 2005 @@ -1,24 +1,24 @@ # $Revision$, $Date$ # TODO: # - fix %%files (doc to %%doc, no .py, remove unused files) - -%define _wx 2.5.4.1 +%define _wx 2.6.1.0 %define _bl 2.35 Summary: SPE - Stani's Python Editor Summary(pl): SPE - pythonowy edytor Staniego Name: SPE -Version: 0.7.3.a +Version: 0.7.5.c Release: 0.1 License: LGPL 2.1+ (except sm library and sm_idle ) Group: Applications/Text -Source0: http://projects.blender.org/frs/download.php/271/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.zip -# Source0-md5: 52b1d02f179bab7a71b57f5698343230 +Source0: http://download.berlios.de/python/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.tar.gz +# Source0-md5: c40a24a3ed79ebba8c4fb208c000f67c +Source1: %{name}.desktop +Source2: %{name}.png URL: http://spe.pycs.net/ BuildRequires: python BuildRequires: python-devel BuildRequires: python-modules -BuildRequires: unzip %pyrequires_eq python-modules Requires: python-wxPython >= %{_wx} BuildArch: noarch @@ -52,12 +52,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} python setup.py install \ --optimize=2 \ --root=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.py' -exec rm "{}" ";" +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} + +# SPE doesn't work without *.py files so don't remove them +#%%py_postclean %clean rm -rf $RPM_BUILD_ROOT @@ -67,6 +72,8 @@ %doc README.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/* +%{_desktopdir}/* +%{_pixmapsdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -74,6 +81,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/27 21:28:16 twittner +- up to 0.7.5.c (new working url for Source0) +- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- added desktop and icon files + Revision 1.15 2005/06/02 18:14:45 glen - findutils already required by rpm-build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.15&r2=1.16&f=u From twittner at pld-linux.org Sat Aug 27 23:28:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Message-ID: <10385.1125178130@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/python/SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz c40a24a3ed79ebba8c4fb208c000f67c SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Size: 2917691 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:29:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: hal-pld_policy.patch - reverted last commit In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:29:00 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SOURCES: hal-pld_policy.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.2 SOURCES/hal-pld_policy.patch:1.3 --- SOURCES/hal-pld_policy.patch:1.2 Sat Aug 27 23:25:53 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:28:55 2005 @@ -1,6 +1,6 @@ -diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 -+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 +diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 ++++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 @@ -6,11 +6,11 @@ @@ -17,60 +17,7 @@ true -@@ -44,6 +44,19 @@ - - - -+ -+ -+ true -+ true -+ -+ -+ -+ true -+ -+ -+ true -+ -+ - - - -@@ -51,25 +64,25 @@ - auto - cdrom - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - - -@@ -96,6 +109,9 @@ +@@ -96,6 +96,9 @@ @@ -80,18 +27,3 @@ true -@@ -195,5 +211,14 @@ - hald-addon-storage - - -+ -+ -+ -+ -+ -+ true -+ -+ -+ - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Sat Aug 27 23:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: hal-pld_policy.patch - some fixes from other distros In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:30:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - some fixes from other distros ---- Files affected: SOURCES: hal-pld_policy.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.3 SOURCES/hal-pld_policy.patch:1.4 --- SOURCES/hal-pld_policy.patch:1.3 Sat Aug 27 23:28:55 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:30:40 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.3&r2=1.4&f=u From paladine at pld-linux.org Sat Aug 27 23:31:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: hal-0.5.4.tar.gz Message-ID: <14060.1125178265@distfiles.pld-linux.org> Files fetched: 1 STORED: http://freedesktop.org/~david/dist/hal-0.5.4.tar.gz 2f84ddbc22bc35baa9388e7794d1fa31 hal-0.5.4.tar.gz Size: 1476396 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:31:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: hal.spec - merged from DEVEL and updated to final 0.5.4 - c... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:31:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to final 0.5.4 - changed and uncommented pld_policy patch - sorted %%configure options - dropped fstab-sync support again (back to pmount) ---- Files affected: SPECS: hal.spec (1.82 -> 1.83) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.82 SPECS/hal.spec:1.83 --- SPECS/hal.spec:1.82 Wed Aug 24 13:02:29 2005 +++ SPECS/hal.spec Sat Aug 27 23:30:56 2005 @@ -1,17 +1,18 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without docs # disable documentation building +%bcond_without docs # disable documentation building +%bcond_with fstab_sync # build with fstab-sync # Summary: HAL - Hardware Abstraction Layer Summary(pl): HAL - abstrakcyjna warstwa dost?pu do sprz?tu Name: hal -Version: 0.5.3 -Release: 3 +Version: 0.5.4 +Release: 0.1 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz -# Source0-md5: bc4005ef21c7c8bfe3444cf0f3fa6d68 +# Source0-md5: 2f84ddbc22bc35baa9388e7794d1fa31 Source1: %{name}daemon.init Source2: %{name}d.sysconfig Source3: %{name}-device-manager.desktop @@ -100,8 +101,8 @@ Summary(pl): Zarz?dca urz?dze? HALa dla GNOME Group: X11/Applications Requires: python-gnome-ui -Requires: python-pygtk-glade Requires: python-gnome-vfs +Requires: python-pygtk-glade Requires: %{name} = %{version}-%{release} %description device-manager @@ -114,9 +115,11 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 %build +%{__glib_gettextize} +%{__intltoolize} %{__libtoolize} %{__aclocal} %{__autoheader} @@ -124,19 +127,21 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ + %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ - --with-hwdata=%{_sysconfdir} \ - --enable-fstab-sync \ --enable-verbose-mode \ + --with-hwdata=%{_sysconfdir} \ --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ - $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir},/var/run/hald} \ + $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir}} \ $RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe} %{__make} install \ @@ -182,13 +187,10 @@ %attr(755,root,root) %{_bindir}/hal-set-property %attr(755,root,root) %{_bindir}/lshal %attr(755,root,root) %{_libdir}/hald-* -%{_mandir}/man8/fstab-sync.8* %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/%{name} - %{_sysconfdir}/%{name}/fdi %{_sysconfdir}/hotplug.d/default/* - %attr(754,root,root) /etc/rc.d/init.d/* %attr(755,root,root) %{_libdir}/hal.hotplug %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald @@ -196,7 +198,8 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/fdi -%dir /var/run/hald +%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*} +%{_examplesdir}/%{name}-%{version} %files libs %defattr(644,root,root,755) @@ -231,6 +234,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83 2005/08/27 21:30:56 paladine +- merged from DEVEL and updated to final 0.5.4 +- changed and uncommented pld_policy patch +- sorted %%configure options +- dropped fstab-sync support again (back to pmount) + Revision 1.82 2005/08/24 11:02:29 paladine - changed pid file - commentedout pld_policy patch @@ -255,6 +264,19 @@ - dropped fstab-sync support (we got pmount now), fixed %%files, added missing hal.hotplug symlink (yeah, it works now like a charm), cleanup, dropped mount-options patch (not needed anymore), rel.1 + +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + +Revision 1.75.2.3 2005/08/03 17:29:36 wiget +- don't duplicate %{_datadir}/%{name}/device-manger + +Revision 1.75.2.2 2005/08/03 10:26:38 freetz +- cosmetics + +Revision 1.75.2.1 2005/08/02 22:08:47 freetz +- for brave ones: 0.5.4 20050801 snap, fstab-sync bconded (we don't need it + anymore - obsoleted by pmount), more pldize macros Revision 1.75 2005/08/02 15:54:12 saq - reqs from NEWS ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.82&r2=1.83&f=u From twittner at pld-linux.org Sat Aug 27 23:43:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: FHS.spec, SPE.spec - fixed typos in my commitlogs In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:43:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed typos in my commitlogs ---- Files affected: SPECS: FHS.spec (1.103 -> 1.104) , SPE.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/FHS.spec diff -u SPECS/FHS.spec:1.103 SPECS/FHS.spec:1.104 --- SPECS/FHS.spec:1.103 Thu Jun 30 22:15:26 2005 +++ SPECS/FHS.spec Sat Aug 27 23:43:22 2005 @@ -234,11 +234,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.103 2005/06/30 20:15:26 twittner - changed location for cgi programs: %%{_libdir}/cgi-bin -> %%{_prefix}/lib/cgi-bin . There's no need to have two different directories on - diffrent archs (/usr/lib vs. /usr/lib64 issue) - one + different archs (/usr/lib vs. /usr/lib64 issue) - one /usr/lib/cgi-bin is sufficient and good for all archs. - rel. 12 ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.16 SPECS/SPE.spec:1.17 --- SPECS/SPE.spec:1.16 Sat Aug 27 23:28:16 2005 +++ SPECS/SPE.spec Sat Aug 27 23:43:22 2005 @@ -81,9 +81,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.16 2005/08/27 21:28:16 twittner - up to 0.7.5.c (new working url for Source0) -- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- SPE doesn't work without *.py files - don't remove them from %%{py_sitescriptdir} - added desktop and icon files Revision 1.15 2005/06/02 18:14:45 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/FHS.spec?r1=1.103&r2=1.104&f=u http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Sat Aug 27 23:46:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: qboosh Date: Sat Aug 27 21:46:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: xorg-app-appres.spec (1.4 -> 1.5) , xorg-app-bdftopcf.spec (1.4 -> 1.5) , xorg-app-beforelight.spec (1.4 -> 1.5) , xorg-app-bitmap.spec (1.4 -> 1.5) , xorg-app-editres.spec (1.4 -> 1.5) , xorg-app-fonttosfnt.spec (1.4 -> 1.5) , xorg-app-fslsfonts.spec (1.4 -> 1.5) , xorg-app-fstobdf.spec (1.4 -> 1.5) , xorg-app-iceauth.spec (1.4 -> 1.5) , xorg-app-ico.spec (1.4 -> 1.5) , xorg-app-lbxproxy.spec (1.4 -> 1.5) , xorg-app-listres.spec (1.4 -> 1.5) , xorg-app-luit.spec (1.4 -> 1.5) , xorg-app-mkfontdir.spec (1.4 -> 1.5) , xorg-app-mkfontscale.spec (1.4 -> 1.5) , xorg-app-oclock.spec (1.4 -> 1.5) , xorg-app-pclcomp.spec (1.4 -> 1.5) , xorg-app-proxymngr.spec (1.4 -> 1.5) , xorg-app-rgb.spec (1.4 -> 1.5) , xorg-app-rstart.spec (1.4 -> 1.5) , xorg-app-scripts.spec (1.4 -> 1.5) , xorg-app-setxkbmap.spec (1.4 -> 1.5) , xorg-app-showfont.spec (1.4 -> 1.5) , xorg-app-smproxy.spec (1.4 -> 1.5) , xorg-app-twm.spec (1.4 -> 1.5) , xorg-app-viewres.spec (1.4 -> 1.5) , xorg-app-x11perf.spec (1.4 -> 1.5) , xorg-app-xauth.spec (1.4 -> 1.5) , xorg-app-xbiff.spec (1.4 -> 1.5) , xorg-app-xcalc.spec (1.4 -> 1.5) , xorg-app-xclipboard.spec (1.4 -> 1.5) , xorg-app-xclock.spec (1.4 -> 1.5) , xorg-app-xcmsdb.spec (1.4 -> 1.5) , xorg-app-xconsole.spec (1.4 -> 1.5) , xorg-app-xcursorgen.spec (1.4 -> 1.5) , xorg-app-xdbedizzy.spec (1.4 -> 1.5) , xorg-app-xditview.spec (1.4 -> 1.5) , xorg-app-xdpyinfo.spec (1.4 -> 1.5) , xorg-app-xedit.spec (1.4 -> 1.5) , xorg-app-xev.spec (1.4 -> 1.5) , xorg-app-xeyes.spec (1.4 -> 1.5) , xorg-app-xf86dga.spec (1.4 -> 1.5) , xorg-app-xfd.spec (1.4 -> 1.5) , xorg-app-xfontsel.spec (1.4 -> 1.5) , xorg-app-xfsinfo.spec (1.4 -> 1.5) , xorg-app-xfs.spec (1.4 -> 1.5) , xorg-app-xfwp.spec (1.4 -> 1.5) , xorg-app-xgamma.spec (1.4 -> 1.5) , xorg-app-xgc.spec (1.4 -> 1.5) , xorg-app-xhost.spec (1.4 -> 1.5) , xorg-app-xkbcomp.spec (1.4 -> 1.5) , xorg-app-xkbevd.spec (1.4 -> 1.5) , xorg-app-xkbprint.spec (1.4 -> 1.5) , xorg-app-xkbutils.spec (1.4 -> 1.5) , xorg-app-xkill.spec (1.4 -> 1.5) , xorg-app-xlogo.spec (1.4 -> 1 .5) , xorg-app-xlsatoms.spec (1.4 -> 1.5) , xorg-app-xlsclients.spec (1.4 -> 1.5) , xorg-app-xlsfonts.spec (1.4 -> 1.5) , xorg-app-xmag.spec (1.4 -> 1.5) , xorg-app-xman.spec (1.4 -> 1.5) , xorg-app-xmessage.spec (1.4 -> 1.5) , xorg-app-xmh.spec (1.4 -> 1.5) , xorg-app-xmodmap.spec (1.4 -> 1.5) , xorg-app-xmore.spec (1.4 -> 1.5) , xorg-app-xphelloworld.spec (1.4 -> 1.5) , xorg-app-xplsprinters.spec (1.4 -> 1.5) , xorg-app-xprehashprinterlist.spec (1.4 -> 1.5) , xorg-app-xprop.spec (1.4 -> 1.5) , xorg-app-xpr.spec (1.4 -> 1.5) , xorg-app-xrandr.spec (1.4 -> 1.5) , xorg-app-xrdb.spec (1.4 -> 1.5) , xorg-app-xrefresh.spec (1.4 -> 1.5) , xorg-app-xsetmode.spec (1.4 -> 1.5) , xorg-app-xsetpointer.spec (1.4 -> 1.5) , xorg-app-xsetroot.spec (1.4 -> 1.5) , xorg-app-xset.spec (1.4 -> 1.5) , xorg-app-xsm.spec (1.4 -> 1.5) , xorg-app-xstdcmap.spec (1.4 -> 1.5) , xorg-app-xtrap.spec (1.4 -> 1.5) , xorg-app-xvidtune.spec (1.4 -> 1.5) , xorg-app-xvinfo.spec (1.4 -> 1.5) , xorg-app-xwd.spec (1.4 -> 1.5) , xorg-app-xwininfo.spec (1.4 -> 1.5) , xorg-app-xwud.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.4 SPECS/xorg-app-appres.spec:1.5 --- SPECS/xorg-app-appres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 23:46:17 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.4 SPECS/xorg-app-bdftopcf.spec:1.5 --- SPECS/xorg-app-bdftopcf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 23:46:17 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.4 SPECS/xorg-app-beforelight.spec:1.5 --- SPECS/xorg-app-beforelight.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.4 SPECS/xorg-app-bitmap.spec:1.5 --- SPECS/xorg-app-bitmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.4 SPECS/xorg-app-editres.spec:1.5 --- SPECS/xorg-app-editres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.4 SPECS/xorg-app-fonttosfnt.spec:1.5 --- SPECS/xorg-app-fonttosfnt.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 23:46:17 2005 @@ -13,11 +13,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-data-xbitmaps BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.4 SPECS/xorg-app-fslsfonts.spec:1.5 --- SPECS/xorg-app-fslsfonts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.4 SPECS/xorg-app-fstobdf.spec:1.5 --- SPECS/xorg-app-fstobdf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.4 SPECS/xorg-app-iceauth.spec:1.5 --- SPECS/xorg-app-iceauth.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 23:46:18 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.4 SPECS/xorg-app-ico.spec:1.5 --- SPECS/xorg-app-ico.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.4 SPECS/xorg-app-lbxproxy.spec:1.5 --- SPECS/xorg-app-lbxproxy.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 23:46:18 2005 @@ -13,14 +13,14 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.4 SPECS/xorg-app-listres.spec:1.5 --- SPECS/xorg-app-listres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.4 SPECS/xorg-app-luit.spec:1.5 --- SPECS/xorg-app-luit.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 23:46:18 2005 @@ -13,10 +13,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.4 SPECS/xorg-app-mkfontdir.spec:1.5 --- SPECS/xorg-app-mkfontdir.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 23:46:18 2005 @@ -11,15 +11,15 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description mkfontdir application. %description -l pl -Aplikacja mkfontdir +Aplikacja mkfontdir. %prep %setup -q -n mkfontdir-%{version} @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.4 SPECS/xorg-app-mkfontscale.spec:1.5 --- SPECS/xorg-app-mkfontscale.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.4 SPECS/xorg-app-oclock.spec:1.5 --- SPECS/xorg-app-oclock.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.4 SPECS/xorg-app-pclcomp.spec:1.5 --- SPECS/xorg-app-pclcomp.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 23:46:18 2005 @@ -12,8 +12,8 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.4 SPECS/xorg-app-proxymngr.spec:1.5 --- SPECS/xorg-app-proxymngr.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 23:46:18 2005 @@ -12,11 +12,11 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.4 SPECS/xorg-app-rgb.spec:1.5 --- SPECS/xorg-app-rgb.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.4 SPECS/xorg-app-rstart.spec:1.5 --- SPECS/xorg-app-rstart.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.4 SPECS/xorg-app-scripts.spec:1.5 --- SPECS/xorg-app-scripts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.4 SPECS/xorg-app-setxkbmap.spec:1.5 --- SPECS/xorg-app-setxkbmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 23:46:18 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.4&r2=1.5&f=u From arekm at pld-linux.org Sun Aug 28 00:01:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: python-pydspam.spec (NEW) - new; unfortunately only dspam 2... In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 22:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new; unfortunately only dspam 2.x supported ---- Files affected: SPECS: python-pydspam.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u /dev/null SPECS/python-pydspam.spec:1.1 --- /dev/null Sun Aug 28 00:01:51 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:01:44 2005 @@ -0,0 +1,54 @@ +# $Revision$, $Date$ +Summary: Python interface for dspam library +Summary(pl): Interfejs Pythona do biblioteki dspam +%define module pydspam +Name: python-%{module} +Version: 1.1.9 +Release: 1 +License: GPL +Group: Libraries/Python +Source0: http://dl.sourceforge.net/pymilter/%{module}-%{version}.tar.gz +# Source0-md5: 1caff10d2fa3968ed8e0def126f74b40 +Patch0: %{name}-setup.patch +URL: http://www.bmsi.com/python/dspam.html +BuildRequires: dspam-devel +BuildRequires: python-devel >= 2.2.1 +%pyrequires_eq python-modules +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Python interface for dspam library. + +%description -l pl +Interfejs Pythona do biblioteki dspam + +%prep +%setup -q -n %{module}-%{version} +%patch0 -p1 + +%build + +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT + +python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc NEWS dspam.html +%attr(755,root,root) %{py_sitedir}/*.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 22:01:44 arekm +- new; unfortunately only dspam 2.x supported + ================================================================ From arekm at pld-linux.org Sun Aug 28 00:01:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: pydspam-1.1.9.tar.gz Message-ID: <24796.1125180116@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pymilter/pydspam-1.1.9.tar.gz 1caff10d2fa3968ed8e0def126f74b40 pydspam-1.1.9.tar.gz Size: 56996 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 00:04:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: python-pydspam.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:04:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: python-pydspam.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u SPECS/python-pydspam.spec:1.1 SPECS/python-pydspam.spec:1.2 --- SPECS/python-pydspam.spec:1.1 Sun Aug 28 00:01:44 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:04:46 2005 @@ -20,14 +20,13 @@ Python interface for dspam library. %description -l pl -Interfejs Pythona do biblioteki dspam +Interfejs Pythona do biblioteki dspam. %prep %setup -q -n %{module}-%{version} %patch0 -p1 %build - python setup.py build %install @@ -49,6 +48,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 22:04:46 qboosh +- cosmetics + Revision 1.1 2005/08/27 22:01:44 arekm - new; unfortunately only dspam 2.x supported - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pydspam.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 00:05:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: crossmingw32-binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:05:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: crossmingw32-binutils.spec (1.55 -> 1.56) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-binutils.spec diff -u SPECS/crossmingw32-binutils.spec:1.55 SPECS/crossmingw32-binutils.spec:1.56 --- SPECS/crossmingw32-binutils.spec:1.55 Mon Aug 15 02:22:31 2005 +++ SPECS/crossmingw32-binutils.spec Sun Aug 28 00:05:43 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - Mingw32 binutils Summary(tr): GNU geli?tirme ara?lar? - Mingw32 binutils Name: crossmingw32-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.56 2005/08/27 22:05:43 qboosh +- updated to 2.16.91.0.3 + Revision 1.55 2005/08/15 00:22:31 qboosh - updated to 2.16.91.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-binutils.spec?r1=1.55&r2=1.56&f=u From qboosh at pld-linux.org Sun Aug 28 00:11:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: crossmingw32-pcre.spec - updated to 6.3 (fixes CAN-2005-249... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:11:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 6.3 (fixes CAN-2005-2491) - removed obsolete cxx patch ---- Files affected: SPECS: crossmingw32-pcre.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-pcre.spec diff -u SPECS/crossmingw32-pcre.spec:1.13 SPECS/crossmingw32-pcre.spec:1.14 --- SPECS/crossmingw32-pcre.spec:1.13 Sat Aug 6 15:30:27 2005 +++ SPECS/crossmingw32-pcre.spec Sun Aug 28 00:11:23 2005 @@ -3,13 +3,12 @@ Summary: Perl-Compatible Regular Expression library - Mingw32 cross version Summary(pl): Biblioteka perlowych wyra?e? regularnych - wersja skro?na dla Mingw32 Name: crossmingw32-%{realname} -Version: 6.2 +Version: 6.3 Release: 1 License: BSD (see LICENCE) Group: Libraries Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{realname}-%{version}.tar.bz2 -# Source0-md5: d8a2024eb56c331bb5c55601c3cd9ce1 -Patch0: pcre-cxx.patch +# Source0-md5: e6779ead12cd20fa055fb3a05b004f2c URL: http://www.pcre.org/ BuildRequires: autoconf BuildRequires: automake @@ -58,7 +57,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 %build CC=%{target}-gcc ; export CC @@ -123,6 +121,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 22:11:23 qboosh +- updated to 6.3 (fixes CAN-2005-2491) +- removed obsolete cxx patch + Revision 1.13 2005/08/06 13:30:27 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-pcre.spec?r1=1.13&r2=1.14&f=u From aredridel at pld-linux.org Sun Aug 28 02:18:48 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: PTlink6.19.4.tar.gz Message-ID: <3131.1125188328@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.4.tar.gz e7c1ac8e0f6eb5486378b84d3949cc2b PTlink6.19.4.tar.gz Size: 786808 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sun Aug 28 02:18:41 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: ircd-ptlink.spec - up to 6.19.4 In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 00:18:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 6.19.4 ---- Files affected: SPECS: ircd-ptlink.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/ircd-ptlink.spec diff -u SPECS/ircd-ptlink.spec:1.13 SPECS/ircd-ptlink.spec:1.14 --- SPECS/ircd-ptlink.spec:1.13 Sun May 1 19:31:30 2005 +++ SPECS/ircd-ptlink.spec Sun Aug 28 02:18:34 2005 @@ -9,12 +9,12 @@ Summary: Internet Relay Chat Server Summary(pl): Serwer IRC Name: ircd-ptlink -Version: 6.19.3 +Version: 6.19.4 Release: 1 License: GPL v2 Group: Daemons Source0: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink%{version}.tar.gz -# Source0-md5: d46979f76e28757fedc508544dd0b5fa +# Source0-md5: e7c1ac8e0f6eb5486378b84d3949cc2b Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-config.patch @@ -64,7 +64,8 @@ %{__autoconf} CFLAGS="%{rpmcflags} %{?debug:-DDEBUGMODE}" %configure \ - %{?with_ipv6:--enable-ipv6} + %{?with_ipv6:--enable-ipv6} \ + --enable-utf-8 %{__make} \ LIBDIR=%{_libdir} @@ -117,7 +118,8 @@ %doc doc/{*.txt,*.conf,server-version-info,Tao-of-IRC.940110} doc_hybrid6/* CHANGES README %attr(755,root,root) %{_sbindir}/* %attr(770,root,ircd) %dir %{_sysconfdir} -%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ircd.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.dconf %attr(754,root,root) /etc/rc.d/init.d/ircd %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/ircd %dir %{_libdir}/ircd @@ -131,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/28 00:18:34 aredridel +- up to 6.19.4 + Revision 1.13 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ircd-ptlink.spec?r1=1.13&r2=1.14&f=u From twittner at pld-linux.org Sun Aug 28 02:25:11 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: vdkbuilder-ac_FLAGS.patch (NEW) - don't introduce own fla... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:25:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configue (for vdkbuilder-2.4.0) ---- Files affected: SOURCES: vdkbuilder-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder-ac_FLAGS.patch diff -u /dev/null SOURCES/vdkbuilder-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:25:11 2005 +++ SOURCES/vdkbuilder-ac_FLAGS.patch Sun Aug 28 02:25:06 2005 @@ -0,0 +1,37 @@ +diff -Nurb o.vdkbuilder2-2.4.0/configure.in n.vdkbuilder2-2.4.0/configure.in +--- o.vdkbuilder2-2.4.0/configure.in 2004-05-18 14:31:17.000000000 +0200 ++++ n.vdkbuilder2-2.4.0/configure.in 2005-08-28 01:40:11.341036792 +0200 +@@ -65,8 +65,6 @@ + dnl------------------- + AC_ARG_ENABLE(devel, [ --enable-devel[=yes/no] Compile VDKBuilder with all info for debug [default=no]],,enable_devel=no) + +-AC_ARG_ENABLE(opt, [ --enable-opt[=OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) +- + dnl AC_ARG_ENABLE(gnome,[ --enable-gnome=[yes/no] Enable use of gnome[default=no], not required if vdk was compiled with gnome-support], + dnl gnome=$enableval, gnome=no) + +@@ -85,22 +83,11 @@ + dnl check user options + dnl ------------------- + if test "x$enable_devel" = "xyes"; then +- cflag="-g" + AC_DEFINE(VDKBDEBUG) +-else +- cflag="-s" +-fi +- +-if test "x$enable_opt" != "xno"; then +- cflag="$cflag -O$enable_opt" +-fi +- +-if test "x$prefix" = "xNONE"; then +- prefix="/usr/local" + fi + +-CFLAGS="$cflag -I../include -Wall" +-CXXFLAGS="$cflag -I../include -Wall" ++CFLAGS="-I../include -Wall $CFLAGS" ++CXXFLAGS="-I../include -Wall $CXXFLAGS" + + dnl check vdkxdb support + if test "x$enable_vdkxdb" == "xyes"; then ================================================================ From twittner at pld-linux.org Sun Aug 28 02:26:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz Message-ID: <13583.1125188810@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz Size: 1079112 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 02:26:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: vdkbuilder.spec - up to 2.4.0 - added -ac_FLAGS.patch (don'... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:26:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdkbuilder.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.14 SPECS/vdkbuilder.spec:1.15 --- SPECS/vdkbuilder.spec:1.14 Sat Aug 27 22:16:00 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 02:26:44 2005 @@ -2,19 +2,20 @@ Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder -Version: 2.0.1 -Release: 2 +Version: 2.4.0 +Release: 0.1 License: GPL Group: Development/Tools -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: 6a004c7a8ed51a30722383eb50ee69f8 +Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz +# Source0-md5: 91216ce6659e447862b2bdc7335074fc +Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel >= 2.0.0 BuildRequires: glib2-devel >= 2.0.0 BuildRequires: libtool -BuildRequires: vdk-devel >= 2.0.1 +BuildRequires: vdk-devel >= 2.4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _omf_dest_dir %(scrollkeeper-config --omfdir) @@ -41,10 +42,10 @@ Pliki nag??wkowe blibliotek vdkbuilder. %prep -%setup -q +%setup -q -n %{name}2-%{version} +%patch0 -p1 %build -#CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" %{__libtoolize} %{__aclocal} %{__autoconf} @@ -67,7 +68,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* @@ -85,6 +86,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/28 00:26:44 twittner +- up to 2.4.0 +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.14 2005/08/27 20:16:00 darekr - added -devel subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Sun Aug 28 02:31:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: vdk-ac_FLAGS.patch (NEW) - don't introduce own flags - ho... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:31:44 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u /dev/null SOURCES/vdk-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:31:44 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 02:31:39 2005 @@ -0,0 +1,54 @@ +diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in +--- o.vdk-2.4.1/configure.in 2004-11-06 19:16:43.000000000 +0100 ++++ n.vdk-2.4.1/configure.in 2005-08-28 02:02:50.092475176 +0200 +@@ -2,8 +2,6 @@ + AC_PREREQ(2.52) + AC_INIT(vdk/vdk.h) + +-cflags_set=${CFLAGS+set} +- + VDK_VERSION_MAJOR=2 + VDK_VERSION_MINOR=4 + VDK_VERSION_MICRO=1 +@@ -121,28 +119,15 @@ + dnl ========================== + dnl user configurable options + dnl ========================== +-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) +-AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) ++AC_ARG_ENABLE(vdkdebug, [ --enable-vdkdebug=[no/yes] enable vdkdebug information [default=no]],,enable_debug=no) + AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) + dnl doxygen options + AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) + AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) + AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) + +-if test "x$enable_debug" = "xminimum"; then +- AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-s" +-else +- if test "x$enable_debug" = "xyes"; then ++if test "x$enable_vdkdebug" = "xyes"; then + AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-g" +- else +- CXXFLAGS="-s" +- fi +-fi +- +-if test "x$enable_opt" != "xno"; then +- CXXFLAGS="$CXXFLAGS -O$enable_opt" + fi + + if test "x$enable_testvdk" = "xyes"; then +@@ -179,10 +164,6 @@ + TAG_SIGC="" + fi + +-if test "x$enable_devel" = "xyes"; then +- cflag="-g" +-fi +- + if test "x$enable_doc_latex" = "xyes"; then + GENERATE_LATEX=YES + # TAG_SIGC=USE_SIGCPLUSPLUS ================================================================ From twittner at pld-linux.org Sun Aug 28 02:39:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: vdk.spec - up to 2.4.1 - removed -ac-am-fixes.patch (mostly... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:39:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdk.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.23 SPECS/vdk.spec:1.24 --- SPECS/vdk.spec:1.23 Sat Aug 27 22:17:16 2005 +++ SPECS/vdk.spec Sun Aug 28 02:39:21 2005 @@ -1,21 +1,26 @@ # $Revision$, $Date$ +# +# Conditional build: +# +%bcond_without static_libs # don't build static libraries +# %include /usr/lib/rpm/macros.perl -Summary: C++ Wrapper over GTK+ 2.0.x library -Summary(pl): Wrapper C++ dla GTK+ 2.0.x +Summary: C++ Wrapper over GTK+ 2.x library +Summary(pl): Wrapper C++ dla GTK+ 2.x Name: vdk -Version: 2.0.3 -Release: 2 +Version: 2.4.1 +Release: 0.1 License: LGPL Group: X11/Libraries -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: b76be21a0014d089c176442ba68bd3c7 -Patch0: %{name}-ac-am-fixes.patch -URL: http://vdkbuilder.sourceforge.net/ -BuildRequires: autoconf +Source0: http://kent.dl.sourceforge.net/sourceforge/vdklib/%{name}-%{version}.tar.gz +# Source0-md5: f388bf265a476880e98ddec7ac4e63f7 +Patch0: %{name}-ac_FLAGS.patch +URL: http://www.mariomotta.it/vdklib/ +BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.0.0 +BuildRequires: gtk+2-devel >= 1:2.4.0 BuildRequires: imlib-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel @@ -28,17 +33,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -C++ Wrapper over GTK+ 2.0.x library. +C++ Wrapper over GTK+ 2.x library. %description -l pl -Wrapper C++ dla GTK+ 2.0.x. +Wrapper C++ dla GTK+ 2.x. %package devel Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 2.0.0 +Requires: gtk+2-devel >= 1:2.4.0 %description devel Header files and development documentation for VDK library. @@ -70,7 +75,8 @@ %{__autoconf} %{__automake} %configure \ - --enable-static=yes + %{?with_static_libs:--enable-static=yes} \ + %{!?with_static_libs:--enable-static=no} %{__make} %{__make} docs @@ -104,10 +110,13 @@ %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_pkgconfigdir}/* +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/lib*.a +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -115,6 +124,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 00:39:21 twittner +- up to 2.4.1 +- removed -ac-am-fixes.patch (mostly contains content from vim backup files) +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.23 2005/08/27 20:17:16 darekr - strict deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.23&r2=1.24&f=u From twittner at pld-linux.org Sun Aug 28 02:39:38 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: vdk-2.4.1.tar.gz Message-ID: <29335.1125189578@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kent.dl.sourceforge.net/sourceforge/vdklib/vdk-2.4.1.tar.gz f388bf265a476880e98ddec7ac4e63f7 vdk-2.4.1.tar.gz Size: 1062475 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 03:01:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: vdk-ac_FLAGS.patch - don't append the same things (CXXFLA... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:01:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't append the same things (CXXFLAGS) twice. ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u SOURCES/vdk-ac_FLAGS.patch:1.1 SOURCES/vdk-ac_FLAGS.patch:1.2 --- SOURCES/vdk-ac_FLAGS.patch:1.1 Sun Aug 28 02:31:39 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 03:01:19 2005 @@ -52,3 +52,25 @@ if test "x$enable_doc_latex" = "xyes"; then GENERATE_LATEX=YES # TAG_SIGC=USE_SIGCPLUSPLUS +diff -Nurb o.vdk-2.4.1/testvdk/Makefile.am n.vdk-2.4.1/testvdk/Makefile.am +--- o.vdk-2.4.1/testvdk/Makefile.am 2004-11-06 18:47:14.000000000 +0100 ++++ n.vdk-2.4.1/testvdk/Makefile.am 2005-08-28 02:45:08.377597184 +0200 +@@ -5,7 +5,6 @@ + EXTRA_PROGRAMS = testvdk testvdkstring + + INCLUDES = @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + testvdk_LDFLAGS = $(GTK_LIBS) + testvdk_LDADD = $(top_srcdir)/vdk/libvdk.la +diff -Nurb o.vdk-2.4.1/vdk/Makefile.am n.vdk-2.4.1/vdk/Makefile.am +--- o.vdk-2.4.1/vdk/Makefile.am 2004-11-06 18:47:10.000000000 +0100 ++++ n.vdk-2.4.1/vdk/Makefile.am 2005-08-28 02:45:22.032521320 +0200 +@@ -186,7 +186,6 @@ + -version-info $(LT_VDK_CURRENT):$(LT_VDK_REVISION):$(LT_VDK_AGE) + + INCLUDES = -I$(top_srcdir)/include @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + AM_LDFLAGS = $(GTK_CFLAGS) + LIBS = $(GTK_LIBS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac_FLAGS.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:03:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: vdk-ac-am-fixes.patch - replaced by vdk-ac_FLAGS.patch In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:03:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac-am-fixes.patch diff -u SOURCES/vdk-ac-am-fixes.patch:1.1 SOURCES/vdk-ac-am-fixes.patch:1.2 --- SOURCES/vdk-ac-am-fixes.patch:1.1 Sat Apr 10 00:05:35 2004 +++ SOURCES/vdk-ac-am-fixes.patch Sun Aug 28 03:03:11 2005 @@ -47,722 +47,6 @@ dnl contrib/Makefile -diff -burN vdk-2.0.3-oryg/configure.in~ vdk-2.0.3/configure.in~ ---- vdk-2.0.3-oryg/configure.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in~ 2004-04-09 22:51:14.000000000 +0200 -@@ -0,0 +1,345 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ fi -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ -+AC_SUBST(SIGCDEFINE) -+ -+ -+if test "x$enable_testsigc" = "xyes" && test "$SIGCDEFINE" != ""; then -+ TESTSIGCVDK="testsigcvdk" -+ WITHTESTSIGCVDK="yes" -+else -+ TESTSIGCVDK="" -+ WITHTESTSIGCVDK="no" -+fi -+ -+AC_SUBST(TESTSIGCVDK) -+ -+dnl doxygen support -+ -+if test "x$enable_doc_html" = "xyes"; then -+ GENERATE_HTML=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_HTML=NO -+ TAG_SIGC="" -+fi -+ -+if test "x$enable_devel" = "xyes"; then -+ cflag="-g" -+fi -+ -+if test "x$enable_doc_latex" = "xyes"; then -+ GENERATE_LATEX=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_LATEX=NO -+fi -+ -+if test "x$enable_doc_man" = "xyes"; then -+ GENERATE_MAN=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_MAN=NO -+ -+fi -+ -+AC_SUBST(GENERATE_HTML) -+AC_SUBST(GENERATE_LATEX) -+AC_SUBST(GENERATE_MAN) -+AC_SUBST(TAG_SIGC) -+ -+ -+GNOMEDEFINE="" -+GNOME_CFLAGS="" -+GNOME_LIBS="" -+GNOME_VDK="" -+ -+AC_SUBST(GNOMEDEFINE) -+AC_SUBST(GNOME_LIBS) -+AC_SUBST(GNOME_CFLAGS) -+AC_SUBST(GNOME_VDK) -+ -+# just to be fully gtk2.x compliant... -+dnlCXXFLAGS="$CXXFLAGS -DGTK_DISABLE_DEPRECATED -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+CXXFLAGS="$CXXFLAGS -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+INCLUDES="$GTK_CFLAGS $SIGC_CFLAGS $SIGCDEFINE" -+ -+ -+dnl contrib/Makefile -+dnl testvdk/pixmap/Makefile -+dnl sigcvdktest/Makefile -+dnl vdk.spec \ -+ -+AC_OUTPUT([Makefile \ -+ vdk/Makefile \ -+ vdk/vdkfeatures.h \ -+ testvdk/Makefile \ -+ sigcvdktest/Makefile \ -+ example/Makefile \ -+ doc/Makefile \ -+ doc/doxy/Makefile \ -+ doc/doxy/Doxyfile \ -+ vdk-2.m4 \ -+ vdk-config-2], \ -+ [chmod +x vdk-config-2]) -+ -+if test -z $DOXYGEN; then -+ echo "*****************************************************"; -+ echo "* doxygen was not found, i will not be able to *"; -+ echo "* generate the docs by myself. *"; -+ echo "* Doxygen is recommended, please check: *"; -+ echo "* http://www.doxygen.org/download.html *"; -+ echo "* for the latest version of doxygen. *"; -+ echo "*****************************************************"; -+ WITHDOCHTML="no" -+else -+ WITHDOCHTML="yes" -+fi -+ -+echo "" -+echo "VDK configure finished" -+echo "VDK configuration:" -+echo " - Version : $VERSION" -+echo " - Make static lib : $enable_static" -+echo " - Make vdk test program : $enable_testvdk" -+echo " - Libsigc++ signal extension support: $WITHSIGC" -+echo " - Make signal extension test program: $WITHTESTSIGCVDK" -+if test "x$WITHSIGC" = "xyes"; then -+echo "**************************************************************" -+echo "You have choosed to use Libsigc++ with VDK which is" -+echo "deprecated and will be unsupported in the near future" -+echo "**************************************************************" -+fi -+echo " - Gnome support : $WITHGNOME" -+echo " - Debug : $enable_debug" -+echo " - Optimization : $enable_opt" -+echo " - Make docs on html format : $WITHDOCHTML" -+echo " * Host : $host" -+echo " * Installation Prefix : $prefix" -+echo " * Compiler version :" `g++ --version` -+echo " * Target machine :" `c++ -dumpmachine` -+#echo " * CPU :" `cat /proc/cpuinfo` -diff -burN vdk-2.0.3-oryg/configure.in-oryg vdk-2.0.3/configure.in-oryg ---- vdk-2.0.3-oryg/configure.in-oryg 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in-oryg 2004-04-09 22:40:13.000000000 +0200 -@@ -0,0 +1,362 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) -+AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-s" -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-g" -+ else -+ CXXFLAGS="-s" -+ fi -+fi -+ -+if test "x$enable_opt" != "xno"; then -+ CXXFLAGS="$CXXFLAGS -O$enable_opt" -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac-am-fixes.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:06:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: vdk-ac-am-fixes.patch (REMOVED) - replaced by vdk-ac_FLAG... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:06:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch (next rm attempt) ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:36:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: rhythmbox-gtk2.8-crash.patch (NEW) - added - evil hack to... In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:36:53 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added - evil hack to fix crash ---- Files affected: SOURCES: rhythmbox-gtk2.8-crash.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rhythmbox-gtk2.8-crash.patch diff -u /dev/null SOURCES/rhythmbox-gtk2.8-crash.patch:1.1 --- /dev/null Sun Aug 28 03:36:53 2005 +++ SOURCES/rhythmbox-gtk2.8-crash.patch Sun Aug 28 03:36:47 2005 @@ -0,0 +1,12 @@ +diff -ur rhythmbox-0.9.0-o/shell/main.c rhythmbox-0.9.0/shell/main.c +--- rhythmbox-0.9.0-o/shell/main.c 2005-08-10 07:23:28.000000000 -0600 ++++ rhythmbox-0.9.0/shell/main.c 2005-08-27 19:14:43.000000000 -0600 +@@ -166,6 +166,8 @@ + = (void *) gst_init_get_popt_table (); + #endif + ++ gtk_init(NULL, NULL); ++ + gtk_set_locale (); + program = gnome_program_init (PACKAGE, VERSION, + LIBGNOMEUI_MODULE, argc+1, new_argv, ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:37:14 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS (DEVEL): rhythmbox.spec - added gtk 2.8 crash patch In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:37:14 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added gtk 2.8 crash patch ---- Files affected: SPECS: rhythmbox.spec (1.46.2.8 -> 1.46.2.9) ---- Diffs: ================================================================ Index: SPECS/rhythmbox.spec diff -u SPECS/rhythmbox.spec:1.46.2.8 SPECS/rhythmbox.spec:1.46.2.9 --- SPECS/rhythmbox.spec:1.46.2.8 Thu Aug 18 13:45:50 2005 +++ SPECS/rhythmbox.spec Sun Aug 28 03:37:08 2005 @@ -10,6 +10,7 @@ # Source0-md5: 3e01834c5085af7fc11d0b98b76b9354 Patch0: %{name}-desktop.patch Patch1: %{name}-broken_locale.patch +Patch2: %{name}-gtk2.8-crash.patch URL: http://www.rhythmbox.org/ BuildRequires: autoconf BuildRequires: automake @@ -53,6 +54,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # broken rm po/{ar,mn}.po @@ -129,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.9 2005/08/28 01:37:08 aredridel +- added gtk 2.8 crash patch + Revision 1.46.2.8 2005/08/18 11:45:50 aflinta - rebuild with cair, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rhythmbox.spec?r1=1.46.2.8&r2=1.46.2.9&f=u From qboosh at pld-linux.org Sun Aug 28 09:16:38 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: vdk.spec - updated gtk+2 epoch; sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:16:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated gtk+2 epoch; sorted BRs ---- Files affected: SPECS: vdk.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.24 SPECS/vdk.spec:1.25 --- SPECS/vdk.spec:1.24 Sun Aug 28 02:39:21 2005 +++ SPECS/vdk.spec Sun Aug 28 09:16:28 2005 @@ -1,7 +1,6 @@ # $Revision$, $Date$ # # Conditional build: -# %bcond_without static_libs # don't build static libraries # %include /usr/lib/rpm/macros.perl @@ -20,8 +19,10 @@ BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.4.0 +BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel +# both??? +BuildRequires: libsigc++1-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool @@ -29,7 +30,6 @@ BuildRequires: pkgconfig BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: zlib-devel -BuildRequires: libsigc++1-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,7 +43,7 @@ Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 1:2.4.0 +Requires: gtk+2-devel >= 2:2.4.0 %description devel Header files and development documentation for VDK library. @@ -69,7 +69,6 @@ %build # exceptions and rtti are used in this package --misiek -rm -f missing %{__libtoolize} %{__aclocal} %{__autoconf} @@ -103,13 +102,13 @@ %files devel %defattr(644,root,root,755) %doc README ChangeLog AUTHORS NEWS BUGS TODO doc/doxy/html -%{_examplesdir}/%{name}-%{version} +%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%attr(755,root,root) %{_bindir}/* %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_examplesdir}/%{name}-%{version} %{_pkgconfigdir}/* %if %{with static_libs} @@ -124,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 07:16:28 qboosh +- updated gtk+2 epoch; sorted BRs + Revision 1.24 2005/08/28 00:39:21 twittner - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 09:19:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: uClibc-gcc4.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:19:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: uClibc-gcc4.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 09:20:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: uClibc-newsoname.patch, uClibc-sparc.patch - updated for ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:20:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.9.28 ---- Files affected: SOURCES: uClibc-newsoname.patch (1.2 -> 1.3) , uClibc-sparc.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-newsoname.patch diff -u SOURCES/uClibc-newsoname.patch:1.2 SOURCES/uClibc-newsoname.patch:1.3 --- SOURCES/uClibc-newsoname.patch:1.2 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-newsoname.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,5 @@ -diff -urN uClibc-0.9.26.org/libpthread/Makefile uClibc-0.9.26/libpthread/Makefile ---- uClibc-0.9.26.org/libpthread/Makefile 2004-01-25 15:20:49.547594064 +0100 -+++ uClibc-0.9.26/libpthread/Makefile 2004-01-25 15:33:34.026392026 +0100 +--- uClibc-0.9.28/libpthread/Makefile.orig 2005-08-18 00:49:49.000000000 +0200 ++++ uClibc-0.9.28/libpthread/Makefile 2005-08-28 00:04:19.595072696 +0200 @@ -21,7 +21,8 @@ #Adjust the soname version to avoid namespace collisions with glibc's libpthread @@ -11,12 +10,12 @@ LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so LIBTHREAD_DB=libthread_db.a -@@ -90,6 +91,8 @@ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \ - $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ -+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ -+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION); \ - fi; - if [ -f $(LIBTHREAD_DB) ] ; then \ - set -e; \ +@@ -84,6 +85,8 @@ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED) + $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) ++ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ ++ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION) + endif + ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y) + $(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols -soname=$(LIBTHREAD_DB_SHARED).1 \ ================================================================ Index: SOURCES/uClibc-sparc.patch diff -u SOURCES/uClibc-sparc.patch:1.4 SOURCES/uClibc-sparc.patch:1.5 --- SOURCES/uClibc-sparc.patch:1.4 Sun Jan 16 17:36:25 2005 +++ SOURCES/uClibc-sparc.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,6 @@ ---- uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c.orig 2005-01-16 10:50:58.798433255 +0000 -+++ uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c 2005-01-16 10:57:08.966876531 +0000 -@@ -93,7 +93,7 @@ +--- uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c 2005-08-28 00:19:02.940783736 +0200 +@@ -81,7 +81,7 @@ if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) { @@ -9,149 +9,51 @@ _dl_progname, reloc_type); _dl_exit(30); }; -@@ -140,8 +140,10 @@ +@@ -128,8 +128,10 @@ got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff)); #endif +#if defined (__SUPPORT_LD_DEBUG__) -+ if (_dl_debug_bindings) ++ if (_dl_debug_bindings) _dl_dprintf(2, "Address = %x\n",new_addr); - _dl_exit(32); +#endif return (unsigned int) new_addr; } -@@ -154,20 +156,20 @@ - int reloc_type; - int symtab_index; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - struct elf_resolve * tpnt = rpnt->dyn; - - /* Now parse the relocation information */ -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i += sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i += sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - - switch(reloc_type){ - case R_SPARC_NONE: -@@ -194,22 +196,22 @@ - int reloc_type; - int goof = 0; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - unsigned int symbol_addr; - int symtab_index; - struct elf_resolve * tpnt = rpnt->dyn; - /* Now parse the relocation information */ - -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - symbol_addr = 0; - - if(symtab_index) { -@@ -229,33 +231,33 @@ - case R_SPARC_NONE: - break; - case R_SPARC_32: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_DISP32: -- *reloc_addr = symbol_addr + rpnt->r_addend - (unsigned int) reloc_addr; -+ *reloc_addr = symbol_addr + relpnt->r_addend - (unsigned int) reloc_addr; - break; - case R_SPARC_GLOB_DAT: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_JMP_SLOT: - reloc_addr[1] = 0x03000000 | ((symbol_addr >> 10) & 0x3fffff); - reloc_addr[2] = 0x81c06000 | (symbol_addr & 0x3ff); - break; - case R_SPARC_RELATIVE: -- *reloc_addr += (unsigned int) tpnt->loadaddr + rpnt->r_addend; -+ *reloc_addr += (unsigned int) tpnt->loadaddr + relpnt->r_addend; - break; - case R_SPARC_HI22: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & 0xffc00000)|(symbol_addr >> 10); - break; - case R_SPARC_LO10: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & ~0x3ff)|(symbol_addr & 0x3ff); - break; - case R_SPARC_WDISP30: ---- uClibc-0.9.27/ldso/ldso/ldso.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/ldso.c 2005-01-16 11:21:49.751151256 +0000 -@@ -648,7 +648,7 @@ +--- uClibc-0.9.28/ldso/ldso/ldso.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/ldso.c 2005-08-28 00:19:31.295473168 +0200 +@@ -597,7 +597,7 @@ + for (; runp; runp = runp->next) { + if (runp->tpnt == tcurr) { struct elf_resolve *here = init_fini_list[k]; - #ifdef __SUPPORT_LD_DEBUG__ - if(_dl_debug) -- _dl_dprintf(2, "Move %s from pos %d to %d in INIT/FINI list.\n", here->libname, k, j); -+ _dl_dprintf(2, "Move %s from pos %x to %x in INIT/FINI list.\n", here->libname, k, j); - #endif +- _dl_if_debug_dprint("Move %s from pos %d to %d in INIT/FINI list\n", here->libname, k, j); ++ _dl_if_debug_dprint("Move %s from pos %x to %x in INIT/FINI list\n", here->libname, k, j); for (i = (k - j); i; --i) init_fini_list[i+j] = init_fini_list[i+j-1]; -@@ -911,7 +911,7 @@ + init_fini_list[j] = here; +@@ -837,7 +837,7 @@ + void *retval; #if 0 - #ifdef __SUPPORT_LD_DEBUG_EARLY__ -- _dl_dprintf(2, "malloc: request for %d bytes\n", size); -+ _dl_dprintf(2, "malloc: request for %x bytes\n", size); - #endif +- _dl_debug_early("request for %d bytes\n", size); ++ _dl_debug_early("request for %x bytes\n", size); #endif ---- uClibc-0.9.27/ldso/ldso/dl-elf.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/dl-elf.c 2005-01-16 11:23:39.541794934 +0000 -@@ -827,7 +827,8 @@ + if (_dl_malloc_function) +--- uClibc-0.9.28/ldso/ldso/dl-elf.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/dl-elf.c 2005-08-28 00:20:16.525597144 +0200 +@@ -813,7 +813,8 @@ else _dl_write(fd, string, _dl_strlen(string)); break; - +#ifndef __sparc__ -+ /* _dl_simple_ltoa uses undefined .udiv */ ++ /* _dl_simple_ltoa() uses undefined .udiv */ case 'i': case 'd': { -@@ -838,6 +839,7 @@ +@@ -824,6 +825,7 @@ _dl_write(fd, string, _dl_strlen(string)); break; } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/uClibc-sparc.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: uClibc.spec - updated to 0.9.28 (x86_64 port introduced) - ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:25:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ---- Files affected: SPECS: uClibc.spec (1.111 -> 1.112) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.111 SPECS/uClibc.spec:1.112 --- SPECS/uClibc.spec:1.111 Thu Feb 17 00:19:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:25:22 2005 @@ -2,25 +2,24 @@ Summary: C library optimized for size Summary(pl): Biblioteka C zoptymalizowana na rozmiar Name: uClibc -Version: 0.9.27 -Release: 1.1 +Version: 0.9.28 +Release: 0.1 Epoch: 2 License: LGPL Group: Libraries Source0: http://uclibc.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 6250bd6524283bd8e7bc976d43a46ec0 +# Source0-md5: 1ada58d919a82561061e4741fb6abd29 Patch0: %{name}-newsoname.patch Patch1: %{name}-alpha.patch Patch2: %{name}-toolchain-wrapper.patch Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch -Patch6: %{name}-gcc4.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 BuildRequires: which -ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 +ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) @@ -68,7 +67,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -e ' %ifarch sparc sparc64 sparcv9 @@ -80,6 +78,9 @@ %ifarch ppc ppc64 s/default TARGET_i386/default TARGET_powerpc/ %endif +%ifarch %{x8664} + s/default TARGET_i386/default TARGET_x86_64/ +%endif ' extra/Configs/Config.in > Conf.in.tmp mv -f Conf.in.tmp extra/Configs/Config.in @@ -156,7 +157,6 @@ ln -sf /usr/include/asm-sparc64 $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/asm-sparc64 %endif ln -sf /usr/include/linux $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/linux -rm $RPM_BUILD_ROOT/%{_prefix}/*-linux-uclibc/usr/include/.cvsignore %clean rm -rf $RPM_BUILD_ROOT @@ -164,7 +164,7 @@ %files %defattr(644,root,root,755) %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif @@ -178,7 +178,7 @@ %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -193,6 +193,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.112 2005/08/28 07:25:22 qboosh +- updated to 0.9.28 (x86_64 port introduced) +- updated newsoname,sparc patches, removed obsolete gcc4 patch + Revision 1.111 2005/02/16 23:19:22 tommat - be more compatible with our glibc, allow to build for example ash ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.111&r2=1.112&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: uClibc-0.9.28.tar.bz2 Message-ID: <3841.1125213933@distfiles.pld-linux.org> Files fetched: 1 STORED: http://uclibc.org/downloads/uClibc-0.9.28.tar.bz2 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 Size: 1763847 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 09:54:26 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: uClibc.spec - fix ldso prefix (use runtime, not devel) In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:54:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix ldso prefix (use runtime, not devel) ---- Files affected: SPECS: uClibc.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.112 SPECS/uClibc.spec:1.113 --- SPECS/uClibc.spec:1.112 Sun Aug 28 09:25:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:54:20 2005 @@ -109,7 +109,8 @@ sed -e 's/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/; s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; - s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/ + s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; + s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/28 07:54:20 qboosh +- fix ldso prefix (use runtime, not devel) + Revision 1.112 2005/08/28 07:25:22 qboosh - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.112&r2=1.113&f=u From arekm at pld-linux.org Sun Aug 28 10:14:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: kexec-tools.spec - up to 1.101 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.101 ---- Files affected: SPECS: kexec-tools.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.8 SPECS/kexec-tools.spec:1.9 --- SPECS/kexec-tools.spec:1.8 Tue Dec 14 21:56:49 2004 +++ SPECS/kexec-tools.spec Sun Aug 28 10:13:53 2005 @@ -1,26 +1,22 @@ # $Revision$, $Date$ -# TODO: -# - %desc en and pl are out of sync -# - kernel version needs to reviewed. -%define kernel_version 2.5.73 Summary: Tool for starting new kernel without reboot Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools -Version: 1.98 -Release: 0.5 +Version: 1.101 +Release: 0.1 License: GPL Group: Applications/System -Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tgz -# Source0-md5: 834823637153e07a85d4544b02944080 +Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz +# Source0-md5: b4f7ffcc294d41a6a4c40d6e44b7734d Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 -Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: glibc-static -Requires: kernel >= %{kernel_version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description kexec is a set of system calls that allows you to load another kernel from the currently executing Linux kernel. The current implementation @@ -38,21 +34,19 @@ %prep %setup -q -%patch -p1 %build -# why is this here? -%{?debug:find ./objdir -type f | xargs rm -f} - +%configure %{__make} \ CC="%{__cc}" \ OPTFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sbindir},/sbin} -install objdir/build/sbin/kexec $RPM_BUILD_ROOT/sbin -install objdir/build/bin/kexec_test $RPM_BUILD_ROOT%{_sbindir} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE2} README @@ -61,10 +55,9 @@ %files %defattr(644,root,root,755) -%doc TODO News README -%attr(755,root,root) %{_sbindir}/do-kexec.sh -%attr(755,root,root) %{_sbindir}/kexec_test -%attr(755,root,root) /sbin/kexec +%doc AUTHORS TODO News README +%attr(755,root,root) %{_sbindir}/* +%attr(755,root,root) %{_libdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 08:13:53 arekm +- up to 1.101 + Revision 1.8 2004/12/14 20:56:49 glen - updated to 1.98 - put kexec to /sbin (rc.shutdown expects it there) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sun Aug 28 10:14:04 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: kexec-tools-1.101.tar.gz README Message-ID: <3428.1125216844@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz Size: 206785 bytes ALREADY GOT: http://www.xmission.com/~ebiederm/files/kexec/README b80e99096ec4ef37b09ecb5707233fb3 README -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:27 2005 Subject: DISTFILES: proxytunnel-1.5.0.tgz Message-ID: <9445.1125217106@distfiles.pld-linux.org> Files fetched: 1 STORED: http://proxytunnel.sourceforge.net/files/proxytunnel-1.5.0.tgz 2a36409580391e25421fc06e82eed4ce proxytunnel-1.5.0.tgz Size: 56775 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: proxytunnel.spec (NEW) - Init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 08:18:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Init PLD spec ---- Files affected: SPECS: proxytunnel.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u /dev/null SPECS/proxytunnel.spec:1.1 --- /dev/null Sun Aug 28 10:18:26 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 10:18:20 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +Summary: Proxy Tunnel ssh-over-https hack +Name: proxytunnel +Version: 1.5.0 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://proxytunnel.sourceforge.net/files/%{name}-%{version}.tgz +# Source0-md5: 2a36409580391e25421fc06e82eed4ce +URL: http://proxytunnel.sourceforge.net/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ProxyTunnel is a program that connects stdin and stdout to a server +somewhere on the network, through a standard HTTPS proxy. We mostly +use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to +do many things that wouldn't be possible without ProxyTunnel. +Proxytunnel can currently do the following: +- Create tunnels using HTTP and HTTPS proxies (That understand the + HTTP CONNECT command). +- Work as a back-end driver for an OpenSSH client, and create SSH + connections through HTTP(S) proxies. +- Work as a stand-alone application, listening on a port for + connections, and then tunneling these connections to a specified + destination. + +%prep +%setup -q + +%build + +%{__make} \ + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" + +%install +rm -rf $RPM_BUILD_ROOT + +install -D proxytunnel $RPM_BUILD_ROOT%{_bindir}/proxytunnel +install -D debian/proxytunnel.1 $RPM_BUILD_ROOT%{_mandir}/man1/proxytunnel.1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CREDITS CHANGES README +%attr(755,root,root) %{_bindir}/* +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 08:18:20 areq +- Init PLD spec + ================================================================ From arekm at pld-linux.org Sun Aug 28 10:22:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: kexec-tools.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:22:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: kexec-tools.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.9 SPECS/kexec-tools.spec:1.10 --- SPECS/kexec-tools.spec:1.9 Sun Aug 28 10:13:53 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:22:00 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools Version: 1.101 -Release: 0.1 +Release: 1 License: GPL Group: Applications/System Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 08:22:00 arekm +- rel 1 + Revision 1.9 2005/08/28 08:13:53 arekm - up to 1.101 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Sun Aug 28 10:26:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: mysqlcc.spec - rel 9; drop charset patch (use mysql-client.... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:26:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 9; drop charset patch (use mysql-client.conf for charset) ---- Files affected: SPECS: mysqlcc.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/mysqlcc.spec diff -u SPECS/mysqlcc.spec:1.28 SPECS/mysqlcc.spec:1.29 --- SPECS/mysqlcc.spec:1.28 Sat May 28 22:24:29 2005 +++ SPECS/mysqlcc.spec Sun Aug 28 10:26:12 2005 @@ -7,7 +7,7 @@ Name: mysqlcc Group: Applications/Databases Version: 0.9.4 -Release: 8 +Release: 9 License: GPL Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLCC/%{name}-%{version}-src.tar.gz # Source0-md5: 26ee3528dce690b227d8bfb71b46ae66 @@ -16,7 +16,6 @@ Patch1: %{name}-m4.patch Patch2: %{name}-shutdown.patch Patch3: %{name}-enablessl.patch -Patch4: %{name}-utf8-4.1.patch URL: http://www.mysql.com/products/mysqlcc/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -43,7 +42,6 @@ %patch1 -p1 %{?!with_mysql40:%patch2 -p1} %patch3 -p1 -%patch4 -p1 %build cp -f /usr/share/automake/config.sub . @@ -95,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/28 08:26:12 arekm +- rel 9; drop charset patch (use mysql-client.conf for charset) + Revision 1.28 2005/05/28 20:24:29 twittner - added bcond --with mysql40 - for building with mysql-4.0.x ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysqlcc.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Sun Aug 28 10:28:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: kexec-tools.spec - update BR In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update BR ---- Files affected: SPECS: kexec-tools.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.10 SPECS/kexec-tools.spec:1.11 --- SPECS/kexec-tools.spec:1.10 Sun Aug 28 10:22:00 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:28:30 2005 @@ -12,7 +12,8 @@ Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 URL: http://www.xmission.com/~ebiederm/files/kexec/ -BuildRequires: glibc-static +BuildRequires: glibc-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -65,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/28 08:28:30 arekm +- update BR + Revision 1.10 2005/08/28 08:22:00 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Sun Aug 28 10:31:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: uClibc-targetcpu.patch - don't add extra / at the end of ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:31:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't add extra / at the end of prefixes ---- Files affected: SOURCES: uClibc-targetcpu.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-targetcpu.patch diff -u SOURCES/uClibc-targetcpu.patch:1.4 SOURCES/uClibc-targetcpu.patch:1.5 --- SOURCES/uClibc-targetcpu.patch:1.4 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-targetcpu.patch Sun Aug 28 10:31:14 2005 @@ -5,7 +5,7 @@ config RUNTIME_PREFIX string "uClibc runtime library directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc" help RUNTIME_PREFIX is the directory into which the uClibc runtime libraries will be installed. The result will look something @@ -14,7 +14,7 @@ config DEVEL_PREFIX string "uClibc development environment directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/usr/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc/usr" help DEVEL_PREFIX is the directory into which the uClibc development environment will be installed. The result will look something ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-targetcpu.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 10:32:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: uClibc-toolchain-wrapper.patch - add runtime lib dir to -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:32:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add runtime lib dir to -rpath-link/-rpath (to catch ld-uClibc.so) ---- Files affected: SOURCES: uClibc-toolchain-wrapper.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/uClibc-toolchain-wrapper.patch diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.3 SOURCES/uClibc-toolchain-wrapper.patch:1.4 --- SOURCES/uClibc-toolchain-wrapper.patch:1.3 Sat Jan 15 23:36:50 2005 +++ SOURCES/uClibc-toolchain-wrapper.patch Sun Aug 28 10:32:19 2005 @@ -1,7 +1,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c --- uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c 2003-08-28 07:51:04.000000000 +0200 -@@ -0,0 +1,660 @@ +@@ -0,0 +1,666 @@ +/* vi: set sw=4 ts=4: */ +/* + * Copyright (C) 2000 Manuel Novoa III @@ -190,6 +190,7 @@ + char *dlstr; + char *incstr; + char *devprefix; ++ char *runprefix; + char *builddir; + char *libstr; + char *build_dlstr = 0; @@ -253,6 +254,11 @@ + devprefix = UCLIBC_DEVEL_PREFIX; + } + ++ runprefix = getenv("UCLIBC_RUNTIME_PREFIX"); ++ if (!runprefix) { ++ runprefix = UCLIBC_RUNTIME_PREFIX; ++ } ++ + builddir = getenv("UCLIBC_BUILD_DIR"); + if (!builddir) { + builddir = UCLIBC_BUILD_DIR; @@ -275,10 +281,10 @@ + } + + -+ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath_link[1]), "-Wl,-rpath-link,", builddir, "/lib", NULL); + -+ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL); + + xstrcat(&(uClibc_inc[0]), devprefix, "/include/", NULL); @@ -665,7 +671,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uClibc/Makefile --- uClibc-0.9.26.org/extra/gcc-uClibc/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-25 16:06:22.372828491 +0100 -@@ -0,0 +1,92 @@ +@@ -0,0 +1,93 @@ +# Makefile for building a fake gcc/binutils toolchain +# that simply spoofs the location of the C library +# @@ -686,6 +692,7 @@ + @echo "/* this file was autogenerated by make */" > gcc-uClibc.h + @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h ++ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h + @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h + @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 10:33:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:27 2005 Subject: SPECS: uClibc.spec - updated targetcpu, toolchain-wrapper patches -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:33:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ---- Files affected: SPECS: uClibc.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.113 SPECS/uClibc.spec:1.114 --- SPECS/uClibc.spec:1.113 Sun Aug 28 09:54:20 2005 +++ SPECS/uClibc.spec Sun Aug 28 10:33:15 2005 @@ -110,7 +110,7 @@ s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; - s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ + s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)/lib", ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/28 08:33:15 qboosh +- updated targetcpu,toolchain-wrapper patches - now dynamic linking works again + Revision 1.113 2005/08/28 07:54:20 qboosh - fix ldso prefix (use runtime, not devel) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.113&r2=1.114&f=u From arekm at pld-linux.org Sun Aug 28 10:41:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: mysqlcc-utf8-4.1.patch (REMOVED) - drop In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:41:43 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - drop ---- Files affected: SOURCES: mysqlcc-utf8-4.1.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:15:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:27 2005 Subject: SOURCES: mysql-administrator-termcap.patch (NEW), mysql-administra... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:15:38 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: mysql-administrator-termcap.patch (NONE -> 1.1) (NEW), mysql-administrator-lua.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mysql-administrator-termcap.patch diff -u /dev/null SOURCES/mysql-administrator-termcap.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-termcap.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,20 @@ +diff -urN mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 11:00:00.974042616 +0200 +@@ -28,7 +28,7 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + + +@@ -39,6 +39,6 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ Index: SOURCES/mysql-administrator-lua.patch diff -u /dev/null SOURCES/mysql-administrator-lua.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-lua.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,73 @@ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in mysql-administrator-1.0.22a/mysql-gui-common/configure.in +--- mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in 2005-06-02 05:20:50.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/configure.in 2005-08-28 10:58:26.907342928 +0200 +@@ -77,14 +77,14 @@ + + + # Lua Stuff +-LUA_CFLAGS= +-LUA_LDFLAGS=-llua ++LUA_CFLAGS=-I/usr/include/lua50 ++LUA_LDFLAGS="-llua50 -llualib50" + AC_ARG_WITH(lua-includes, + [ --with-lua-includes directory where Lua headers are located], + [LUA_CFLAGS=-I$withval]) + AC_ARG_WITH(lua-libs, + [ --with-lua-libs directory where Lua libraries are located], +- [LUA_LDFLAGS="$withval -llua"]) ++ [LUA_LDFLAGS="$withval -llua50 -llualib50"]) + AC_SUBST(LUA_CFLAGS) + AC_SUBST(LUA_LDFLAGS) + +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am 2005-04-14 04:48:08.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -8,7 +8,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrt_a_SOURCES=myx_grt.c\ + myx_grt_module.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-04-30 01:25:58.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -10,7 +10,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrtmods_a_SOURCES=\ + myx_grt_base.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-05-16 15:12:10.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973976 +0200 +@@ -18,7 +18,7 @@ + $(JAVA_INC)\ + @GTHREAD_CFLAGS@ @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ + @PYTHON_CFLAGS@ @ENABLED_MODULES@\ +- @GTK_CFLAGS@ ++ @GTK_CFLAGS@ @LUA_CFLAGS@ + + + grtsh_LDADD=\ +@@ -29,7 +29,7 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + + + agentest_LDADD=\ +@@ -40,5 +40,5 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:18:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: xpdf-intoverflow.patch (REMOVED), xpdf-freetype-includes.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:18:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: xpdf-intoverflow.patch (1.1 -> NONE) (REMOVED), xpdf-freetype-includes.patch (1.1 -> NONE) (REMOVED), xpdf-3.00pl2.patch (1.3 -> NONE) (REMOVED), xpdf-3.00pl3.patch (1.1 -> NONE) (REMOVED), xpdf-CAN-2005-2097.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:19:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: mysql-administrator.spec - up to 1.0.22a In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:19:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.22a ---- Files affected: SPECS: mysql-administrator.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/mysql-administrator.spec diff -u SPECS/mysql-administrator.spec:1.11 SPECS/mysql-administrator.spec:1.12 --- SPECS/mysql-administrator.spec:1.11 Tue May 24 20:58:52 2005 +++ SPECS/mysql-administrator.spec Sun Aug 28 11:19:02 2005 @@ -1,19 +1,27 @@ # $Revision$, $Date$ +%bcond_with canvas +%bcond_with grt Summary: A MySQL server management, configuration and monitoring tool Summary(pl): Narz?dzie do zarz?dzania, konfiguracji i monitorowania pracy serwera MySQL Name: mysql-administrator -Version: 1.0.19 -Release: 0.2 +Version: 1.0.22a +Release: 1 License: GPL Group: Applications/Databases Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/%{name}-%{version}.tar.gz -# Source0-md5: b495755208b55333cb9c060c09246fe2 +# Source0-md5: ed0f1af3eb7be03c2785ad9057492b75 +Patch0: %{name}-lua.patch +Patch1: %{name}-termcap.patch URL: http://www.mysql.com/products/administrator/ -BuildRequires: gtkmm-devel <= 2.2.0 +BuildRequires: autoconf +BuildRequires: automake +%{?with_canvas:BuildRequires: ftgl-devel} +BuildRequires: gtkmm22-devel BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: pcre-devel >= 3.9 BuildRequires: pkgconfig BuildRequires: mysql-devel +BuildRequires: lua50-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -27,15 +35,22 @@ %description -l pl MySQL Administrator jest pot??nym graficznym narz?dziem umo?liwiaj?cym ?atwe administrowanie ca?ym ?rodowiskiem MySQL. Dzi?ki przejrzystemu -interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy -i intuicyjny w obs?udze. +interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy i +intuicyjny w obs?udze. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build cd mysql-gui-common +%{__aclocal} +%{__autoconf} +%{__automake} %configure \ + %{?with_canvas:--enable-canvas} \ + %{?with_grt:--enable-grt} \ --with-commondirname=administrator %{__make} @@ -50,21 +65,19 @@ %{__make} -C mysql-gui-common install \ DESTDIR=$RPM_BUILD_ROOT -cd ../%{name} %{__make} -C %{name} install \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator -cp -a doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator +cp -a mysql-administrator/doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog res/FAQ -%attr(755,root,root) %{_bindir}/mysql-administrator -%attr(755,root,root) %{_bindir}/mysql-administrator-bin +%doc mysql-administrator/ChangeLog mysql-administrator/res/FAQ +%attr(755,root,root) %{_bindir}/* %{_desktopdir}/*.desktop %{_datadir}/mysql-gui/*.png %dir %{_datadir}/mysql-gui/administrator @@ -78,6 +91,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:19:02 arekm +- up to 1.0.22a + Revision 1.11 2005/05/24 18:58:52 darekr - use _desktopdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-administrator.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 11:19:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: mysql-administrator-1.0.22a.tar.gz Message-ID: <32473.1125220755@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/mysql-administrator-1.0.22a.tar.gz ed0f1af3eb7be03c2785ad9057492b75 mysql-administrator-1.0.22a.tar.gz Size: 7444056 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:19:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: xpdf-remove_protections.patch - updated for 3.01 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:19:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 3.01 ---- Files affected: SOURCES: xpdf-remove_protections.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/xpdf-remove_protections.patch diff -u SOURCES/xpdf-remove_protections.patch:1.4 SOURCES/xpdf-remove_protections.patch:1.5 --- SOURCES/xpdf-remove_protections.patch:1.4 Wed Mar 26 18:34:22 2003 +++ SOURCES/xpdf-remove_protections.patch Sun Aug 28 11:19:36 2005 @@ -1,40 +1,19 @@ -diff -Nur xpdf-2.01.orig/xpdf/XPDFCore.cc xpdf-2.01/xpdf/XPDFCore.cc ---- xpdf-2.01.orig/xpdf/XPDFCore.cc Sun Nov 3 23:15:37 2002 -+++ xpdf-2.01/xpdf/XPDFCore.cc Mon Nov 4 21:08:51 2002 -@@ -906,9 +906,6 @@ - // global variables (currentSelection and currentSelectionOwner). +--- xpdf-3.01/xpdf/XPDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/XPDFCore.cc 2005-08-28 11:07:57.279864520 +0200 +@@ -377,9 +377,6 @@ + int pg; + double ulx, uly, lrx, lry; - void XPDFCore::copySelection() { - if (!doc->okToCopy()) { - return; - } - if (currentSelection) { - delete currentSelection; - } -@@ -947,9 +944,6 @@ - } - - GString *XPDFCore::extractText(int xMin, int yMin, int xMax, int yMax) { -- if (!doc->okToCopy()) { -- return NULL; -- } - return out->getText(xMin, yMin, xMax, yMax); - } - -@@ -958,9 +952,6 @@ - TextOutputDev *textOut; - GString *s; - -- if (!doc->okToCopy()) { -- return NULL; -- } - textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse); - if (!textOut->isOk()) { - delete textOut; -@@ -1585,10 +1576,9 @@ + if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { + //~ for multithreading: need a mutex here + if (currentSelection) { +@@ -1108,10 +1105,9 @@ #ifndef NO_TEXT_SELECT - if (core->selectXMin != core->selectXMax && - core->selectYMin != core->selectYMax) { + if (core->selectULX != core->selectLRX && + core->selectULY != core->selectLRY) { - if (core->doc->okToCopy()) { - core->copySelection(); - } else { @@ -86,3 +65,15 @@ } // construct text file name +--- xpdf-3.01/xpdf/PDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/PDFCore.cc 2005-08-28 11:08:37.884691648 +0200 +@@ -1273,9 +1273,6 @@ + int x0, y0, x1, y1, t; + GString *s; + +- if (!doc->okToCopy()) { +- return NULL; +- } + if ((page = findPage(pg))) { + cvtUserToDev(pg, xMin, yMin, &x0, &y0); + cvtUserToDev(pg, xMax, yMax, &x1, &y1); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/xpdf-remove_protections.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 11:22:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: uClibc-x86_64.patch (NEW) - gcc (3.3.6) doesn't allow ' i... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:22:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - gcc (3.3.6) doesn't allow ' in warning #without quotes ---- Files affected: SOURCES: uClibc-x86_64.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/uClibc-x86_64.patch diff -u /dev/null SOURCES/uClibc-x86_64.patch:1.1 --- /dev/null Sun Aug 28 11:22:09 2005 +++ SOURCES/uClibc-x86_64.patch Sun Aug 28 11:22:04 2005 @@ -0,0 +1,11 @@ +--- uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c.orig 2005-08-28 10:59:32.000000000 +0200 ++++ uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c 2005-08-28 10:58:49.000000000 +0200 +@@ -27,7 +27,7 @@ + + + #if defined __NR_rt_sigaction +-#warning Yes there are two warnings here. Don't worry about it. ++#warning "Yes there are two warnings here. Don't worry about it." + static void restore_rt (void) asm ("__restore_rt"); + static void restore (void) asm ("__restore"); + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:23:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: uClibc.spec - disable shared on x86_64 (not ready yet), add... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable shared on x86_64 (not ready yet), added x86_64 patch; builds now - more docs (and base docs moved to base) ---- Files affected: SPECS: uClibc.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.114 SPECS/uClibc.spec:1.115 --- SPECS/uClibc.spec:1.114 Sun Aug 28 10:33:15 2005 +++ SPECS/uClibc.spec Sun Aug 28 11:23:31 2005 @@ -15,6 +15,7 @@ Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch +Patch6: %{name}-x86_64.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 @@ -23,7 +24,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) -%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/') +%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/') %description Small libc for building embedded applications. @@ -67,8 +68,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -sed -e ' +sed -i -e ' %ifarch sparc sparc64 sparcv9 s/default TARGET_i386/default TARGET_sparc/ %endif @@ -81,13 +83,12 @@ %ifarch %{x8664} s/default TARGET_i386/default TARGET_x86_64/ %endif - ' extra/Configs/Config.in > Conf.in.tmp -mv -f Conf.in.tmp extra/Configs/Config.in + ' extra/Configs/Config.in -grep -v 'HAVE_NO_SHARED\|ARCH_HAS_NO_LDSO' extra/Configs/Config.sparc > C.tmp -mv -f C.tmp extra/Configs/Config.sparc -grep -v 'HAS_NO_THREADS' extra/Configs/Config.alpha > C.tmp -mv -f C.tmp extra/Configs/Config.alpha +# ldso on x86_64 not ready yet (missing resolve.S) +sed -i -e '/HAS_NO_THREADS/a\\n\tselect HAVE_NO_SHARED\n\tselect ARCH_HAS_NO_LDSO' \ + extra/Configs/Config.x86_64 +sed -i -e '/HAS_NO_THREADS/d' extra/Configs/Config.alpha %ifarch sparc sparc64 sparcv9 ln -sf /usr/include/asm-sparc include/asm-sparc @@ -164,22 +165,23 @@ %files %defattr(644,root,root,755) +%doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif %files devel %defattr(644,root,root,755) -%doc README TODO docs/threads.txt docs/uclibc.org/*.html +%doc docs/uclibc.org/* %attr(755,root,root) %{_bindir}/* %{_prefix}/*-linux-uclibc/usr/lib/*.o %dir %{_prefix}/*-linux-uclibc/usr %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -194,6 +196,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/28 09:23:31 qboosh +- disable shared on x86_64 (not ready yet), added x86_64 patch; builds now +- more docs (and base docs moved to base) + Revision 1.114 2005/08/28 08:33:15 qboosh - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.114&r2=1.115&f=u From qboosh at pld-linux.org Sun Aug 28 11:25:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xpdf.spec - updated to 3.01 - removed obsolete intoverflow, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:25:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.01 - removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches - updated remove_protections patch ---- Files affected: SPECS: xpdf.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/xpdf.spec diff -u SPECS/xpdf.spec:1.90 SPECS/xpdf.spec:1.91 --- SPECS/xpdf.spec:1.90 Tue Aug 16 10:29:04 2005 +++ SPECS/xpdf.spec Sun Aug 28 11:25:53 2005 @@ -3,7 +3,6 @@ # Conditional build: %bcond_without protections # remove protections against fair use (printing and copying) # - Summary: Portable Document Format (PDF) file viewer Summary(es): Visualizador de archivos PDF Summary(ja): X Window System ???? PDF ???????????????? @@ -12,24 +11,19 @@ Summary(ru): ????????? ??? ????????? PDF ?????? Summary(uk): ???????? ??? ????????? PDF ?????? Name: xpdf -Version: 3.00 -Release: 10 +Version: 3.01 +Release: 1 License: GPL Group: X11/Applications Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz -# Source0-md5: 95294cef3031dd68e65f331e8750b2c2 +# Source0-md5: e004c69c7dddef165d768b1362b44268 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}rc Patch0: %{name}-remove_protections.patch -Patch1: %{name}-freetype-includes.patch -Patch2: %{name}-fontdirs.patch +Patch1: %{name}-fontdirs.patch # probably obsolete -Patch3: %{name}-nonumericlocale.patch -Patch4: %{name}-intoverflow.patch -Patch5: %{name}-%{version}pl2.patch -Patch6: %{name}-%{version}pl3.patch -Patch7: %{name}-CAN-2005-2097.patch +Patch2: %{name}-nonumericlocale.patch URL: http://www.foolabs.com/xpdf/ Icon: xpdfIcon.gif BuildRequires: XFree86-devel @@ -107,11 +101,6 @@ %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %build %{__autoconf} @@ -172,6 +161,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/28 09:25:53 qboosh +- updated to 3.01 +- removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches +- updated remove_protections patch + Revision 1.90 2005/08/16 08:29:04 adamg - fix for a DoS vulnerability (CAN-2005-2097) - release 10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf.spec?r1=1.90&r2=1.91&f=u From qboosh at pld-linux.org Sun Aug 28 11:26:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: xpdf-3.01.tar.gz Message-ID: <10072.1125221164@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01.tar.gz e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz Size: 599778 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: xpdf-chinese-simplified-2004-jul-27.tar.gz Message-ID: <4839.1125222366@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz 6c3b04008000948e62530b8582e7f37c xpdf-chinese-simplified-2004-jul-27.tar.gz Size: 835960 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:17 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xpdf-chinese-traditional.spec - updated to 2004-jul-27, rel... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 5 ---- Files affected: SPECS: xpdf-chinese-traditional.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-traditional.spec diff -u SPECS/xpdf-chinese-traditional.spec:1.11 SPECS/xpdf-chinese-traditional.spec:1.12 --- SPECS/xpdf-chinese-traditional.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-chinese-traditional.spec Sun Aug 28 11:46:11 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania Big5 i Big5ascii dla xpdf Name: xpdf-chinese-traditional Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 1dd68bc924273e30534031d66f8a37c7 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: b7fa7f1850f7cfa28498701507079abb URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:11 qboosh +- updated to 2004-jul-27, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-traditional.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xpdf-japanese.spec - updated to 2004-jul-27, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 4 ---- Files affected: SPECS: xpdf-japanese.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-japanese.spec diff -u SPECS/xpdf-japanese.spec:1.11 SPECS/xpdf-japanese.spec:1.12 --- SPECS/xpdf-japanese.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-japanese.spec Sun Aug 28 11:46:22 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-JP, EUC-JP i Shift-JIS dla xpdf Name: xpdf-japanese Version: 1.0 -Release: 3 +Release: 4 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 2fe6d4701482af0d69084c574fe14d90 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: a11ee6476d0f381983664fc614f7a95e URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:22 qboosh +- updated to 2004-jul-27, release 4 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-japanese.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xpdf-chinese-simplified.spec - updated to 2004-jul-27, rele... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 6 ---- Files affected: SPECS: xpdf-chinese-simplified.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-simplified.spec diff -u SPECS/xpdf-chinese-simplified.spec:1.12 SPECS/xpdf-chinese-simplified.spec:1.13 --- SPECS/xpdf-chinese-simplified.spec:1.12 Wed Aug 25 11:49:22 2004 +++ SPECS/xpdf-chinese-simplified.spec Sun Aug 28 11:45:57 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-CN, EUC-CN i GBK dla xpdf Name: xpdf-chinese-simplified Version: 1.0 -Release: 5 +Release: 6 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 7a92500278d4aa8089024d5d7266f4ac +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: 6c3b04008000948e62530b8582e7f37c URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 09:45:57 qboosh +- updated to 2004-jul-27, release 6 + Revision 1.12 2004/08/25 09:49:22 qboosh - typo, release 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-simplified.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: xpdf-chinese-traditional-2004-jul-27.tar.gz Message-ID: <5469.1125222382@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz b7fa7f1850f7cfa28498701507079abb xpdf-chinese-traditional-2004-jul-27.tar.gz Size: 794604 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: xpdf-japanese-2004-jul-27.tar.gz Message-ID: <5706.1125222392@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz a11ee6476d0f381983664fc614f7a95e xpdf-japanese-2004-jul-27.tar.gz Size: 494803 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: xpdf-korean-2005-jul-07.tar.gz Message-ID: <13228.1125222718@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz 3c1e00f3b9d5fa713df8a3d763d12f3a xpdf-korean-2005-jul-07.tar.gz Size: 470455 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xpdf-korean.spec - updated to 2005-jul-07, release 5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:51:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-jul-07, release 5 ---- Files affected: SPECS: xpdf-korean.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-korean.spec diff -u SPECS/xpdf-korean.spec:1.11 SPECS/xpdf-korean.spec:1.12 --- SPECS/xpdf-korean.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-korean.spec Sun Aug 28 11:51:48 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-KR (KSX1001) dla xpdf Name: xpdf-korean Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 01c1b151119ba96da6bc021ea2916256 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2005-jul-07.tar.gz +# Source0-md5: 3c1e00f3b9d5fa713df8a3d763d12f3a URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:51:48 qboosh +- updated to 2005-jul-07, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-korean.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:18:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: kexec-tools-opt.patch - updated for 1.101 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:18:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.101 ---- Files affected: SOURCES: kexec-tools-opt.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/kexec-tools-opt.patch diff -u SOURCES/kexec-tools-opt.patch:1.2 SOURCES/kexec-tools-opt.patch:1.3 --- SOURCES/kexec-tools-opt.patch:1.2 Tue Dec 14 23:28:16 2004 +++ SOURCES/kexec-tools-opt.patch Sun Aug 28 12:17:56 2005 @@ -1,11 +1,13 @@ ---- kexec-tools-1.98/Makefile.main.orig 2004-09-15 09:49:17.000000000 +0000 -+++ kexec-tools-1.98/Makefile.main 2004-12-14 22:25:32.325270400 +0000 -@@ -2,7 +2,7 @@ - VERSION="1.98" - DATE="15 September 2004" - CPPFLAGS:= -I./util_lib/include -DVERSION='$(VERSION)' -DRELEASE_DATE='$(DATE)' $(EXTRA_FLAGS) --CFLAGS:=-Wall -g -O2 -fno-strict-aliasing $(CPPFLAGS) -+CFLAGS:=-Wall -fno-strict-aliasing $(CPPFLAGS) $(OPTFLAGS) +--- kexec-tools-1.101/configure.ac.orig 2005-01-09 02:36:57.000000000 +0100 ++++ kexec-tools-1.101/configure.ac 2005-08-28 12:12:20.729530896 +0200 +@@ -93,8 +93,8 @@ - PREFIX:=$(OBJDIR)/build - SBINDIR=$(PREFIX)/sbin + dnl ---Hard codes + +-CFLAGS='-Wall -g -fno-strict-aliasing $(CPPFLAGS)' +-BUILD_CFLAGS='-O2 -Wall $(CPPFLAGS)' ++CFLAGS="$CFLAGS -Wall -fno-strict-aliasing \$(CPPFLAGS)" ++BUILD_CFLAGS="$CFLAGS -Wall \$(CPPFLAGS)" + + dnl ---Sanity checks + if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kexec-tools-opt.patch?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sun Aug 28 12:21:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: proxytunnel.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:21:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: proxytunnel.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u SPECS/proxytunnel.spec:1.1 SPECS/proxytunnel.spec:1.2 --- SPECS/proxytunnel.spec:1.1 Sun Aug 28 10:18:20 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 12:21:53 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Proxy Tunnel ssh-over-https hack +Summary(pl): Tunel proxy ssh-po-https Name: proxytunnel Version: 1.5.0 Release: 0.1 @@ -15,7 +16,7 @@ somewhere on the network, through a standard HTTPS proxy. We mostly use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to do many things that wouldn't be possible without ProxyTunnel. -Proxytunnel can currently do the following: +ProxyTunnel can currently do the following: - Create tunnels using HTTP and HTTPS proxies (That understand the HTTP CONNECT command). - Work as a back-end driver for an OpenSSH client, and create SSH @@ -24,11 +25,23 @@ connections, and then tunneling these connections to a specified destination. +%description -l pl +ProxyTunnel to program ??cz?cy stdin i stdout do serwera gdzie? w +sieci poprzez standardowe proxy HTTPS. Jest u?ywany g??wnie do +tunelowania sesji SSH poprzez proxy HTTP(S), co pozwala na robienie +wielu rzeczy, kt?re nie by?yby mo?liwe bez niego. ProxyTunnel +aktualnie potrafi: +- tworzy? tunele przy u?yciu proxy HTTP i HTTPS (rozumiej?cych + polecenie HTTP CONNECT), +- dzia?a? jako sterownik backendu dla klienta OpenSSH i tworzy? + po??czenia SSH poprzez proxy HTTP(S), +- dzia?a? jako samodzielna aplikacja, nas?uchuj?c na jakim? porcie na + po??czenia, a nast?pnie tuneluj?c te po??czenia na podany adres. + %prep %setup -q %build - %{__make} \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" \ @@ -55,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 10:21:53 qboosh +- pl + Revision 1.1 2005/08/28 08:18:20 areq - Init PLD spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/proxytunnel.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 12:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: kexec-tools.spec - readded opt patch - synced descs - tar h... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - readded opt patch - synced descs - tar hack to avoid messing outside build subdir ---- Files affected: SPECS: kexec-tools.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.11 SPECS/kexec-tools.spec:1.12 --- SPECS/kexec-tools.spec:1.11 Sun Aug 28 10:28:30 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 12:22:51 2005 @@ -11,9 +11,12 @@ Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 +Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ +BuildRequires: autoconf BuildRequires: glibc-devel BuildRequires: zlib-devel +ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -25,22 +28,21 @@ generic code should work on any architecture. %description -l pl -Narz?dzie to pozwala wykorzysta? zaimplementowany w j?drach 2.5/2.6 -system pozwalaj?cy za?adowa? nast?pne j?dro bez konieczno?ci restartu -maszyny. Od momentu wydania polecenia kexec do startu nowego j?dra -up?ywa czas poni?ej 0.5 sekundy! - -Aktualna implementacja by?a testowana tylko na x86, ale og?lny kod -powinien dzia?a? na ka?dej architekturze. +kexec to zestaw wywo?a? systemowych pozwalaj?cych za?adowa? nast?pne +j?dro z poziomu aktualnie dzia?aj?cego j?dra Linuksa. Aktualna +implementacja by?a testowana tylko na x86, ale og?lny kod powinien +dzia?a? na ka?dej architekturze. %prep -%setup -q +%setup -q -c -T +# workaround for kexec-tools-%{version}.spec outside main directory in tarball +tar xzf %{SOURCE0} --strip-components=1 +%patch0 -p1 %build +%{__autoconf} %configure -%{__make} \ - CC="%{__cc}" \ - OPTFLAGS="%{rpmcflags}" +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -56,7 +58,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS TODO News README +%doc AUTHORS News README TODO %attr(755,root,root) %{_sbindir}/* %attr(755,root,root) %{_libdir}/%{name} @@ -66,6 +68,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 10:22:51 qboosh +- readded opt patch +- synced descs +- tar hack to avoid messing outside build subdir + Revision 1.11 2005/08/28 08:28:30 arekm - update BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:41:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xorg-app-twm.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:41:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-twm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.5 SPECS/xorg-app-twm.spec:1.6 --- SPECS/xorg-app-twm.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:41:02 2005 @@ -1,11 +1,13 @@ # $Revision$, $Date$ -Summary: twm application -Summary(pl): Aplikacja twm +Summary: Tab Window Manager for the X Window System +Summary(pl): Twm - podstawowy zarz?dca okien dla X Window System +Summary(ru): ??????? ??????? ???????? +Summary(uk): ??????? ???????? ???????? Name: xorg-app-twm Version: 0.99.0 Release: 0.02 License: MIT -Group: X11/Applications +Group: X11/Window Managers Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/twm-%{version}.tar.bz2 # Source0-md5: 7441654fbffb6da17118948523401022 Patch0: twm-man.patch @@ -15,13 +17,28 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-twm +Obsoletes: XFree86-twm +Obsoletes: twm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -twm application. +Twm is a window manager for the X Window System. It provides +titlebars, shaped windows, several forms of icon management, +user-defined macro functions, click-to-type and pointerdriven keyboard +focus, and user-specified key and pointer button bindings. %description -l pl -Aplikacja twm. +Twm jest zarz?dc? okien dla X Window System. Daje belki tytu?owe, +ramki okien, par? form zarz?dzania ikonami, definiowalne makra, +ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, +definiowalne przypisania klawiszy i przycisk?w myszy. + +%description twm -l ru +??????? ?????????? ??????? ????????. + +%description twm -l uk +??????? ?????????? ???????? ????????. %prep %setup -q -n twm-%{version} @@ -56,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:41:02 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:47:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xorg-app-xauth.spec - merged descs from X11.spec, Obsoletes... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xauth.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xauth.spec diff -u SPECS/xorg-app-xauth.spec:1.5 SPECS/xorg-app-xauth.spec:1.6 --- SPECS/xorg-app-xauth.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xauth.spec Sun Aug 28 12:47:32 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -Summary: xauth application -Summary(pl): Aplikacja xauth +Summary: xauth - X authority file utility +Summary(pl): xauth - narz?dzie do plik?w X authority Name: xorg-app-xauth Version: 0.99.0 Release: 0.02 @@ -14,13 +14,24 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xauth +Obsoletes: XFree86-xauth +Obsoletes: xauth BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xauth application. +The xauth program is used to edit and display the authorization +information used in connecting to the X server. This program is +usually used to extract authorization records from one machine and +merge them in on another (as is the case when using remote logins or +granting access to other users). %description -l pl -Aplikacja xauth. +Program xauth s?u?y do edycji i wy?wietlania informacji +autoryzacyjnych u?ywanych przy ??czeniu z X serwerem. Ten program +przewa?nie jest u?ywany do wyci?gania rekord?w autoryzacji z jednej +maszyny i do??czania ich na innej (w celu umo?liwienia zdalnego +logowania lub udost?pnienia innym u?ytkownikom). %prep %setup -q -n xauth-%{version} @@ -54,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:47:32 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xorg-app-xfs.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xfs.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xfs.spec diff -u SPECS/xorg-app-xfs.spec:1.5 SPECS/xorg-app-xfs.spec:1.6 --- SPECS/xorg-app-xfs.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xfs.spec Sun Aug 28 12:51:16 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ -Summary: xfs application -Summary(pl): Aplikacja xfs +Summary: Font server for X Window System +Summary(pl): Serwer font?w dla X Window System +Summary(ru): ?????????? ??? X Window System +Summary(uk): ?????????? ??? X Window System Name: xorg-app-xfs Version: 0.99.0 Release: 0.02 @@ -17,13 +19,33 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xfs +Obsoletes: XFree86-xfs +Obsoletes: xfs +Obsoletes: xfsft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xfs application. +This is a font server for X Window System. You can serve fonts to +other X servers remotely with this package, and the remote system will +be able to use all fonts installed on the font server, even if they +are not installed on the remote computer. %description -l pl -Aplikacja xfs. +Pakiet zawiera serwer font?w dla X Window System. Mo?e udost?pnia? +fonty dla X serwer?w lokalnych lub zdalnych. + +%description -l ru +xfs ???????? ?????? ??????? ??? X Window System. Xfs ????? ????? +????????????? ?????? ????????? X-????????. ????????? ??????? ????? +???????? ???????????? ??? ??????, ????????????? ?? ??????? ???????, +???? ???? ??? ?? ??????????? ?? ????????? ??????????. + +%description -l uk +xfs ??????? ?????? ??????? ??? X Window System. Xfs ????? ???? +???????? ?????? ?????????? X-????????. ????????? ??????? ????? +??????????????? ??? ??????, ??? ??????????? ?? ??????? ???????, ?????? +???? ???? ?? ??????????? ?? ??????????? ????'?????. %prep %setup -q -n xfs-%{version} @@ -60,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:51:16 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: xorg-app-twm.spec - copy-pastos In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy-pastos ---- Files affected: SPECS: xorg-app-twm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.6 SPECS/xorg-app-twm.spec:1.7 --- SPECS/xorg-app-twm.spec:1.6 Sun Aug 28 12:41:02 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:51:42 2005 @@ -34,10 +34,10 @@ ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, definiowalne przypisania klawiszy i przycisk?w myszy. -%description twm -l ru +%description -l ru ??????? ?????????? ??????? ????????. -%description twm -l uk +%description -l uk ??????? ?????????? ???????? ????????. %prep @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:51:42 qboosh +- copy-pastos + Revision 1.6 2005/08/28 10:41:02 qboosh - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: vigra.spec - updated to 1.3.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:55:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.3 ---- Files affected: SPECS: vigra.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/vigra.spec diff -u SPECS/vigra.spec:1.6 SPECS/vigra.spec:1.7 --- SPECS/vigra.spec:1.6 Sun Apr 3 00:30:48 2005 +++ SPECS/vigra.spec Sun Aug 28 12:54:58 2005 @@ -2,12 +2,12 @@ Summary: Generic Programming for Computer Vision Summary(pl): Og?lne programowanie obrazu komputerowego Name: vigra -Version: 1.3.2 +Version: 1.3.3 Release: 1 License: The VIGRA Artistic License Group: Libraries Source0: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz -# Source0-md5: 6a787f86df5e45be809ac97c86acddae +# Source0-md5: 518d546d5ebd9388fb0dc968c1e91280 Patch0: %{name}-ac.patch URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/ BuildRequires: autoconf @@ -17,7 +17,9 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libtiff-devel -BuildRequires: libtool >= 2:1.4d +BuildRequires: libtool >= 2:1.5 +#BuildRequires: python +#BuildRequires: python-devel BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -97,6 +99,8 @@ --with-tiff \ --with-zlib +# --with-python requires src/pythonbindings (missing in sources) + %{__make} %install @@ -141,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:54:58 qboosh +- updated to 1.3.3 + Revision 1.6 2005/04/02 22:30:48 qboosh - updated to 1.3.2, updated ac patch - BR: fftw3-devel instead of fftw-devel (fftw3 is preferred in configure) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vigra.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: vigra1.3.3.tar.gz Message-ID: <3016.1125226527@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/vigra1.3.3.tar.gz 518d546d5ebd9388fb0dc968c1e91280 vigra1.3.3.tar.gz Size: 12233525 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: sredird-2.2.2.tar.gz Message-ID: <10403.1125226831@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://metalab.unc.edu/pub/Linux/system/serial/sredird-2.2.2.tar.gz e541e4b1cb9fa8fc8ff0e76bb1127cda sredird-2.2.2.tar.gz Size: 25495 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: sredird.spec - updated to 2.2.2 (security fixes: remotely e... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) ---- Files affected: SPECS: sredird.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/sredird.spec diff -u SPECS/sredird.spec:1.11 SPECS/sredird.spec:1.12 --- SPECS/sredird.spec:1.11 Wed Sep 15 22:36:19 2004 +++ SPECS/sredird.spec Sun Aug 28 13:00:23 2005 @@ -1,15 +1,13 @@ # $Revision$, $Date$ -# TODO: -# - SECURITY: http://securitytracker.com/alerts/2004/Aug/1011038.html Summary: RFC 2217-compliant serial port redirector Summary(pl): Program przekierowuj?cy port szeregowy zgodny z RFC 2217 Name: sredird -Version: 2.2.1 +Version: 2.2.2 Release: 1 License: GPL Group: Networking Source0: ftp://metalab.unc.edu/pub/Linux/system/serial/%{name}-%{version}.tar.gz -# Source0-md5: a6b8f03ddb9657f533bd218110c3e635 +# Source0-md5: e541e4b1cb9fa8fc8ff0e76bb1127cda URL: http://www.ibiblio.org/pub/Linux/system/serial/!INDEX.html BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 11:00:23 qboosh +- updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) + Revision 1.11 2004/09/15 20:36:19 blues - URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sredird.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 13:05:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: sox-12.17.8.tar.gz Message-ID: <18826.1125227155@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/sox/sox-12.17.8.tar.gz 735e9add6979bd6308f213abefe389e8 sox-12.17.8.tar.gz Size: 462079 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:05:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: sox.spec - updated to 12.17.8 (bugfixes, incl. SMP buffer o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:05:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) ---- Files affected: SPECS: sox.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/sox.spec diff -u SPECS/sox.spec:1.43 SPECS/sox.spec:1.44 --- SPECS/sox.spec:1.43 Sat Dec 25 22:51:41 2004 +++ SPECS/sox.spec Sun Aug 28 13:05:51 2005 @@ -13,12 +13,12 @@ Summary(tr): Genel ama?l? ses dosyas? ?evirme arac? Summary(uk): ??????? ?????????? ??????????? ??? ?????? ?? ????????? ??????? Name: sox -Version: 12.17.7 +Version: 12.17.8 Release: 1 License: distributable Group: Applications/Sound Source0: http://dl.sourceforge.net/sox/%{name}-%{version}.tar.gz -# Source0-md5: a6876289602c1f2896b39e6a88e2a574 +# Source0-md5: 735e9add6979bd6308f213abefe389e8 Patch0: %{name}-play.patch Patch1: %{name}-install.patch URL: http://sox.sourceforge.net/ @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 11:05:51 qboosh +- updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) + Revision 1.43 2004/12/25 21:51:41 qboosh - updated to 12.17.7, updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sox.spec?r1=1.43&r2=1.44&f=u From wiget at pld-linux.org Sun Aug 28 13:27:37 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: asa-0.1.7.tar.gz Message-ID: <19159.1125228457@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apatsch.wroc.biz/asa/asa-0.1.7.tar.gz 2a754e9ab1220f79060a68a46a76cc6c asa-0.1.7.tar.gz Size: 24797 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:27:36 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: asa.spec - 0.1.7 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:27:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.1.7 ---- Files affected: SPECS: asa.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/asa.spec diff -u SPECS/asa.spec:1.17 SPECS/asa.spec:1.18 --- SPECS/asa.spec:1.17 Sat Jun 4 10:24:19 2005 +++ SPECS/asa.spec Sun Aug 28 13:27:30 2005 @@ -7,12 +7,12 @@ Summary: Jabber server component agent for sending SMS messages Summary(pl): Komponent serwera Jabbera do wysy?ania wiadomo?ci SMS Name: asa -Version: 0.1.6 -Release: 1.2 +Version: 0.1.7 +Release: 1 License: GPL Group: Applications/Communications Source0: http://www.apatsch.wroc.biz/asa/%{name}-%{version}.tar.gz -# Source0-md5: 1f758fe0f38e3dcd6863fbe93f7e814d +# Source0-md5: 2a754e9ab1220f79060a68a46a76cc6c Source1: jabber-asa-transport.init Source2: %{name}.sh Patch0: %{name}-PLD.patch @@ -105,6 +105,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 11:27:30 wiget +- 0.1.7 + Revision 1.17 2005/06/04 08:24:19 dzeus - added userrun.patch (runs as jabber user without su) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asa.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sun Aug 28 13:34:28 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: gnome-btdownload-0.0.22.tar.gz Message-ID: <28679.1125228868@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnome-bt/gnome-btdownload-0.0.22.tar.gz b52df0c8b0c28aa0cc8814ff4754cef9 gnome-btdownload-0.0.22.tar.gz Size: 154900 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:34:27 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: gnome-btdownload.spec - updated to 0.0.22 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:34:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.22 ---- Files affected: SPECS: gnome-btdownload.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/gnome-btdownload.spec diff -u SPECS/gnome-btdownload.spec:1.5 SPECS/gnome-btdownload.spec:1.6 --- SPECS/gnome-btdownload.spec:1.5 Sun May 1 08:38:59 2005 +++ SPECS/gnome-btdownload.spec Sun Aug 28 13:34:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME BitTorrent downloader Summary(pl): Narz?dzie do ?ci?gania protoko?em BitTorrent dla GNOME Name: gnome-btdownload -Version: 0.0.20 -Release: 2 +Version: 0.0.22 +Release: 1 License: BSD Group: X11/Applications Source0: http://dl.sourceforge.net/gnome-bt/%{name}-%{version}.tar.gz -# Source0-md5: dd7ad29c9c5689dc73a736d44dde2bef +# Source0-md5: b52df0c8b0c28aa0cc8814ff4754cef9 Patch0: %{name}-desktop.patch URL: http://gnome-bt.sourceforge.net/ BuildRequires: python-gnome-devel >= 2.10.0 @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 11:34:21 wiget +- updated to 0.0.22 + Revision 1.5 2005/05/01 06:38:59 ankry - unified caps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-btdownload.spec?r1=1.5&r2=1.6&f=u From areq at pld-linux.org Sun Aug 28 13:49:41 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: mISDN.spec (NEW) - new ISDN stack of the linux kernel versi... In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 11:49:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY ---- Files affected: SPECS: mISDN.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u /dev/null SPECS/mISDN.spec:1.1 --- /dev/null Sun Aug 28 13:49:41 2005 +++ SPECS/mISDN.spec Sun Aug 28 13:49:36 2005 @@ -0,0 +1,141 @@ +%bcond_without dist_kernel # allow non-distribution kernel +%bcond_without smp # don't build SMP module +%bcond_with verbose # verbose build (V=1) + +%define mISDN_version CVS-2005-07-06 + +Summary: mISDN - modular ISDN +Name: mISDN +Version: 2005.07.06 +%define _rel 0.1 +Release: %{_rel} +License: GPL +Group: Base/Kernel +Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/%{name}-%{mISDN_version}.tar.bz2 +# Source0-md5: f8892d49e00e3fa26e65e22084edd472 +URL: http://www.isdn4linux.de/mISDN/ +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} +BuildRequires: rpmbuild(macros) >= 1.217 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. + +%package -n kernel-isdn-mISDN +Summary: Linux driver for mISDN +Summary(pl): Sterownik dla Linuksa do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif + +%description -n kernel-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux module. + +%description -n kernel-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa. + +%package -n kernel-smp-isdn-mISDN +Summary: Linux SMP driver for mISDN +Summary(pl): Sterownik dla Linuksa SMP do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif + +%description -n kernel-smp-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux SMP module. + +%description -n kernel-smp-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa SMP. + +%prep +%setup -q -n %{name}-%{mISDN_version} + +mv Makefile.module Makefile + +%build + +for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then + exit 1 + fi + rm -rf include + install -d include/{linux,config} + ln -sf %{_kernelsrcdir}/config-$cfg .config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + touch include/config/MARKER + + %{__make} -C %{_kernelsrcdir} clean \ + RCS_FIND_IGNORE="-name '*.ko' -o" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + %{__make} -C %{_kernelsrcdir} modules \ + CC="%{__cc}" CPP="%{__cpp}" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + +# mv mISDN{,-$cfg}.ko +done + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/drivers/isdn/hardware/mISDN +install mISDN-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/ +%if %{with smp} && %{with dist_kernel} +install mISDN-smp.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/ +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%postun -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%post -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%postun -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%files -n kernel-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/*.ko* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel-smp-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/*.ko* +%endif + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 11:49:36 areq +- new ISDN stack of the linux kernel version 2.6 +- raw PLD spec, NFY + ================================================================ From glen at pld-linux.org Sun Aug 28 13:55:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: kexec-tools.spec - BR for tar --strip-components=1 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 11:55:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR for tar --strip-components=1 ---- Files affected: SPECS: kexec-tools.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.12 SPECS/kexec-tools.spec:1.13 --- SPECS/kexec-tools.spec:1.12 Sun Aug 28 12:22:51 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 13:55:43 2005 @@ -15,6 +15,7 @@ URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: autoconf BuildRequires: glibc-devel +BuildRequires: tar >= 1:1.15.1 BuildRequires: zlib-devel ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -68,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 11:55:43 glen +- BR for tar --strip-components=1 + Revision 1.12 2005/08/28 10:22:51 qboosh - readded opt patch - synced descs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sun Aug 28 14:03:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS (LINUX_2_6): kernel.spec - move mISDN to mISDN.spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 12:03:45 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - move mISDN to mISDN.spec ---- Files affected: SPECS: kernel.spec (1.441.2.1169 -> 1.441.2.1170) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1169 SPECS/kernel.spec:1.441.2.1170 --- SPECS/kernel.spec:1.441.2.1169 Sat Aug 27 22:00:19 2005 +++ SPECS/kernel.spec Sun Aug 28 14:03:39 2005 @@ -115,7 +115,6 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 -%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -169,10 +168,6 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config -Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 -# Source100-md5: f8892d49e00e3fa26e65e22084edd472 - - Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -626,7 +621,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} -a 100 +%setup -q -n linux-%{version}%{_rc} %patch0 -p1 %patch1 -p0 @@ -748,12 +743,6 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig -# mISDN -%ifarch %{ix86} -cd mISDN-%{mISDN_version} -./std2kern -k ../ -%endif - %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1501,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1170 2005/08/28 12:03:39 areq +- move mISDN to mISDN.spec + Revision 1.441.2.1169 2005/08/27 20:00:19 areq - add mISDN (ix86 only) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1169&r2=1.441.2.1170&f=u From wiget at pld-linux.org Sun Aug 28 15:08:44 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: openldap.spec - updated to 2.3.6 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 13:08:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.6 ---- Files affected: SPECS: openldap.spec (1.207 -> 1.208) ---- Diffs: ================================================================ Index: SPECS/openldap.spec diff -u SPECS/openldap.spec:1.207 SPECS/openldap.spec:1.208 --- SPECS/openldap.spec:1.207 Mon Aug 15 17:19:20 2005 +++ SPECS/openldap.spec Sun Aug 28 15:08:38 2005 @@ -19,12 +19,12 @@ Summary(ru): ??????? ???????? LDAP Summary(uk): ?????? ???????? LDAP Name: openldap -Version: 2.3.5 +Version: 2.3.6 Release: 1 License: OpenLDAP Public License Group: Networking/Daemons Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz -# Source0-md5: 732b5ac8c638155f1f27196ac9e0b9e2 +# Source0-md5: 672ec287ce61a7dba56762e95252fd28 Source1: ldap.init Source2: %{name}.sysconfig Source3: ldap.conf @@ -1257,6 +1257,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.208 2005/08/28 13:08:38 wiget +- updated to 2.3.6 + Revision 1.207 2005/08/15 15:19:20 qboosh - updated to 2.3.5, updated make_man_link patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap.spec?r1=1.207&r2=1.208&f=u From wiget at pld-linux.org Sun Aug 28 15:09:11 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: openldap-2.3.6.tgz Message-ID: <28875.1125234551@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.3.6.tgz 672ec287ce61a7dba56762e95252fd28 openldap-2.3.6.tgz Size: 3538388 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:11:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: wget-strptime.patch (REMOVED), wget-segv.patch (REMOVED) ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: wget-strptime.patch (1.1 -> NONE) (REMOVED), wget-segv.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 15:11:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: wget-ac.patch - more gettext and automake issues In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - more gettext and automake issues ---- Files affected: SOURCES: wget-ac.patch (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SOURCES/wget-ac.patch diff -u SOURCES/wget-ac.patch:1.12 SOURCES/wget-ac.patch:1.13 --- SOURCES/wget-ac.patch:1.12 Wed Jun 22 14:34:59 2005 +++ SOURCES/wget-ac.patch Sun Aug 28 15:11:47 2005 @@ -1,15 +1,19 @@ ---- wget-1.9.1/configure.in.orig 2003-11-08 20:15:35.000000000 +0100 -+++ wget-1.9.1/configure.in 2003-11-16 11:46:45.947950144 +0100 -@@ -541,7 +541,8 @@ - dnl new language was added. +--- wget-1.10.1/configure.in.orig 2005-08-11 23:35:27.000000000 +0200 ++++ wget-1.10.1/configure.in 2005-08-28 13:42:34.625493608 +0200 +@@ -437,6 +437,7 @@ + ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')` dnl internationalization macros --WGET_WITH_NLS +AM_GNU_GETTEXT -+WGET_WITH_NLS + WGET_WITH_NLS dnl - dnl Find makeinfo. We used to provide support for Emacs processing +@@ -473,5 +474,4 @@ + #include "config-post.h" + ]) + AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) +-AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO]) + AC_OUTPUT diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200 +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200 @@ -89,3 +93,32 @@ /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time +--- wget-1.10.1/m4/wget.m4.orig 2005-06-27 00:06:49.000000000 +0200 ++++ wget-1.10.1/m4/wget.m4 2005-08-28 13:31:58.190246472 +0200 +@@ -156,7 +156,7 @@ + # program @code{ansi2knr}, which comes with Ghostscript. + # @end defmac + +-AC_DEFUN(AM_PROG_CC_STDC, ++AC_DEFUN([AM_PROG_CC_STDC], + [AC_REQUIRE([AC_PROG_CC]) + AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) + AC_CACHE_VAL(am_cv_prog_cc_stdc, +@@ -390,7 +390,7 @@ + dnl This is not strictly an Autoconf macro, because it is run from + dnl within `config.status' rather than from within configure. This + dnl is why special rules must be applied for it. +-AC_DEFUN(WGET_PROCESS_PO, ++AC_DEFUN([WGET_PROCESS_PO], + [ + dnl I wonder what the following several lines do... + if test "x$srcdir" != "x."; then +@@ -426,7 +426,7 @@ + + dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, + dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN(AM_PATH_PROG_WITH_TEST, ++AC_DEFUN([AM_PATH_PROG_WITH_TEST], + [# Extract the first word of "$2", so it can be a program name with args. + set dummy $2; ac_word=[$]2 + AC_MSG_CHECKING([for $ac_word]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-ac.patch?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 15:12:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: wget-pl.patch - real update for 1.10.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:12:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - real update for 1.10.1 ---- Files affected: SOURCES: wget-pl.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/wget-pl.patch diff -u SOURCES/wget-pl.patch:1.7 SOURCES/wget-pl.patch:1.8 --- SOURCES/wget-pl.patch:1.7 Wed Jun 22 11:47:15 2005 +++ SOURCES/wget-pl.patch Sun Aug 28 15:12:43 2005 @@ -1,71 +1,2323 @@ ---- wget-1.9/po/pl.po.orig 2003-10-20 16:57:45.000000000 +0200 -+++ wget-1.9/po/pl.po 2003-10-26 01:45:36.000000000 +0200 -@@ -8,10 +8,10 @@ +--- wget-1.10.1/po/pl.po.orig 2005-08-16 23:59:28.000000000 +0200 ++++ wget-1.10.1/po/pl.po 2005-08-28 15:02:42.270620456 +0200 +@@ -5,184 +5,220 @@ + # Arkadiusz Mi?kiewicz , 1998-2000. + # Wojciech Kotwica 2002-03-20 11:12+01:00 + # v. 1.9-b5 by Emil Nowak 2003-10-15 00:28+02:00 ++# Jakub Bogusz , 2005 # msgid "" msgstr "" -"Project-Id-Version: wget 1.9-b5\n" -+"Project-Id-Version: wget 1.10\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-06 09:11-0400\n" +-"POT-Creation-Date: 2003-10-11 16:21+0200\n" -"PO-Revision-Date: 2003-10-15 00:28+02:00\n" -+"PO-Revision-Date: 2003-10-26 01:20+0200\n" - "Last-Translator: Wojciech Kotwica \n" +-"Last-Translator: Wojciech Kotwica \n" ++"Project-Id-Version: wget 1.10.1\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2005-08-28 13:44+0200\n" ++"PO-Revision-Date: 2005-08-28 13:10+0200\n" ++"Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" -@@ -71,9 +71,9 @@ + "Content-Type: text/plain; charset=iso-8859-2\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: src/connect.c:88 ++#: src/connect.c:199 + #, c-format +-msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" +-msgstr "Nieudana konwersja `%s' na powi?zany adres. Powr?t do ANY.\n" ++msgid "%s: unable to resolve bind address `%s'; disabling bind.\n" ++msgstr "%s: nie mo?na rozwi?za? adresu bind `%s'; wy??czanie bind.\n" + +-#: src/connect.c:165 ++#: src/connect.c:271 + #, c-format +-msgid "Connecting to %s[%s]:%hu... " +-msgstr "??czenie si? z %s[%s]:%hu... " ++msgid "Connecting to %s|%s|:%d... " ++msgstr "??czenie si? z %s|%s|:%d... " + +-#: src/connect.c:168 ++#: src/connect.c:274 + #, c-format +-msgid "Connecting to %s:%hu... " +-msgstr "??czenie si? z %s:%hu... " ++msgid "Connecting to %s:%d... " ++msgstr "??czenie si? z %s:%d... " + +-#: src/connect.c:222 ++#: src/connect.c:335 + msgid "connected.\n" + msgstr "po??czono.\n" + +-#: src/convert.c:171 ++#: src/connect.c:347 src/host.c:789 src/host.c:818 + #, c-format +-msgid "Converted %d files in %.2f seconds.\n" +-msgstr "Przekonwertowano %d plik?w w %.2f sekund.\n" ++msgid "failed: %s.\n" ++msgstr "nieudane: %s.\n" ++ ++#: src/convert.c:176 ++#, c-format ++msgid "Converted %d files in %.*f seconds.\n" ++msgstr "Przekonwertowano %d plik?w w %.*f sekund.\n" + +-#: src/convert.c:197 ++#: src/convert.c:202 + #, c-format + msgid "Converting %s... " + msgstr "Konwertowanie %s... " + +-#: src/convert.c:210 ++#: src/convert.c:215 + msgid "nothing to do.\n" + msgstr "nic do roboty.\n" + +-#: src/convert.c:218 src/convert.c:242 ++#: src/convert.c:223 src/convert.c:247 + #, c-format + msgid "Cannot convert links in %s: %s\n" + msgstr "Nie mo?na przekonwertowa? odno?nik?w w %s: %s\n" + +-#: src/convert.c:233 ++#: src/convert.c:238 + #, c-format + msgid "Unable to delete `%s': %s\n" + msgstr "Nie uda?o si? usun?? `%s': %s\n" + +-#: src/convert.c:439 ++#: src/convert.c:447 + #, c-format + msgid "Cannot back up %s as %s: %s\n" + msgstr "Nie mo?na stworzy? kopii zapasowej %s jako %s: %s\n" + +-#: src/cookies.c:606 ++#: src/cookies.c:619 + #, c-format + msgid "Error in Set-Cookie, field `%s'" msgstr "B??d w Set-Cookie, w polu `%s'" - #: src/cookies.c:643 +-#: src/cookies.c:629 -#, fuzzy, c-format ++#: src/cookies.c:643 +#, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" -msgstr "B??d sk?adni w Set-Cookie: przedwczesny koniec ci?gu znak?w.\n" +msgstr "B??d sk?adni w Set-Cookie: %s na pozycji %d.\n" ++ ++#: src/cookies.c:881 ++#, c-format ++msgid "Cookie coming from %s attempted to set domain to %s\n" ++msgstr "Ciasteczko pochodz?ce z %s pr?bowa?o ustawi? domen? na %s\n" + +-#: src/cookies.c:1426 ++#: src/cookies.c:1328 src/cookies.c:1477 + #, c-format + msgid "Cannot open cookies file `%s': %s\n" + msgstr "Nie mo?na otworzy? pliku ciasteczek `%s': %s\n" + +-#: src/cookies.c:1438 ++#: src/cookies.c:1489 + #, c-format + msgid "Error writing to `%s': %s\n" + msgstr "B??d podczas zapisu do `%s': %s\n" + +-#: src/cookies.c:1442 ++#: src/cookies.c:1492 + #, c-format + msgid "Error closing `%s': %s\n" + msgstr "B??d podczas zamykania `%s': %s\n" + +-#: src/ftp-ls.c:812 ++#: src/ftp-ls.c:843 + msgid "Unsupported listing type, trying Unix listing parser.\n" +-msgstr "Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" ++msgstr "" ++"Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" + +-#: src/ftp-ls.c:857 src/ftp-ls.c:859 ++#: src/ftp-ls.c:889 src/ftp-ls.c:891 + #, c-format + msgid "Index of /%s on %s:%d" + msgstr "Indeks /%s na %s:%d" + +-#: src/ftp-ls.c:882 ++#: src/ftp-ls.c:914 ++#, c-format + msgid "time unknown " + msgstr "czas nieznany " + +-#: src/ftp-ls.c:886 ++#: src/ftp-ls.c:918 ++#, c-format + msgid "File " + msgstr "Plik " + +-#: src/ftp-ls.c:889 ++#: src/ftp-ls.c:921 ++#, c-format + msgid "Directory " + msgstr "Katalog " + +-#: src/ftp-ls.c:892 ++#: src/ftp-ls.c:924 ++#, c-format + msgid "Link " + msgstr "Odno?nik " + +-#: src/ftp-ls.c:895 ++#: src/ftp-ls.c:927 ++#, c-format + msgid "Not sure " + msgstr "Nie pewny " + +-#: src/ftp-ls.c:913 ++#: src/ftp-ls.c:945 + #, c-format + msgid " (%s bytes)" + msgstr " (%s bajt?w)" + +-#. Second: Login with proper USER/PASS sequence. +-#: src/ftp.c:202 ++#: src/ftp.c:226 ++#, c-format ++msgid "Length: %s" ++msgstr "D?ugo??: %s" ++ ++#: src/ftp.c:232 src/http.c:1862 ++#, c-format ++msgid ", %s (%s) remaining" ++msgstr ", pozosta?o %s (%s)" ++ ++#: src/ftp.c:236 src/http.c:1866 ++#, c-format ++msgid ", %s remaining" ++msgstr ", pozosta?o %s" ++ ++#: src/ftp.c:239 ++msgid " (unauthoritative)\n" ++msgstr " (nie autorytatywne)\n" ++ ++#: src/ftp.c:314 + #, c-format + msgid "Logging in as %s ... " + msgstr "Logowanie si? jako %s ... " + +-#: src/ftp.c:215 src/ftp.c:268 src/ftp.c:299 src/ftp.c:353 src/ftp.c:468 +-#: src/ftp.c:519 src/ftp.c:551 src/ftp.c:611 src/ftp.c:675 src/ftp.c:748 +-#: src/ftp.c:796 ++#: src/ftp.c:327 src/ftp.c:373 src/ftp.c:402 src/ftp.c:454 src/ftp.c:566 ++#: src/ftp.c:612 src/ftp.c:640 src/ftp.c:698 src/ftp.c:759 src/ftp.c:819 ++#: src/ftp.c:866 + msgid "Error in server response, closing control connection.\n" + msgstr "B??d w odpowiedzi serwera, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:223 ++#: src/ftp.c:334 + msgid "Error in server greeting.\n" + msgstr "B??d w powitaniu serwera.\n" + +-#: src/ftp.c:231 src/ftp.c:362 src/ftp.c:477 src/ftp.c:560 src/ftp.c:621 +-#: src/ftp.c:685 src/ftp.c:758 src/ftp.c:806 ++#: src/ftp.c:341 src/ftp.c:462 src/ftp.c:574 src/ftp.c:648 src/ftp.c:708 ++#: src/ftp.c:769 src/ftp.c:829 src/ftp.c:876 + msgid "Write failed, closing control connection.\n" + msgstr "Niepowodzenie podczas zapisu, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:238 ++#: src/ftp.c:347 + msgid "The server refuses login.\n" + msgstr "Serwer nie pozwala na zalogowanie si?.\n" + +-#: src/ftp.c:245 ++#: src/ftp.c:353 + msgid "Login incorrect.\n" + msgstr "Nieprawid?owy login lub has?o.\n" + +-#: src/ftp.c:252 ++#: src/ftp.c:359 + msgid "Logged in!\n" + msgstr "Zalogowano si?!\n" + +-#: src/ftp.c:277 ++#: src/ftp.c:381 + msgid "Server error, can't determine system type.\n" + msgstr "B??d serwera, nie mo?na ustali? typu systemu.\n" + +-#: src/ftp.c:287 src/ftp.c:596 src/ftp.c:659 src/ftp.c:716 ++#: src/ftp.c:390 src/ftp.c:685 src/ftp.c:742 src/ftp.c:785 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:341 src/ftp.c:498 src/ftp.c:533 src/ftp.c:779 src/ftp.c:827 ++#: src/ftp.c:442 src/ftp.c:591 src/ftp.c:624 src/ftp.c:849 src/ftp.c:895 + msgid "done.\n" + msgstr "zrobiono.\n" + +-#: src/ftp.c:370 ++#: src/ftp.c:469 + #, c-format + msgid "Unknown type `%c', closing control connection.\n" + msgstr "Nieznany typ `%c', zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:383 ++#: src/ftp.c:481 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:389 ++#: src/ftp.c:487 + msgid "==> CWD not needed.\n" + msgstr "==> CWD nie jest potrzebne.\n" + +-#: src/ftp.c:484 ++#: src/ftp.c:580 + #, c-format + msgid "" + "No such directory `%s'.\n" +@@ -191,43 +227,33 @@ + "Nie ma katalogu `%s'.\n" + "\n" + +-#. do not CWD +-#: src/ftp.c:502 ++#: src/ftp.c:595 + msgid "==> CWD not required.\n" + msgstr "==> CWD nie wymagane.\n" + +-#: src/ftp.c:567 ++#: src/ftp.c:654 + msgid "Cannot initiate PASV transfer.\n" + msgstr "Nie mo?na zainicjowa? przesy?ania typu PASV.\n" + +-#: src/ftp.c:571 ++#: src/ftp.c:658 + msgid "Cannot parse PASV response.\n" + msgstr "Nie mo?na przeanalizowa? sk?adni odpowiedzi PASV.\n" + +-#: src/ftp.c:588 ++#: src/ftp.c:676 + #, c-format +-msgid "couldn't connect to %s:%hu: %s\n" +-msgstr "nie uda?o si? po??czy? z %s:%hu: %s\n" ++msgid "couldn't connect to %s port %d: %s\n" ++msgstr "nie uda?o si? po??czy? z %s na port %d: %s\n" + +-#: src/ftp.c:638 ++#: src/ftp.c:724 + #, c-format + msgid "Bind error (%s).\n" + msgstr "B??d Bind (%s).\n" + +-#: src/ftp.c:645 ++#: src/ftp.c:730 + msgid "Invalid PORT.\n" + msgstr "Nieprawid?owe PORT.\n" + +-#: src/ftp.c:698 +-#, c-format +-msgid "" +-"\n" +-"REST failed; will not truncate `%s'.\n" +-msgstr "" +-"\n" +-"REST nieudane; zawarto?? `%s' nie zostanie obci?ta.\n" +- +-#: src/ftp.c:705 ++#: src/ftp.c:776 + msgid "" + "\n" + "REST failed, starting from scratch.\n" +@@ -235,7 +261,7 @@ + "\n" + "REST nieudane, rozpoczynanie od pocz?tku.\n" + +-#: src/ftp.c:766 ++#: src/ftp.c:837 + #, c-format + msgid "" + "No such file `%s'.\n" +@@ -244,7 +270,7 @@ + "Nie ma pliku `%s'.\n" + "\n" + +-#: src/ftp.c:814 ++#: src/ftp.c:884 + #, c-format + msgid "" + "No such file or directory `%s'.\n" +@@ -253,86 +279,75 @@ + "Nie ma pliku ani katalogu `%s'.\n" + "\n" + +-#: src/ftp.c:898 src/ftp.c:906 ++#: src/ftp.c:946 src/http.c:1923 + #, c-format +-msgid "Length: %s" +-msgstr "D?ugo??: %s" ++msgid "%s has sprung into existence.\n" ++msgstr "%s zacz?? istnie?.\n" + +-#: src/ftp.c:900 src/ftp.c:908 +-#, c-format +-msgid " [%s to go]" +-msgstr " [%s do ko?ca]" +- +-#: src/ftp.c:910 +-msgid " (unauthoritative)\n" +-msgstr " (nie autorytatywne)\n" +- +-#: src/ftp.c:936 ++#: src/ftp.c:1008 + #, c-format + msgid "%s: %s, closing control connection.\n" + msgstr "%s: %s, zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:944 ++#: src/ftp.c:1016 + #, c-format + msgid "%s (%s) - Data connection: %s; " + msgstr "%s (%s) - Po??czenie danych: %s; " + +-#: src/ftp.c:961 ++#: src/ftp.c:1030 + msgid "Control connection closed.\n" + msgstr "Zamkni?to po??czenie steruj?ce.\n" + +-#: src/ftp.c:979 ++#: src/ftp.c:1049 + msgid "Data transfer aborted.\n" + msgstr "Przerwano przesy?anie danych.\n" + +-#: src/ftp.c:1044 ++#: src/ftp.c:1117 + #, c-format +-msgid "File `%s' already there, not retrieving.\n" ++msgid "File `%s' already there; not retrieving.\n" + msgstr "Plik `%s' ju? istnieje, bez pobierania.\n" + +-#: src/ftp.c:1114 src/http.c:1716 ++#: src/ftp.c:1185 src/http.c:2146 + #, c-format + msgid "(try:%2d)" + msgstr "(pr?ba:%2d)" + +-#: src/ftp.c:1180 src/http.c:1975 ++#: src/ftp.c:1255 src/http.c:2423 + #, c-format + msgid "" +-"%s (%s) - `%s' saved [%ld]\n" ++"%s (%s) - `%s' saved [%s]\n" + "\n" + msgstr "" +-"%s (%s) - zapisano `%s' [%ld]\n" ++"%s (%s) - zapisano `%s' [%s]\n" + "\n" + +-#: src/ftp.c:1222 src/main.c:890 src/recur.c:377 src/retr.c:596 ++#: src/ftp.c:1297 src/main.c:948 src/recur.c:376 src/retr.c:844 + #, c-format + msgid "Removing %s.\n" + msgstr "Usuwanie %s.\n" + +-#: src/ftp.c:1264 ++#: src/ftp.c:1339 + #, c-format + msgid "Using `%s' as listing tmp file.\n" + msgstr "U?ycie `%s' jako tymczasowego pliku dla listy.\n" + +-#: src/ftp.c:1279 ++#: src/ftp.c:1354 + #, c-format + msgid "Removed `%s'.\n" + msgstr "Usuni?to `%s'.\n" + +-#: src/ftp.c:1314 ++#: src/ftp.c:1389 + #, c-format + msgid "Recursion depth %d exceeded max. depth %d.\n" + msgstr "G??boko?? rekurencji %d przekroczy?a maksymaln? g??boko?? %d.\n" + +-#. Remote file is older, file sizes can be compared and +-#. are both equal. +-#: src/ftp.c:1384 ++#: src/ftp.c:1459 + #, c-format + msgid "Remote file no newer than local file `%s' -- not retrieving.\n" +-msgstr "Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" ++msgstr "" ++"Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" + +-#. Remote file is newer or sizes cannot be matched +-#: src/ftp.c:1391 ++#: src/ftp.c:1466 + #, c-format + msgid "" + "Remote file is newer than local file `%s' -- retrieving.\n" +@@ -341,21 +356,20 @@ + "Plik po stronie serwera jest nowszy ni? lokalny `%s' -- pobieranie.\n" + "\n" + +-#. Sizes do not match +-#: src/ftp.c:1398 ++#: src/ftp.c:1473 + #, c-format + msgid "" +-"The sizes do not match (local %ld) -- retrieving.\n" ++"The sizes do not match (local %s) -- retrieving.\n" + "\n" + msgstr "" +-"Rozmiary si? r??ni? (lokalny %ld) -- pobieranie.\n" ++"Rozmiary si? r??ni? (lokalny %s) -- pobieranie.\n" + "\n" + +-#: src/ftp.c:1415 ++#: src/ftp.c:1491 + msgid "Invalid name of the symlink, skipping.\n" + msgstr "Nieprawid?owa nazwa dowi?zania symbolicznego, pomijanie.\n" + +-#: src/ftp.c:1432 ++#: src/ftp.c:1508 + #, c-format + msgid "" + "Already have correct symlink %s -> %s\n" +@@ -364,70 +378,62 @@ + "Ju? istnieje poprawne dowi?zanie symboliczne %s -> %s\n" + "\n" + +-#: src/ftp.c:1440 ++#: src/ftp.c:1516 + #, c-format + msgid "Creating symlink %s -> %s\n" + msgstr "Tworzenie dowi?zania symbolicznego %s -> %s\n" + +-#: src/ftp.c:1451 ++#: src/ftp.c:1526 + #, c-format + msgid "Symlinks not supported, skipping symlink `%s'.\n" +-msgstr "Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" ++msgstr "" ++"Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" + +-#: src/ftp.c:1463 ++#: src/ftp.c:1538 + #, c-format + msgid "Skipping directory `%s'.\n" + msgstr "Pomijanie katalogu `%s'.\n" + +-#: src/ftp.c:1472 ++#: src/ftp.c:1547 + #, c-format + msgid "%s: unknown/unsupported file type.\n" + msgstr "%s: nieznany/nieobs?ugiwany typ pliku.\n" + +-#: src/ftp.c:1499 ++#: src/ftp.c:1574 + #, c-format + msgid "%s: corrupt time-stamp.\n" + msgstr "%s: znacznik czasowy uszkodzony.\n" + +-#: src/ftp.c:1524 ++#: src/ftp.c:1602 + #, c-format + msgid "Will not retrieve dirs since depth is %d (max %d).\n" + msgstr "Nie b?d? pobierane katalogi, gdy? g??boko?? wynosi %d (maks. %d).\n" + +-#: src/ftp.c:1574 ++#: src/ftp.c:1652 + #, c-format + msgid "Not descending to `%s' as it is excluded/not-included.\n" + msgstr "Bez wchodzenia do `%s', poniewa? jest on wy??czony/nie-w??czony.\n" + +-#: src/ftp.c:1639 src/ftp.c:1652 ++#: src/ftp.c:1718 src/ftp.c:1732 + #, c-format + msgid "Rejecting `%s'.\n" + msgstr "Odrzucanie `%s'.\n" + +-#. No luck. +-#. #### This message SUCKS. We should see what was the +-#. reason that nothing was retrieved. +-#: src/ftp.c:1698 ++#: src/ftp.c:1778 + #, c-format + msgid "No matches on pattern `%s'.\n" + msgstr "Brak pasuj?cych do wzorca `%s'.\n" + +-#: src/ftp.c:1764 ++#: src/ftp.c:1844 + #, c-format +-msgid "Wrote HTML-ized index to `%s' [%ld].\n" +-msgstr "Zapisano indeks w postaci HTML-u w `%s' [%ld].\n" ++msgid "Wrote HTML-ized index to `%s' [%s].\n" ++msgstr "Zapisano indeks w postaci HTML-a w `%s' [%s].\n" + +-#: src/ftp.c:1769 ++#: src/ftp.c:1849 + #, c-format + msgid "Wrote HTML-ized index to `%s'.\n" + msgstr "Zapisano indeks w postaci HTML-u w `%s'.\n" + +-#: src/gen_sslfunc.c:117 +-msgid "Could not seed OpenSSL PRNG; disabling SSL.\n" +-msgstr "" +-"Nie da?o si? ustali? ziarna generatora liczb pseudolosowych dla OpenSSL;\n" +-"wy??czenie SSL.\n" +- + #: src/getopt.c:675 + #, c-format + msgid "%s: option `%s' is ambiguous\n" +@@ -448,19 +454,16 @@ + msgid "%s: option `%s' requires an argument\n" + msgstr "%s: opcja `%s' wymaga argumentu\n" + +-#. --option + #: src/getopt.c:752 + #, c-format + msgid "%s: unrecognized option `--%s'\n" + msgstr "%s: nierozpoznana opcja `--%s'\n" + <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-pl.patch?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: wget.spec - updated to 1.10.1, removed obsolete strptime, se... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches ---- Files affected: SPECS: wget.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/wget.spec diff -u SPECS/wget.spec:1.121 SPECS/wget.spec:1.122 --- SPECS/wget.spec:1.121 Wed Jul 13 21:04:02 2005 +++ SPECS/wget.spec Sun Aug 28 15:13:54 2005 @@ -8,12 +8,12 @@ Summary(uk): ??????? ??? ????????? ?????? ?? ?????????? HTTP ?? FTP Summary(zh_CN): [????]??????????????????,???????????? Name: wget -Version: 1.10 -Release: 2 +Version: 1.10.1 +Release: 1 License: GPL Group: Networking/Utilities Source0: ftp://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz -# Source0-md5: caddc199d2cb31969e32b19fd365b0c5 +# Source0-md5: 879a15cc9093796b8a5035ff0d0d25ad Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f Patch0: %{name}-info.patch @@ -21,13 +21,10 @@ Patch2: %{name}-pl.patch Patch3: %{name}-wgetrc_path.patch Patch4: %{name}-home_etc.patch -Patch5: %{name}-strptime.patch -Patch6: %{name}-segv.patch URL: http://sunsite.dk/wget/ -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: intltool BuildRequires: libtool BuildRequires: openssl-devel >= 0.9.7d BuildRequires: texinfo @@ -114,18 +111,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 rm -f doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion mv -f po/{no,nb}.po %build -mv ac{local,include}.m4 %{__libtoolize} %{__gettextize} -intltoolize --copy --force -%{__aclocal} +%{__aclocal} -I m4 %{__autoheader} %{__autoconf} %configure \ @@ -161,7 +154,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS TODO README MAILING-LIST rmold.README -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/%{name}rc +%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}rc %attr(755,root,root) %{_bindir}/* %{_mandir}/man1/* %lang(hu) %{_mandir}/hu/man1/* @@ -174,6 +167,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 13:13:54 qboosh +- updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches + Revision 1.121 2005/07/13 19:04:02 qboosh - added segv patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wget.spec?r1=1.121&r2=1.122&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: wget-1.10.1.tar.gz wget-non-english-man-pages.tar.bz2 Message-ID: <4092.1125234847@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnu.org/gnu/wget/wget-1.10.1.tar.gz 879a15cc9093796b8a5035ff0d0d25ad wget-1.10.1.tar.gz Size: 1212784 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/wget-non-english-man-pages.tar.bz2 d8b2b56ec7461606c22edbafaf8a418f wget-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:17:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: mISDN.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:17:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: mISDN.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u SPECS/mISDN.spec:1.1 SPECS/mISDN.spec:1.2 --- SPECS/mISDN.spec:1.1 Sun Aug 28 13:49:36 2005 +++ SPECS/mISDN.spec Sun Aug 28 15:17:36 2005 @@ -1,10 +1,14 @@ +# $Revision$, $Date$ +# +# Conditional build: %bcond_without dist_kernel # allow non-distribution kernel %bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) - +# %define mISDN_version CVS-2005-07-06 Summary: mISDN - modular ISDN +Summary(pl): mISDN - modularny ISDN Name: mISDN Version: 2005.07.06 %define _rel 0.1 @@ -19,7 +23,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. +mISDN (modular ISDN) is the new ISDN stack of the Linux kernel version +2.6. + +%description -l pl +mISDN (modularny ISDN) to nowy stos ISDN dla j?dra Linuksa w wersji +2.6. %package -n kernel-isdn-mISDN Summary: Linux driver for mISDN @@ -135,7 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 13:17:36 qboosh +- pl desc + Revision 1.1 2005/08/28 11:49:36 areq - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mISDN.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 15:26:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: audit-1.0.3.tar.gz Message-ID: <23401.1125235603@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.redhat.com/sgrubb/audit/audit-1.0.3.tar.gz 950daad97adfa3134289aa5b4e885f8f audit-1.0.3.tar.gz Size: 98835 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:26:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: audit.spec - updated to 1.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:26:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.3 ---- Files affected: SPECS: audit.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.4 SPECS/audit.spec:1.5 --- SPECS/audit.spec:1.4 Sat Jun 18 00:06:19 2005 +++ SPECS/audit.spec Sun Aug 28 15:26:36 2005 @@ -2,12 +2,12 @@ Summary: User space tools for 2.6 kernel auditing Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit -Version: 0.9.7 +Version: 1.0.3 Release: 0.1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz -# Source0-md5: 8548fbe16c3c44bdcc045fba0f35a070 +# Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h URL: http://people.redhat.com/sgrubb/audit/ @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 13:26:36 qboosh +- updated to 1.0.3 + Revision 1.4 2005/06/17 22:06:19 qboosh - added missing update info to last commit message ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: libassuan.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libassuan.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/libassuan.spec diff -u SPECS/libassuan.spec:1.19 SPECS/libassuan.spec:1.20 --- SPECS/libassuan.spec:1.19 Thu Jun 23 21:54:59 2005 +++ SPECS/libassuan.spec Sun Aug 28 15:58:03 2005 @@ -15,7 +15,7 @@ # Source0-md5: 4cde037c3fcb2f0eeb695b1db6e56bba Patch0: %{name}-shared.patch Patch1: %{name}-info.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libassuan/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9.3 BuildRequires: libtool @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/28 13:58:03 qboosh +- more specific URL + Revision 1.19 2005/06/23 19:54:59 qboosh - updated to 0.6.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libassuan.spec?r1=1.19&r2=1.20&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: libgpg-error.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libgpg-error.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/libgpg-error.spec diff -u SPECS/libgpg-error.spec:1.17 SPECS/libgpg-error.spec:1.18 --- SPECS/libgpg-error.spec:1.17 Thu Jun 23 22:01:41 2005 +++ SPECS/libgpg-error.spec Sun Aug 28 15:58:44 2005 @@ -9,7 +9,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz # Source0-md5: ee23cdd5fbbb1483676647a8e091ff8e Patch0: %{name}-pl.po-update.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libgpg-error/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.7.6 BuildRequires: gettext-devel >= 0.12.1 @@ -127,6 +127,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 13:58:44 qboosh +- more specific URL + Revision 1.17 2005/06/23 20:01:41 qboosh - updated to 1.1 (bugfixes) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgpg-error.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Sun Aug 28 15:59:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: libksba.spec - added URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:59:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added URL ---- Files affected: SPECS: libksba.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/libksba.spec diff -u SPECS/libksba.spec:1.26 SPECS/libksba.spec:1.27 --- SPECS/libksba.spec:1.26 Sat Aug 13 16:37:39 2005 +++ SPECS/libksba.spec Sun Aug 28 15:59:45 2005 @@ -12,6 +12,7 @@ # Source0-md5: 4d40a09134c5a0d2dcc6416f9abdcc98 Patch0: %{name}-info.patch Patch1: %{name}-link.patch +URL: http://www.gnupg.org/related_software/libksba/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.9.3 BuildRequires: libgpg-error-devel >= 0.7 @@ -124,6 +125,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 13:59:45 qboosh +- added URL + Revision 1.26 2005/08/13 14:37:39 qboosh - updated to 0.9.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libksba.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Sun Aug 28 16:23:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: gsti-link.patch (NEW) - linking fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:23:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - linking fix ---- Files affected: SOURCES: gsti-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gsti-link.patch diff -u /dev/null SOURCES/gsti-link.patch:1.1 --- /dev/null Sun Aug 28 16:23:54 2005 +++ SOURCES/gsti-link.patch Sun Aug 28 16:23:49 2005 @@ -0,0 +1,10 @@ +--- gsti-0.3.0/src/Makefile.am.orig 2005-07-13 11:00:45.000000000 +0200 ++++ gsti-0.3.0/src/Makefile.am 2005-08-28 16:13:05.131648000 +0200 +@@ -29,6 +29,7 @@ + + AM_CFLAGS = @GPG_ERROR_CFLAGS@ @LIBGCRYPT_CFLAGS@ + ++libgsti_la_LIBADD = $(LIBGCRYPT_LIBS) + libgsti_la_LDFLAGS = -version-info \ + @LIBGSTI_LT_CURRENT@:@LIBGSTI_LT_REVISION@:@LIBGSTI_LT_AGE@ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:24:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: gsti-0.3.0.tar.bz2 Message-ID: <7016.1125239088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/gsti-0.3.0.tar.bz2 e748f986f621b3d8d8579368ba7e4b1f gsti-0.3.0.tar.bz2 Size: 311569 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:24:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: gsti.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:24:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: gsti.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/gsti.spec diff -u /dev/null SPECS/gsti.spec:1.1 --- /dev/null Sun Aug 28 16:24:50 2005 +++ SPECS/gsti.spec Sun Aug 28 16:24:45 2005 @@ -0,0 +1,101 @@ +# $Revision$, $Date$ +Summary: GNU Secure Transport Initiative +Summary(pl): GNU Secure Transport Initiative - biblioteka bezpiecznego transportu +Name: gsti +Version: 0.3.0 +Release: 1 +License: GPL v2+ +Group: Libraries +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/%{name}-%{version}.tar.bz2 +# Source0-md5: e748f986f621b3d8d8579368ba7e4b1f +Patch0: %{name}-link.patch +URL: http://www.gnupg.org/ +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1.9.3 +BuildRequires: libgcrypt-devel >= 1.2.0 +BuildRequires: libgpg-error-devel >= 1.0 +BuildRequires: libtool +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This is a library which implements a basic part of the protocol used +by SSH to create a secure transport channel. + +%description -l pl +Ta biblioteka implementuje podstawow? cz??? protoko?u u?ywanego przez +SSH do stworzenia bezpiecznego kana?u transportowego. + +%package devel +Summary: Header files for GSTI library +Summary(pl): Pliki nag??wkowe biblioteki GSTI +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for GSTI library. + +%description devel -l pl +Pliki nag??wkowe biblioteki GSTI. + +%package static +Summary: Static GSTI library +Summary(pl): Statyczna biblioteka GSTI +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static GSTI library. + +%description static -l pl +Statyczna biblioteka GSTI. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure +%{__make} + +%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(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README* TODO doc/*.txt +%attr(755,root,root) %{_libdir}/libgsti.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gsti-config +%attr(755,root,root) %{_libdir}/libgsti.so +%{_libdir}/libgsti.la +%{_includedir}/gsti.h +%{_aclocaldir}/gsti.m4 + +%files static +%defattr(644,root,root,755) +%{_libdir}/libgsti.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 14:24:45 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:39:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: linux-libc-headers-audit.patch (NEW) - change References: Message-ID: Author: qboosh Date: Sun Aug 28 14:39:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change to userspace version + little update (from 2.6.13-something?) to get usable ---- Files affected: SOURCES: linux-libc-headers-audit.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-audit.patch diff -u /dev/null SOURCES/linux-libc-headers-audit.patch:1.1 --- /dev/null Sun Aug 28 16:39:32 2005 +++ SOURCES/linux-libc-headers-audit.patch Sun Aug 28 16:39:26 2005 @@ -0,0 +1,123 @@ +--- linux-libc-headers-2.6.12.0/include/linux/audit.h.orig 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/audit.h 2005-08-28 16:35:11.219052000 +0200 +@@ -24,21 +24,53 @@ + #ifndef _LINUX_AUDIT_H_ + #define _LINUX_AUDIT_H_ + +-#include +-#include ++#include + +-#include +-#include ++/* The netlink messages for the audit system is divided into blocks: ++ * 1000 - 1099 are for commanding the audit system ++ * 1100 - 1199 user space trusted application messages ++ * 1200 - 1299 messages internal to the audit daemon ++ * 1300 - 1399 audit event messages ++ * 1400 - 1499 SE Linux use ++ * 1500 - 1999 future use ++ * 2000 is for otherwise unclassified kernel audit messages ++ * ++ * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user ++ * space. Anything over that is kernel --> user space communication. ++ */ ++#define AUDIT_GET 1000 /* Get status */ ++#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ ++#define AUDIT_LIST 1002 /* List syscall filtering rules */ ++#define AUDIT_ADD 1003 /* Add syscall filtering rule */ ++#define AUDIT_DEL 1004 /* Delete syscall filtering rule */ ++#define AUDIT_USER 1005 /* Message from userspace -- deprecated */ ++#define AUDIT_LOGIN 1006 /* Define the login id and information */ ++#define AUDIT_WATCH_INS 1007 /* Insert file/dir watch entry */ ++#define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ ++#define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ ++#define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ ++ ++#define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages uninteresting to kernel */ ++#define AUDIT_LAST_USER_MSG 1199 ++ ++#define AUDIT_DAEMON_START 1200 /* Daemon startup record */ ++#define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ ++#define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */ ++#define AUDIT_DAEMON_CONFIG 1203 /* Daemon config change */ ++ ++#define AUDIT_SYSCALL 1300 /* Syscall event */ ++#define AUDIT_FS_WATCH 1301 /* Filesystem watch event */ ++#define AUDIT_PATH 1302 /* Filname path information */ ++#define AUDIT_IPC 1303 /* IPC record */ ++#define AUDIT_SOCKETCALL 1304 /* sys_socketcall arguments */ ++#define AUDIT_CONFIG_CHANGE 1305 /* Audit system configuration change */ ++#define AUDIT_SOCKADDR 1306 /* sockaddr copied as syscall arg */ ++ ++#define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ ++#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ ++#define AUDIT_AVC_PATH 1402 /* dentry, vfsmount pair from avc */ + +-/* Request and reply types */ +-#define AUDIT_GET 1000 /* Get status */ +-#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ +-#define AUDIT_LIST 1002 /* List filtering rules */ +-#define AUDIT_ADD 1003 /* Add filtering rule */ +-#define AUDIT_DEL 1004 /* Delete filtering rule */ +-#define AUDIT_USER 1005 /* Send a message from user-space */ +-#define AUDIT_LOGIN 1006 /* Define the login id and informaiton */ +-#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ ++#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ + + /* Rule flags */ + #define AUDIT_PER_TASK 0x01 /* Apply rule at task creation (not syscall) */ +@@ -55,7 +87,7 @@ + * AUDIT_LIST commands must be implemented. */ + #define AUDIT_MAX_FIELDS 64 + #define AUDIT_BITMASK_SIZE 64 +-#define AUDIT_WORD(nr) ((__u32)((nr)/32)) ++#define AUDIT_WORD(nr) ((uint32_t)((nr)/32)) + #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) + + /* Rule fields */ +@@ -135,29 +167,24 @@ + #define AUDIT_ARCH_V850 (EM_V850|__AUDIT_ARCH_LE) + #define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + +-struct audit_message { +- struct nlmsghdr nlh; +- char data[1200]; +-}; +- + struct audit_status { +- __u32 mask; /* Bit mask for valid entries */ +- __u32 enabled; /* 1 = enabled, 0 = disbaled */ +- __u32 failure; /* Failure-to-log action */ +- __u32 pid; /* pid of auditd process */ +- __u32 rate_limit; /* messages rate limit (per second) */ +- __u32 backlog_limit; /* waiting messages limit */ +- __u32 lost; /* messages lost */ +- __u32 backlog; /* messages waiting in queue */ ++ uint32_t mask; /* Bit mask for valid entries */ ++ uint32_t enabled; /* 1 = enabled, 0 = disabled */ ++ uint32_t failure; /* Failure-to-log action */ ++ uint32_t pid; /* pid of auditd process */ ++ uint32_t rate_limit; /* messages rate limit (per second) */ ++ uint32_t backlog_limit; /* waiting messages limit */ ++ uint32_t lost; /* messages lost */ ++ uint32_t backlog; /* messages waiting in queue */ + }; + + struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ +- __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ +- __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ +- __u32 field_count; +- __u32 mask[AUDIT_BITMASK_SIZE]; +- __u32 fields[AUDIT_MAX_FIELDS]; +- __u32 values[AUDIT_MAX_FIELDS]; ++ uint32_t flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ ++ uint32_t action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ ++ uint32_t field_count; ++ uint32_t mask[AUDIT_BITMASK_SIZE]; ++ uint32_t fields[AUDIT_MAX_FIELDS]; ++ uint32_t values[AUDIT_MAX_FIELDS]; + }; + +-#endif ++#endif /* _LINUX_AUDIT_H_ */ ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:40:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: linux-libc-headers.spec - added audit patch, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:40:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added audit patch, release 4 ---- Files affected: SPECS: linux-libc-headers.spec (1.100 -> 1.101) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.100 SPECS/linux-libc-headers.spec:1.101 --- SPECS/linux-libc-headers.spec:1.100 Tue Aug 23 19:48:17 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 16:39:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 3 +Release: 4 Epoch: 7 License: GPL Group: Development @@ -16,6 +16,8 @@ Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch Patch6: %{name}-endian.patch +# based on http://people.redhat.com/sgrubb/audit/audit.h +Patch7: %{name}-audit.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -60,6 +62,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %ifarch %{x8664} @@ -174,6 +177,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.101 2005/08/28 14:39:56 qboosh +- added audit patch, release 4 + Revision 1.100 2005/08/23 17:48:17 qboosh - bugfix in endian patch, release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.100&r2=1.101&f=u From qboosh at pld-linux.org Sun Aug 28 16:48:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: gplflash2-link.patch - updated for 20050828 snap In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:48:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 20050828 snap ---- Files affected: SOURCES: gplflash2-link.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gplflash2-link.patch diff -u SOURCES/gplflash2-link.patch:1.1 SOURCES/gplflash2-link.patch:1.2 --- SOURCES/gplflash2-link.patch:1.1 Sat Jun 11 20:27:27 2005 +++ SOURCES/gplflash2-link.patch Sun Aug 28 16:48:28 2005 @@ -1,16 +1,16 @@ ---- gplflash2/plugins/mozilla/Makefile.am.orig 2005-04-24 22:51:39.000000000 +0200 -+++ gplflash2/plugins/mozilla/Makefile.am 2005-06-11 18:30:08.627104256 +0200 +--- gplflash2/plugins/mozilla/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/plugins/mozilla/Makefile.am 2005-08-28 15:36:07.130835376 +0200 @@ -13,15 +13,8 @@ OPTIMIZER=$(OPTFLAGS) SHARED=-shared -libnpflash_la_LIBADD = ../../lib/libflash2.la -+libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) -lXt ++libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) -lXt libnpflash_la_SOURCES = flash_interface.cc plugin.c npunix.c -libnpflash_la_CFLAGS = -fpic -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) +libnpflash_la_CFLAGS = -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) - libnpflash_la_CXXFLAGS = $(FREETYPE_CFLAGS) --libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) + libnpflash_la_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) +-libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) - -install-pluginLTLIBRARIES: $(plugin_LIBRARIES) - mkdir -p $(PLUGIN_DIR) @@ -19,8 +19,8 @@ -uninstall-pluginLTLIBRARIES: $(plugin_LIBRARIES) - rm -f $(PLUGIN_DIR)/libnpflash.so +libnpflash_la_LDFLAGS = -avoid-version ---- gplflash2/player/Makefile.am.orig 2005-04-24 22:51:38.000000000 +0200 -+++ gplflash2/player/Makefile.am 2005-06-11 19:08:01.235615248 +0200 +--- gplflash2/player/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/player/Makefile.am 2005-08-28 15:36:58.912963296 +0200 @@ -1,13 +1,12 @@ bin_PROGRAMS = flashplayer @@ -32,8 +32,8 @@ flashplayer.cc - flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBSDL) $(LIBXML2) + flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(SDL_LIBS) $(XML_LIBS) -flashplayer_includedir = $(includedir) +flashplayer_includedir = $(includedir) - flashplayer_CXXFLAGS = $(FREETYPE_CFLAGS) + flashplayer_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) flashplayer_LDADD = ../lib/libflash2.la $(LIBFFMPEG) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gplflash2-link.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 16:50:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: DISTFILES: gplflash2-20050828.tar.bz2 Message-ID: <11469.1125240605@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gplflash2-20050828.tar.bz2 865d6ae3795523343b9d51ee23772613 gplflash2-20050828.tar.bz2 Size: 332038 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:50:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: gplflash2.spec - updated to todays snap (20050828), updated... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:50:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to todays snap (20050828), updated link patch ---- Files affected: SPECS: gplflash2.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/gplflash2.spec diff -u SPECS/gplflash2.spec:1.3 SPECS/gplflash2.spec:1.4 --- SPECS/gplflash2.spec:1.3 Sat Jun 11 20:28:27 2005 +++ SPECS/gplflash2.spec Sun Aug 28 16:50:01 2005 @@ -1,27 +1,27 @@ # $Revision$, $Date$ -%define _snap 20050605 +%define _snap 20050828 Summary: Flash animations redering library Summary(pl): Biblioteka renderuj?ca animacje Flash Name: gplflash2 Version: 0.1.0 -Release: 1 +Release: 0.%{_snap}.1 License: GPL Group: Libraries -Source0: %{name}-%{_snap}.tar.gz -# Source0-md5: 2f307955c081689c294f664ff90313ee +Source0: %{name}-%{_snap}.tar.bz2 +# Source0-md5: 865d6ae3795523343b9d51ee23772613 Patch0: %{name}-link.patch URL: http://gplflash.sourceforge.net/ BuildRequires: OpenGL-devel BuildRequires: SDL-devel >= 1.2.8 BuildRequires: XFree86-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: ffmpeg-devel -BuildRequires: freetype-devel >= 2.0 +BuildRequires: freetype-devel >= 2.1.7 BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel >= 1.1.4 Obsoletes: flash @@ -47,9 +47,9 @@ Summary(pl): Pliki nag??wkowe wymagane przez programy u?ywaj?ce gplflash2 Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: freetype-devel >= 2.0 +Requires: freetype-devel >= 2.1.7 Requires: libstdc++-devel -Requires: libxml2-devel +Requires: libxml2-devel >= 2.6.0 Requires: zlib-devel >= 1.1.4 Obsoletes: flash-devel @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 14:50:01 qboosh +- updated to todays snap (20050828), updated link patch + Revision 1.3 2005/06/11 18:28:27 qboosh - added link patch, some install hacks not needed now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash2.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 16:53:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 14:53:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.23 SPECS/fonts-TTF-microsoft.spec:1.24 --- SPECS/fonts-TTF-microsoft.spec:1.23 Fri Jul 22 11:18:37 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 16:53:01 2005 @@ -59,7 +59,7 @@ %description Microsoft free True Type fonts collection. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: @@ -70,7 +70,7 @@ %description -l pl Kolekcja darmowych font?w True Type firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -90,7 +90,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -192,6 +192,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 14:53:01 glen +- use without macro + Revision 1.23 2005/07/22 09:18:37 deejay1 - rel up to 5 @@ -252,7 +255,7 @@ - make spec non-interactive; release 3 Revision 1.5 2002/11/27 19:36:46 juandon -- new %%doc +- new %doc Revision 1.4 2002/09/11 16:19:30 adgor - Updated source URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Sun Aug 28 17:08:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: fonts-TTF-microsoft.spec - removed ftp url, which is 1) poi... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:08:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.24 SPECS/fonts-TTF-microsoft.spec:1.25 --- SPECS/fonts-TTF-microsoft.spec:1.24 Sun Aug 28 16:53:01 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:08:05 2005 @@ -65,7 +65,6 @@ with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl @@ -76,7 +75,6 @@ pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -192,6 +190,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 15:08:05 glen +- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) + Revision 1.24 2005/08/28 14:53:01 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 17:20:03 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: auditd.init (NEW), auditd.sysconfig (NEW) - PLDified from... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:20:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - PLDified from files included in package ---- Files affected: SOURCES: auditd.init (NONE -> 1.1) (NEW), auditd.sysconfig (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/auditd.init diff -u /dev/null SOURCES/auditd.init:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.init Sun Aug 28 17:19:57 2005 @@ -0,0 +1,86 @@ +#!/bin/sh +# +# auditd This starts and stops auditd +# +# chkconfig: 2345 18 87 +# description: This starts the Linux Auditing System Daemon +# +# processname: /sbin/auditd +# config: /etc/sysconfig/auditd +# config: /etc/auditd.conf +# pidfile: /var/run/auditd.pid + +PATH=/sbin:/bin:/usr/bin:/usr/sbin + +# Source function library +. /etc/rc.d/init.d/functions + +AUDITD_CLEAN_STOP=yes +EXTRAOPTIONS= + +# Get service config - may override defaults +[ -f /etc/sysconfig/auditd ] && . /etc/sysconfig/auditd + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + if [ ! -f /var/lock/subsys/auditd ]; then + # show "Starting %s service" auditd + msg_starting auditd + unset HOME MAIL USER USERNAME + daemon auditd "$EXTRAOPTIONS" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd + # Load the default rules + [ -f /etc/audit.rules ] && /sbin/auditctl -R /etc/audit.rules >/dev/null + else + # show "%s service is already running." auditd + msg_already_running auditd + fi + ;; + stop) + if [ -f /var/lock/subsys/auditd ]; then + # Stop daemons. + # show "Stopping %s service" auditd + msg_stopping auditd + killproc auditd + rm -f /var/lock/subsys/auditd + # Remove watches so shutdown works cleanly + if ! is_no "$AUDITD_CLEAN_STOP"; then + /sbin/auditctl -D >/dev/null + fi + else + # show "%s service is not running." auditd + msg_not_running auditd + fi + ;; + restart) + $0 stop + $0 start + exit $? + ;; + reload|force-reload) + if [ -f /var/lock/subsys/auditd ]; then + # show "Reload %s service" auditd + msg_reloading auditd + killproc auditd -HUP + RETVAL=$? + else + # show "%s service is not running." auditd + msg_not_running auditd >&2 + RETVAL=7 + fi + ;; + status) + status auditd + RETVAL=$? + ;; + *) + # show "Usage: %s {start|stop|restart|reload|force-reload|status}" + msg_usage "$0 {start|stop|restart|reload|force-reload|status}" + RETVAL=3 +esac + +exit $RETVAL ================================================================ Index: SOURCES/auditd.sysconfig diff -u /dev/null SOURCES/auditd.sysconfig:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.sysconfig Sun Aug 28 17:19:57 2005 @@ -0,0 +1,15 @@ +# Customized settings for auditd + +# Nice level for auditd +# SERVICE_RUN_NICE_LEVEL=0 + +# Extra options for auditd +# EXTRAOPTIONS= + +# You can set audit locale here +# LC_ALL=C + +# This option is used to determine if rules & watches should be deleted on +# shutdown. This is beneficial in most cases so that a watch doesn't linger +# on a drive that is being unmounted. If set to no, it will NOT be cleaned up. +AUDITD_CLEAN_STOP=yes ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:21:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: audit.spec - fixed libaudit.so symlink - replace init/sysco... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:21:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed libaudit.so symlink - replace init/sysconfig with our versions - -devel R: llh with audit update - release 1 ---- Files affected: SPECS: audit.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.5 SPECS/audit.spec:1.6 --- SPECS/audit.spec:1.5 Sun Aug 28 15:26:36 2005 +++ SPECS/audit.spec Sun Aug 28 17:21:17 2005 @@ -3,13 +3,15 @@ Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit Version: 1.0.3 -Release: 0.1 +Release: 1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz # Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h +Source2: %{name}d.init +Source3: %{name}d.sysconfig URL: http://people.redhat.com/sgrubb/audit/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -52,6 +54,7 @@ License: LGPL Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +Requires: linux-libc-headers >= 7:2.6.12.0-4 %description libs-devel The audit-libs-devel package contains the header files needed for @@ -102,13 +105,16 @@ install -d $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib} -ln -sf $(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ +ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libaudit.so # We manually install this since Makefile doesn't install -d $RPM_BUILD_ROOT%{_includedir} install lib/libaudit.h $RPM_BUILD_ROOT%{_includedir} +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd +install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd + %clean rm -rf $RPM_BUILD_ROOT @@ -166,6 +172,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:21:17 qboosh +- fixed libaudit.so symlink +- replace init/sysconfig with our versions +- -devel R: llh with audit update +- release 1 + Revision 1.5 2005/08/28 13:26:36 qboosh - updated to 1.0.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sun Aug 28 17:28:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SOURCES: license-installer.sh - @LICENSE@ expansions for fonts-mic... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:28:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - @LICENSE@ expansions for fonts-microsoft packages ---- Files affected: SOURCES: license-installer.sh (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.3 SOURCES/license-installer.sh:1.4 --- SOURCES/license-installer.sh:1.3 Tue Aug 23 21:20:31 2005 +++ SOURCES/license-installer.sh Sun Aug 28 17:28:44 2005 @@ -38,11 +38,17 @@ fi fi else - echo " + if [ "@LICENSE@" != '@'LICENSE'@' ]; then + cat @LICENSE@ + echo " +If you accept the above license rebuild the package using: +" + else + echo " License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: - -$0 --with license_agreement @SPECFILE@ " + fi + echo "$0 --with license_agreement @SPECFILE@" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 17:30:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use shared license-installer.sh ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.25 SPECS/fonts-TTF-microsoft.spec:1.26 --- SPECS/fonts-TTF-microsoft.spec:1.25 Sun Aug 28 17:08:05 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:21 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 5%{?with_license_agreement:wla} +Release: 6%{?with_license_agreement:wla} License: Microsoft EULA (for non-commercial use) Group: Fonts %if %{with license_agreement} @@ -39,6 +39,7 @@ Source10: http://dl.sourceforge.net/corefonts/webdin32.exe # NoSource10-md5: 230a1d13a365b22815f502eb24d9149b %else +Source0: license-installer.sh # extracted from one of the above Source20: Microsoft-EULA.txt %endif @@ -91,58 +92,14 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -If you accept the above license rebuild the package using: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Microsoft-EULA.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -190,8 +147,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 15:30:21 glen +- use shared license-installer.sh script from SOURCES + Revision 1.25 2005/08/28 15:08:05 glen -- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) +- removed ftp url from %description, because + 1) it's pointing to inexistent src.rpm in RPMS dir, + 2) the -installer .src.rpm doesn't contain sourceX-s inside anyway Revision 1.24 2005/08/28 14:53:01 glen - use without macro @@ -200,7 +162,9 @@ - rel up to 5 Revision 1.22 2004/12/08 05:47:33 roman -- added R: cabextract to the case of building without license agreement (rationale: cabextract will be needed to get the fonts anyway, which is the only possible use of the package) +- added R: cabextract to the case of building without license + agreement (rationale: cabextract will be needed to get the fonts + anyway, which is the only possible use of the package) Revision 1.21 2004/11/17 06:14:48 ankry - message fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.25&r2=1.26&f=u From glen at pld-linux.org Sun Aug 28 17:30:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: fonts-TTF-microsoft.spec - rel 6 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 6 ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.26 SPECS/fonts-TTF-microsoft.spec:1.27 --- SPECS/fonts-TTF-microsoft.spec:1.26 Sun Aug 28 17:30:21 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:39 2005 @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 15:30:39 glen +- rel 6 + Revision 1.26 2005/08/28 15:30:21 glen - use shared license-installer.sh script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.26&r2=1.27&f=u From glen at pld-linux.org Sun Aug 28 17:36:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:28 2005 Subject: SPECS: fonts-TTF-microsoft-tahoma.spec - use shared license-instal... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:36:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-microsoft-tahoma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft-tahoma.spec diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 SPECS/fonts-TTF-microsoft-tahoma.spec:1.7 --- SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 Sun Jun 5 23:19:02 2005 +++ SPECS/fonts-TTF-microsoft-tahoma.spec Sun Aug 28 17:36:42 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of IE update - may require Windows license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Tahoma True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires Windows license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Tahoma firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na Windows). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 15:36:42 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.6 2005/06/05 21:19:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft-tahoma.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sun Aug 28 17:40:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec - use shared license-... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Microsoft-ArialUnicode.spec diff -u SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.6 --- SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 Mon Jun 6 10:18:56 2005 +++ SPECS/fonts-TTF-Microsoft-ArialUnicode.spec Sun Aug 28 17:39:57 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of MS Office - may require Office license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Arial Unicode True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires MS Office license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Arial Unicode firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na MS Office). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ] -then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "$3" $SPECDIR; then - exit 1 - fi - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U $RPMDIR/$RPMNAME || \ - echo -e "Install manually the file:\n $RPMDIR/$RPMNAME" ) - if [ "$BACKUP_SPEC" -eq 1 ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:39:57 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.5 2005/06/06 08:18:56 glen - simplification fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Microsoft-ArialUnicode.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 17:41:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: jakarta-regexp-build.patch - updated for 1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:41:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.4 ---- Files affected: SOURCES: jakarta-regexp-build.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/jakarta-regexp-build.patch diff -u SOURCES/jakarta-regexp-build.patch:1.1 SOURCES/jakarta-regexp-build.patch:1.2 --- SOURCES/jakarta-regexp-build.patch:1.1 Tue Dec 14 15:07:57 2004 +++ SOURCES/jakarta-regexp-build.patch Sun Aug 28 17:41:14 2005 @@ -1,11 +1,11 @@ ---- jakarta-regexp-1.3/build.xml~ 2003-09-02 20:56:46.000000000 +0200 -+++ jakarta-regexp-1.3/build.xml 2004-12-14 15:04:17.955572757 +0100 -@@ -36,7 +36,7 @@ +--- jakarta-regexp-1.4/build.xml.orig 2005-08-17 03:19:03.000000000 +0200 ++++ jakarta-regexp-1.4/build.xml 2005-08-28 17:12:43.723619328 +0200 +@@ -54,7 +54,7 @@ -- -+ +- ++ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jakarta-regexp-build.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sun Aug 28 17:42:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - removed superfluous O... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:42:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed superfluous Obsoletes itself ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 Sun Jun 5 23:17:02 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 17:42:32 2005 @@ -32,7 +32,6 @@ Requires: rpm-build-tools Requires: wget %endif -Obsoletes: fonts-TTF-Bitstream-Cyberfonts BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -175,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 15:42:32 glen +- removed superfluous Obsoletes itself + Revision 1.3 2005/06/05 21:17:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: jakarta-regexp.spec - updated to 1.4, updated build patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:43:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4, updated build patch ---- Files affected: SPECS: jakarta-regexp.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/jakarta-regexp.spec diff -u SPECS/jakarta-regexp.spec:1.22 SPECS/jakarta-regexp.spec:1.23 --- SPECS/jakarta-regexp.spec:1.22 Tue Dec 14 15:21:24 2004 +++ SPECS/jakarta-regexp.spec Sun Aug 28 17:43:15 2005 @@ -2,12 +2,12 @@ Summary: Java Regular Expression Summary(pl): Wyra?enia regularne do Javy Name: jakarta-regexp -Version: 1.3 +Version: 1.4 Release: 1 -License: Apache +License: Apache v2.0 Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/regexp/source/%{name}-%{version}.tar.gz -# Source0-md5: 4322f82bea908ca4a7db270f7fa4850d +# Source0-md5: d903d84c949df848009f3bf205b32c97 Patch0: %{name}-build.patch URL: http://jakarta.apache.org/regexp/index.html BuildRequires: jakarta-ant @@ -46,7 +46,6 @@ %setup -q %patch0 -p1 find . -name "*.jar" -exec rm -f {} \; -mkdir -p jakarta-site2/lib %build ant jar javadocs @@ -63,7 +62,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt +%doc LICENSE %{_javadir}/*.jar %files doc @@ -76,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 15:43:15 qboosh +- updated to 1.4, updated build patch + Revision 1.22 2004/12/14 14:21:24 baggins - fixed files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-regexp.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: jakarta-regexp-1.4.tar.gz Message-ID: <19951.1125243801@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz Size: 137768 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 17:45:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: pwdutils-pl.po-update.patch (REMOVED), pwdutils-slp.patch... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:45:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pwdutils-pl.po-update.patch (1.5 -> NONE) (REMOVED), pwdutils-slp.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:48:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: pwdutils.spec - updated to 3.0.4, removed obsolete pl.po-up... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.4, removed obsolete pl.po-update,slp patches - build audit log plugin ---- Files affected: SPECS: pwdutils.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/pwdutils.spec diff -u SPECS/pwdutils.spec:1.61 SPECS/pwdutils.spec:1.62 --- SPECS/pwdutils.spec:1.61 Thu Jul 28 11:00:49 2005 +++ SPECS/pwdutils.spec Sun Aug 28 17:47:56 2005 @@ -2,6 +2,7 @@ # TODO: review default login.defs # # Conditional build: +%bcond_without audit # don't build audit log plugin %bcond_without ldap # build without LDAP support %bcond_without selinux # build without SELinux support %bcond_with openssl # use OpenSSL instead of GnuTLS @@ -9,12 +10,12 @@ Summary: Utilities to manage the passwd and shadow user information Summary(pl): Narz?dzia do zarz?dzania informacjami o u?ytkownikach z passwd i shadow Name: pwdutils -Version: 3.0.2 +Version: 3.0.4 Release: 1 License: GPL v2 Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2 -# Source0-md5: f56fd7d1b6ae64ea7e70734bc20c2718 +# Source0-md5: 10603d67f4959772544a76691310dfc8 Source1: %{name}.useradd Source2: %{name}.rpasswdd.init Source3: %{name}.login.defs @@ -25,11 +26,10 @@ Source8: useradd.pamd Source9: userdb.pamd Patch0: %{name}-f-option.patch -Patch1: %{name}-pl.po-update.patch -Patch2: %{name}-no_bash.patch -Patch3: %{name}-silent_crontab.patch -Patch4: %{name}-slp.patch +Patch1: %{name}-no_bash.patch +Patch2: %{name}-silent_crontab.patch URL: http://www.thkukuk.de/pam/pwdutils/ +%{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: gcc >= 5:3.2 @@ -74,6 +74,18 @@ bezpiecznym po??czeniu SSL. Demon tak?e u?ywa PAM, wi?c mo?na zmienia? has?a niezale?nie od tego, gdzie s? przechowywane. +%package log-audit +Summary: audit log plugin for pwdutils +Summary(pl): Wtyczka loguj?ca audit dla pwdutils +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description log-audit +audit log plugin for pwdutils. + +%description log-audit -l pl +Wtyczka loguj?ca audit dla pwdutils. + %package -n rpasswdd Summary: Remote password update daemon Summary(pl): Demon do zdalnego uaktualniania hase? @@ -118,10 +130,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 - -rm -f po/stamp-po sed -i -e 's/-Werror //' configure.in @@ -132,12 +140,13 @@ %{__autoheader} %{__automake} %configure \ + %{?with_audit:--enable-audit-plugin} \ %{?with_openssl:--disable-gnutls} \ + --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ + --enable-nls \ --enable-pam_rpasswd \ --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \ --enable-slp \ - --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ - --enable-nls \ --disable-rpath %{__make} @@ -243,6 +252,12 @@ %exclude %{_mandir}/man8/rpasswdd.8* %exclude %{_mandir}/man8/pam_rpasswd.8* +%if %{with audit} +%files log-audit +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/pwdutils/liblog_audit.so* +%endif + %files -n rpasswdd %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/rpasswdd @@ -261,6 +276,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/28 15:47:56 qboosh +- updated to 3.0.4, removed obsolete pl.po-update,slp patches +- build audit log plugin + Revision 1.61 2005/07/28 09:00:49 qboosh - pwdutils 3.0.x prefers gnutls over openssl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pwdutils.spec?r1=1.61&r2=1.62&f=u From qboosh at pld-linux.org Sun Aug 28 17:48:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: pwdutils-3.0.4.tar.bz2 Message-ID: <26383.1125244088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/pwdutils-3.0.4.tar.bz2 10603d67f4959772544a76691310dfc8 pwdutils-3.0.4.tar.bz2 Size: 458961 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sun Aug 28 18:02:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - use shared license-in... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:02:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script - make package build work on end-user - rel 2 ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.5 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 Sun Aug 28 17:42:32 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 18:02:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} License: Nondistributable but free (See Bitstream-Cyberfonts-licence.txt) Group: Fonts %if %{with license_agreement} @@ -23,11 +23,15 @@ # NoSource1-md5: 63a6f607ac5a78d34b67247b893faf5b Source2: ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/CyberCJK.ZIP # NoSource2-md5: 63a6f607ac5a78d34b67247b893faf5b -Source3: %{base_name}-licence.txt BuildRequires: unzip +# we need the -installer package as otherwise can't make end-user +# package to work. see also comments in %%prep section. +BuildRequires: %{base_name}-installer Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh +Source1: %{base_name}-licence.txt Requires: unzip Requires: rpm-build-tools Requires: wget @@ -39,25 +43,23 @@ %description Bitstream Cyberfonts True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Cyberfonts firmy Bitstream. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -66,76 +68,31 @@ /usr/bin/unzip -L %{SOURCE0} /usr/bin/unzip -L %{SOURCE1} /usr/bin/unzip -L %{SOURCE2} -install %{SOURCE3} ./ +# ugly hack, to work with -installer package, when it may not fetch this file +# from CVS with builder (-nc, -ncs) +install %{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt . %endif %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default. If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %else install -d $RPM_BUILD_ROOT%{ttffontsdir} install *.ttf $RPM_BUILD_ROOT%{ttffontsdir} %endif -install -d $RPM_BUILD_ROOT%{_datadir}/%{base_name} -install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %clean rm -rf $RPM_BUILD_ROOT @@ -162,11 +119,12 @@ %files %defattr(644,root,root,755) %if %{with license_agreement} +%doc Bitstream-Cyberfonts-licence.txt %{ttffontsdir}/* %else %attr(755,root,root) %{_bindir}/%{base_name}.install -%endif %{_datadir}/%{base_name} +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -174,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 16:02:51 glen +- use shared license-installer.sh script +- make package build work on end-user +- rel 2 + Revision 1.4 2005/08/28 15:42:32 glen - removed superfluous Obsoletes itself ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 18:03:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: gsasl-pl.po-update.patch - updated for 0.2.7 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:03:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.2.7 ---- Files affected: SOURCES: gsasl-pl.po-update.patch (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SOURCES/gsasl-pl.po-update.patch diff -u SOURCES/gsasl-pl.po-update.patch:1.6 SOURCES/gsasl-pl.po-update.patch:1.7 --- SOURCES/gsasl-pl.po-update.patch:1.6 Sat Aug 13 19:36:46 2005 +++ SOURCES/gsasl-pl.po-update.patch Sun Aug 28 18:03:35 2005 @@ -1,5 +1,5 @@ ---- gsasl-0.2.6/po/pl.po.orig 2005-08-10 13:04:43.000000000 +0200 -+++ gsasl-0.2.6/po/pl.po 2005-08-13 19:27:33.476737256 +0200 +--- gsasl-0.2.7/po/pl.po.orig 2005-08-25 14:54:55.000000000 +0200 ++++ gsasl-0.2.7/po/pl.po 2005-08-28 17:56:55.773446472 +0200 @@ -1,21 +1,21 @@ # Polish translation for gsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -11,11 +11,11 @@ msgid "" msgstr "" -"Project-Id-Version: gsasl 0.1.4\n" -+"Project-Id-Version: gsasl 0.2.5\n" ++"Project-Id-Version: gsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:49+0200\n" -"PO-Revision-Date: 2004-08-25 22:41+0200\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgid "Choose SASL mechanism:\n" msgstr "Wyb?r mechanizm?w SASL:\n" ---- gsasl-0.2.6/lib/po/pl.po.orig 2005-08-10 13:04:50.000000000 +0200 -+++ gsasl-0.2.6/lib/po/pl.po 2005-08-13 19:28:08.191459816 +0200 +--- gsasl-0.2.7/lib/po/pl.po.orig 2005-08-25 14:55:02.000000000 +0200 ++++ gsasl-0.2.7/lib/po/pl.po 2005-08-28 17:57:31.753976600 +0200 @@ -1,14 +1,14 @@ # Polish translation for libgsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -40,11 +40,11 @@ msgid "" msgstr "" -"Project-Id-Version: libgsasl 0.2.1\n" -+"Project-Id-Version: libgsasl 0.2.3\n" ++"Project-Id-Version: libgsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:50+0200\n" -"PO-Revision-Date: 2004-11-21 23:31+0100\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gsasl-pl.po-update.patch?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: gsasl.spec - updated to 0.2.7, updated pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:04:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.2.7, updated pl.po-update patch ---- Files affected: SPECS: gsasl.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/gsasl.spec diff -u SPECS/gsasl.spec:1.22 SPECS/gsasl.spec:1.23 --- SPECS/gsasl.spec:1.22 Sat Aug 13 19:37:25 2005 +++ SPECS/gsasl.spec Sun Aug 28 18:04:08 2005 @@ -8,12 +8,12 @@ Summary: GNU SASL - implementation of the Simple Authentication and Security Layer Summary(pl): GNU SASL - implementacja Simple Authentication and Security Layer Name: gsasl -Version: 0.2.6 +Version: 0.2.7 Release: 1 License: GPL Group: Libraries Source0: http://josefsson.org/gsasl/releases/%{name}-%{version}.tar.gz -# Source0-md5: 5e527147cea5cc776240f6d7a6820955 +# Source0-md5: ed52f2e5ac997503d0953be978e7a2f1 Patch0: %{name}-info.patch Patch1: %{name}-pl.po-update.patch URL: http://www.gnu.org/software/gsasl/ @@ -176,6 +176,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 16:04:08 qboosh +- updated to 0.2.7, updated pl.po-update patch + Revision 1.22 2005/08/13 17:37:25 qboosh - updated to 0.2.6, updated pl.po-update patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsasl.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: gsasl-0.2.7.tar.gz Message-ID: <19453.1125245087@distfiles.pld-linux.org> Files fetched: 1 STORED: http://josefsson.org/gsasl/releases/gsasl-0.2.7.tar.gz ed52f2e5ac997503d0953be978e7a2f1 gsasl-0.2.7.tar.gz Size: 2643936 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: daemon-1.0.1.tar.gz Message-ID: <21194.1125245131@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz Size: 301023 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: jakarta-commons-daemon.spec - updated to 1.0.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:05:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.1 ---- Files affected: SPECS: jakarta-commons-daemon.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-daemon.spec diff -u SPECS/jakarta-commons-daemon.spec:1.7 SPECS/jakarta-commons-daemon.spec:1.8 --- SPECS/jakarta-commons-daemon.spec:1.7 Sun May 8 19:10:19 2005 +++ SPECS/jakarta-commons-daemon.spec Sun Aug 28 18:05:27 2005 @@ -2,12 +2,12 @@ Summary: Jakarta Commons Daemon - controlling of Java daemons Summary(pl): Jakarta Commons Daemon - kontrolowanie demon?w w Javie Name: jakarta-commons-daemon -Version: 1.0 +Version: 1.0.1 Release: 1 License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz -# Source0-md5: 3054786aaba9631ec04fef0862023bc8 +# Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0 URL: http://jakarta.apache.org/commons/daemon/ BuildRequires: automake BuildRequires: jakarta-ant >= 1.4.1 @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 16:05:27 qboosh +- updated to 1.0.1 + Revision 1.7 2005/05/08 17:10:19 qboosh - updated to 1.0, removed obsolete nobat patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-commons-daemon.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 18:15:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: linux-libc-headers.spec - my build system doesn't generate ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:15:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, in other words, add -r option to xargs ---- Files affected: SPECS: linux-libc-headers.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.101 SPECS/linux-libc-headers.spec:1.102 --- SPECS/linux-libc-headers.spec:1.101 Sun Aug 28 16:39:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:14:56 2005 @@ -151,7 +151,8 @@ cp -a linux $RPM_BUILD_ROOT%{_includedir} cp -a sound $RPM_BUILD_ROOT%{_includedir} -find $RPM_BUILD_ROOT%{_includedir} -type f -name '*.orig' | xargs rm +find $RPM_BUILD_ROOT%{_includedir} -type f \ + '(' -name '*.orig' -o -name '*~' ')' | xargs -r rm %clean rm -rf $RPM_BUILD_ROOT @@ -177,6 +178,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/28 16:14:56 glen +- my build system doesn't generate .orig files on patching (but ~ instead) + and others could be off completely due $VERSION_CONTROL variable, + in other words, add -r option to xargs + Revision 1.101 2005/08/28 14:39:56 qboosh - added audit patch, release 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.101&r2=1.102&f=u From glen at pld-linux.org Sun Aug 28 18:21:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: linux-libc-headers.spec - there's no such tool to regenerat... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:21:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - there's no such tool to regenerate asm stub headers ---- Files affected: SPECS: linux-libc-headers.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.102 SPECS/linux-libc-headers.spec:1.103 --- SPECS/linux-libc-headers.spec:1.102 Sun Aug 28 18:14:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:21:31 2005 @@ -101,7 +101,7 @@ # common header cat > asm/$h << EOF /* All asm/ files are generated and point to the corresponding - * file in asm-${a1} or asm-${a2}. To regenerate, run "generate-asm" + * file in asm-${a1} or asm-${a2}. */ #ifndef __ASM_STUB_${name}__ @@ -178,6 +178,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/28 16:21:31 glen +- there's no such tool to regenerate asm stub headers + Revision 1.102 2005/08/28 16:14:56 glen - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.102&r2=1.103&f=u From qboosh at pld-linux.org Sun Aug 28 19:17:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: libdrm.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 17:17:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: libdrm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/libdrm.spec diff -u /dev/null SPECS/libdrm.spec:1.1 --- /dev/null Sun Aug 28 19:17:22 2005 +++ SPECS/libdrm.spec Sun Aug 28 19:17:14 2005 @@ -0,0 +1,89 @@ +# $Revision$, $Date$ +Summary: Userspace interface to kernel DRM services +Summary(pl): Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra +Name: libdrm +Version: 1.0.3 +Release: 1 +License: MIT +Group: Libraries +Source0: http://people.freedesktop.org/~ajax/libdrm/%{name}-%{version}.tar.gz +# Source0-md5: 2fd32375b17fa80e3a962276f98d6440 +URL: http://dri.freedesktop.org/ +# currently uses +BuildRequires: XFree86-devel +#BuildRequires: xorg-lib-libX11-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Userspace interface to kernel DRM services. + +%description -l pl +Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra. + +%package devel +Summary: Header files for libdrm library +Summary(pl): Pliki nag??wkowe biblioteki libdrm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for libdrm library. + +%description devel -l pl +Pliki nag??wkowe biblioteki libdrm. + +%package static +Summary: Static libdrm library +Summary(pl): Statyczna biblioteka libdrm +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static libdrm library. + +%description static -l pl +Statyczna biblioteka libdrm. + +%prep +%setup -q + +%build +%configure +%{__make} + +%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(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so +%{_libdir}/libdrm.la +%{_includedir}/xf86drm.h +%{_includedir}/drm +%{_pkgconfigdir}/libdrm.pc + +%files static +%defattr(644,root,root,755) +%{_libdir}/libdrm.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 17:17:14 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 19:17:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: libdrm-1.0.3.tar.gz Message-ID: <25070.1125249452@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freedesktop.org/~ajax/libdrm/libdrm-1.0.3.tar.gz 2fd32375b17fa80e3a962276f98d6440 libdrm-1.0.3.tar.gz Size: 417307 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 19:18:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: cairo.spec - rel 2; BC libpixman-devel doesn't belong here. In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:18:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; BC libpixman-devel doesn't belong here. ---- Files affected: SPECS: cairo.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.35 SPECS/cairo.spec:1.36 --- SPECS/cairo.spec:1.35 Fri Aug 26 20:46:28 2005 +++ SPECS/cairo.spec Sun Aug 28 19:18:22 2005 @@ -7,13 +7,12 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 1.0.0 -Release: 1 +Release: 2 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ -BuildConflicts: libpixman-devel BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel @@ -155,6 +154,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 17:18:22 arekm +- rel 2; BC libpixman-devel doesn't belong here. + Revision 1.35 2005/08/26 18:46:28 qboosh - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.35&r2=1.36&f=u From arekm at pld-linux.org Sun Aug 28 19:29:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: libsvg-cairo.spec -req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:29:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: -req final cairo ---- Files affected: SPECS: libsvg-cairo.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/libsvg-cairo.spec diff -u SPECS/libsvg-cairo.spec:1.11 SPECS/libsvg-cairo.spec:1.12 --- SPECS/libsvg-cairo.spec:1.11 Sun Jun 19 11:00:49 2005 +++ SPECS/libsvg-cairo.spec Sun Aug 28 19:28:55 2005 @@ -11,7 +11,7 @@ URL: http://www.xsvg.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel >= 1.0.0 BuildRequires: libsvg-devel >= 0.1.2 BuildRequires: libtool BuildRequires: pkgconfig @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 17:28:55 arekm +-req final cairo + Revision 1.11 2005/06/19 09:00:49 qboosh - don't include COPYING with a copy of LGPL text in doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsvg-cairo.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 19:33:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: koffice.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: koffice.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/koffice.spec diff -u SPECS/koffice.spec:1.121 SPECS/koffice.spec:1.122 --- SPECS/koffice.spec:1.121 Mon Aug 8 12:42:57 2005 +++ SPECS/koffice.spec Sun Aug 28 19:33:20 2005 @@ -13,16 +13,13 @@ Summary(uk): ????? ??????? ??????? ??? KDE Summary(zh_CN): KDE ?????????????????? Name: koffice -# Version: %{_ver}.%{_snap} Version: %{_ver} -Release: 0.1 +Release: 1 Epoch: 5 License: GPL/LGPL Group: X11/Applications -# ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2.95/src Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2 # Source0-md5: 91a7b68757addc5934c5a8209a4926d5 -#Source0: http://ep09.pld-linux.org/~adgor/kde/%{name}-%{_snap}.tar.bz2 #Patch100: %{name}-branch.diff URL: http://www.koffice.org/ BuildRequires: ImageMagick-c++-devel @@ -835,6 +832,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 17:33:20 arekm +- rel 1 + Revision 1.121 2005/08/08 10:42:57 blekot - more %%files (needs checkout) - log shorten ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.121&r2=1.122&f=u From arekm at pld-linux.org Sun Aug 28 19:41:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: poppler.spec - req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:41:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - req final cairo ---- Files affected: SPECS: poppler.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.17 SPECS/poppler.spec:1.18 --- SPECS/poppler.spec:1.17 Sat Aug 27 00:52:39 2005 +++ SPECS/poppler.spec Sun Aug 28 19:41:06 2005 @@ -4,7 +4,7 @@ %bcond_without cairo # disable Cairo backend %bcond_without qt # disable qt wrapper # -%define cairo_ver 0.5.0 +%define cairo_ver 1.0.0 # Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 17:41:06 arekm +- req final cairo + Revision 1.17 2005/08/26 22:52:39 aflinta - 0.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.17&r2=1.18&f=u From arekm at pld-linux.org Sun Aug 28 20:01:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: gnustep-back.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 18:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: gnustep-back.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gnustep-back.spec diff -u SPECS/gnustep-back.spec:1.26 SPECS/gnustep-back.spec:1.27 --- SPECS/gnustep-back.spec:1.26 Thu Aug 11 11:46:18 2005 +++ SPECS/gnustep-back.spec Sun Aug 28 20:01:34 2005 @@ -1,15 +1,17 @@ # $Revision$, $Date$ -# TODO: symlink Helvetica from ghostscript-fonts-std? +# TODO: +# - symlink Helvetica from ghostscript-fonts-std? +# - reenable cairo as soon as versions >= 0.5 will be supported # # Conditional build: %bcond_without art # don't build art backend -%bcond_without cairo # don't build cairo backend +%bcond_with cairo # don't build cairo backend # Summary: The GNUstep backend bundle Summary(pl): Pakiet backendowy GNUstep Name: gnustep-back Version: 0.10.0 -Release: 1 +Release: 2 License: LGPL/GPL Vendor: The GNUstep Project Group: X11/Libraries @@ -216,6 +218,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 18:01:34 arekm +- disable cairo + Revision 1.26 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-back.spec?r1=1.26&r2=1.27&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:05 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: freenx.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: mmazur Date: Sun Aug 28 18:07:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: freenx.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/freenx.spec diff -u SPECS/freenx.spec:1.11 SPECS/freenx.spec:1.12 --- SPECS/freenx.spec:1.11 Fri Jun 17 13:55:20 2005 +++ SPECS/freenx.spec Sun Aug 28 20:07:00 2005 @@ -2,12 +2,12 @@ Summary: A free (GPL) implementation of the NX server Summary(pl): Darmowa (GPL) imlementacja serwera NX Name: freenx -Version: 0.4.0 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz -# Source0-md5: a57046e79fb980b4720ec6ae67ed1f19 +# Source0-md5: 4b74709736ab1784403a61ba06cbde50 URL: http://freenx.berlios.de/ BuildRequires: sed >= 4.0 Requires: expect @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:07:00 mmazur +- updated to 0.4.2 + Revision 1.11 2005/06/17 11:55:20 charles - and Source0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/freenx.spec?r1=1.11&r2=1.12&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:06 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: freenx-0.4.2.tar.gz Message-ID: <7674.1125252426@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/freenx/freenx-0.4.2.tar.gz 4b74709736ab1784403a61ba06cbde50 freenx-0.4.2.tar.gz Size: 44169 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sun Aug 28 20:33:36 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: ntfsprogs.spec - fix pl desc In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:33:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix pl desc ---- Files affected: SPECS: ntfsprogs.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.35 SPECS/ntfsprogs.spec:1.36 --- SPECS/ntfsprogs.spec:1.35 Tue Aug 9 13:15:56 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:33:28 2005 @@ -49,7 +49,7 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu pe?n? obs?ug? NTFS pod Linuksem. +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 18:33:28 darekr +- fix pl desc + Revision 1.35 2005/08/09 11:15:56 qboosh - more pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.35&r2=1.36&f=u From darekr at pld-linux.org Sun Aug 28 20:38:30 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: most.spec - BR: perl-base - noreplace for %config, added %v... In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:38:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: perl-base - noreplace for %config, added %verify() ---- Files affected: SPECS: most.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/most.spec diff -u SPECS/most.spec:1.36 SPECS/most.spec:1.37 --- SPECS/most.spec:1.36 Mon Aug 1 14:16:12 2005 +++ SPECS/most.spec Sun Aug 28 20:38:24 2005 @@ -4,13 +4,14 @@ Name: most Version: 4.10.2 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Text Source0: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 # Source0-md5: 99a24b6989ac81f436791b957b2e171a URL: http://www.jedsoft.org/most/ BuildRequires: autoconf >= 2.50 BuildRequires: automake +BuildRequires: perl-base BuildRequires: slang-devel >= 1.3.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,7 +58,7 @@ %files %defattr(644,root,root,755) %doc README *.rc *.txt -%config %{_sysconfdir}/most.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/most.conf %attr(755,root,root) %{_bindir}/most %{_mandir}/man1/*.1* @@ -67,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:38:24 darekr +- BR: perl-base +- noreplace for %config, added %verify() + Revision 1.36 2005/08/01 12:16:12 blekot - up to 4.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/most.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:40:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: ntfsprogs.spec - formatting In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:40:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - formatting ---- Files affected: SPECS: ntfsprogs.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.36 SPECS/ntfsprogs.spec:1.37 --- SPECS/ntfsprogs.spec:1.36 Sun Aug 28 20:33:28 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:40:52 2005 @@ -49,8 +49,8 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. -Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod +Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: - ntfsfix - pr?buje naprawia? partycj? NTFS uszkodzone przez linuksowy @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:40:52 qboosh +- formatting + Revision 1.36 2005/08/28 18:33:28 darekr - fix pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:54:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: dirac-0.5.3.tar.gz Message-ID: <18351.1125255279@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dirac/dirac-0.5.3.tar.gz 6882ac9fe9b39edc2a2e666d36d674c3 dirac-0.5.3.tar.gz Size: 703435 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 20:54:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: dirac.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:54:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: dirac.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/dirac.spec diff -u SPECS/dirac.spec:1.11 SPECS/dirac.spec:1.12 --- SPECS/dirac.spec:1.11 Sat Aug 13 20:04:34 2005 +++ SPECS/dirac.spec Sun Aug 28 20:54:28 2005 @@ -2,12 +2,12 @@ Summary: General purpose video codec Summary(pl): Kodek obrazu og?lnego przeznaczenia Name: dirac -Version: 0.5.2 -Release: 2 -License: MPL +Version: 0.5.3 +Release: 1 +License: MPL v1.1 or GPL v2 or LGPL v2.1 Group: Libraries Source0: http://dl.sourceforge.net/dirac/%{name}-%{version}.tar.gz -# Source0-md5: e83e3dc3025c04b3163fbcd1d5e6a328 +# Source0-md5: 6882ac9fe9b39edc2a2e666d36d674c3 Patch0: %{name}-am.patch URL: http://www.bbc.co.uk/rd/projects/dirac/ BuildRequires: autoconf >= 2.50 @@ -89,13 +89,13 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README TODO doc/faq.htm +%doc AUTHORS ChangeLog NEWS README TODO doc/faq.html %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* %files devel %defattr(644,root,root,755) -%doc doc/api/html doc/programmers/programmers_guide.pdf doc/dirac_doc_howto.txt +%doc doc/documentation/code/api/html doc/dirac_bitstream.txt %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_includedir}/%{name} @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:54:28 qboosh +- updated to 0.5.3 + Revision 1.11 2005/08/13 18:04:34 qboosh - don't install unit testsuite program (avoid cppunit dependency) - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dirac.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 21:22:14 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: gtk+2-bug312710.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:22:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: gtk+2-bug312710.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 21:23:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: gtk+2.spec - updated to 2.6.10 - removed obsolete bug312710... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:23:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.10 - removed obsolete bug312710 patch (alternative fix included) ---- Files affected: SPECS: gtk+2.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.181 SPECS/gtk+2.spec:1.182 --- SPECS/gtk+2.spec:1.181 Mon Aug 8 23:54:24 2005 +++ SPECS/gtk+2.spec Sun Aug 28 21:23:03 2005 @@ -15,17 +15,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.6.9 -Release: 2 +Version: 2.6.10 +Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-%{version}.tar.bz2 -# Source0-md5: 26c3a0bea55353eed63348fb7be4153a +# Source0-md5: 520090ef291e35ba93397060e20f5025 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-menushadow.patch Patch2: %{name}-xlibs.patch -Patch3: %{name}-bug312710.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -145,7 +144,6 @@ %patch0 -p1 %{?with_menushadow:%patch1 -p1} %{?with_xlibs:%patch2 -p1} -%patch3 -p1 %build %{__gtkdocize} @@ -274,6 +272,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/28 19:23:03 qboosh +- updated to 2.6.10 +- removed obsolete bug312710 patch (alternative fix included) + Revision 1.181 2005/08/08 21:54:24 freetz - http://bugzilla.gnome.org/show_bug.cgi?id=312710, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.181&r2=1.182&f=u From qboosh at pld-linux.org Sun Aug 28 21:23:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: gtk+-2.6.10.tar.bz2 Message-ID: <27413.1125257003@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.10.tar.bz2 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 Size: 11521380 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 21:25:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: gstreamer-plugins.spec - disable cairo; fix cairo BR; rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:25:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo; fix cairo BR; rel 2 ---- Files affected: SPECS: gstreamer-plugins.spec (1.159 -> 1.160) ---- Diffs: ================================================================ Index: SPECS/gstreamer-plugins.spec diff -u SPECS/gstreamer-plugins.spec:1.159 SPECS/gstreamer-plugins.spec:1.160 --- SPECS/gstreamer-plugins.spec:1.159 Mon Aug 8 16:42:26 2005 +++ SPECS/gstreamer-plugins.spec Sun Aug 28 21:25:02 2005 @@ -14,7 +14,7 @@ %bcond_without arts # don't build aRts audio output plugins %bcond_without audiofile # don't build audiofile plugin %bcond_without caca # don't build caca videosink plugin -%bcond_without cairo # don't build cairo plugin +%bcond_with cairo # build cairo plugin %bcond_without cdaudio # don't build cdaudio plugin %bcond_without cdio # don't build cdio plugin %bcond_without dirac # don't build dirac plugin @@ -55,7 +55,7 @@ Summary(pl): Wtyczki do ?rodowiska obr?bki strumieni GStreamer Name: gstreamer-plugins Version: 0.8.10 -Release: 1 +Release: 2 License: LGPL Group: Libraries Source0: http://gstreamer.freedesktop.org/src/gst-plugins/%{gstname}-%{version}.tar.bz2 @@ -86,7 +86,10 @@ %{?with_arts:BuildRequires: arts-devel >= 0.9.5} %{?with_arts:BuildRequires: artsc-devel >= 0.9.5} %{?with_audiofile:BuildRequires: audiofile-devel >= 1:0.2.3-5.20021108} -%{?with_cairo:BuildRequires: cairo-devel >= 0.5.0} +%if %{with cairo} +BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel < 0.6.0 +%endif BuildRequires: cdparanoia-III-devel %{?with_dirac:BuildRequires: dirac-devel >= 0.5.0} %{?with_divx4linux:BuildRequires: divx4linux-devel >= 1:5.05.20030428} @@ -2208,6 +2211,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.160 2005/08/28 19:25:02 arekm +- disable cairo; fix cairo BR; rel 2 + Revision 1.159 2005/08/08 14:42:26 glen - wavpack bconded (not yet available on builders) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gstreamer-plugins.spec?r1=1.159&r2=1.160&f=u From arekm at pld-linux.org Sun Aug 28 21:26:01 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: mozilla.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:26:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: mozilla.spec (1.372 -> 1.373) ---- Diffs: ================================================================ Index: SPECS/mozilla.spec diff -u SPECS/mozilla.spec:1.372 SPECS/mozilla.spec:1.373 --- SPECS/mozilla.spec:1.372 Sun Aug 14 08:53:13 2005 +++ SPECS/mozilla.spec Sun Aug 28 21:25:56 2005 @@ -10,7 +10,7 @@ %bcond_without gnomevfs # disable GnomeVFS support %bcond_without heimdal # disable heimdal support -%bcond_without svg # disable svg support +%bcond_with svg # enable svg support # Summary: Mozilla - web browser Summary(es): Navegador de Internet Mozilla @@ -19,7 +19,7 @@ Summary(ru): Web browser Name: mozilla Version: 1.7.11 -Release: 1 +Release: 2 Epoch: 5 License: Mozilla Public License Group: X11/Applications/Networking @@ -844,6 +844,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.373 2005/08/28 19:25:56 arekm +- disable cairo + Revision 1.372 2005/08/14 06:53:13 qboosh - require cairo only if built with svg support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla.spec?r1=1.372&r2=1.373&f=u From arekm at pld-linux.org Sun Aug 28 21:41:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: gnome-doc-utils.spec - merged from DEVEL In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:41:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL ---- Files affected: SPECS: gnome-doc-utils.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-doc-utils.spec diff -u SPECS/gnome-doc-utils.spec:1.6 SPECS/gnome-doc-utils.spec:1.7 --- SPECS/gnome-doc-utils.spec:1.6 Tue Jul 12 14:01:17 2005 +++ SPECS/gnome-doc-utils.spec Sun Aug 28 21:41:03 2005 @@ -2,12 +2,13 @@ Summary: Documentation utilities for GNOME Summary(pl): Narz?dzia do budowania dokumentacji dla GNOME Name: gnome-doc-utils -Version: 0.2.1 +Version: 0.3.2 Release: 1 License: GPL v2+/LGPL v2+ Group: Development/Tools -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 02c006ad31b2b878263025c12c4ff35a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.3/%{name}-%{version}.tar.bz2 +# Source0-md5: d29a3e10ff8cba17dbb6d3aff2f30bb8 +Patch0: %{name}-no_scrollkeeper_update.patch URL: http://www.gnome.org/ BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt-devel >= 1.1.14 @@ -25,9 +26,11 @@ %prep %setup -q +%patch0 -p1 %build -%configure +%configure \ + --disable-scrollkeeper %{__make} %install @@ -51,13 +54,13 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_pkgconfigdir}/*.pc %{_aclocaldir}/*.m4 %{_datadir}/%{name} -%{_omf_dest_dir}/* -%{_datadir}/xml/gnome %{_datadir}/xml2po +%{_datadir}/xml/gnome %{_mandir}/man1/xml2po.1* +%{_omf_dest_dir}/* +%{_pkgconfigdir}/*.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -65,6 +68,18 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 19:41:03 arekm +- merged from DEVEL + +Revision 1.6.2.3 2005/07/27 07:19:24 paladine +- updated to 0.3.2 + +Revision 1.6.2.2 2005/07/25 19:06:21 freetz +- killed scrollkeeper-update call (patch), rel.2 + +Revision 1.6.2.1 2005/07/12 12:05:23 freetz +- 0.3.1 + Revision 1.6 2005/07/12 12:01:17 freetz - 0.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-doc-utils.spec?r1=1.6&r2=1.7&f=u From arekm at pld-linux.org Sun Aug 28 21:53:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: evince.spec - disable dbus for now; reenable when new dbus ... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:53:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable dbus for now; reenable when new dbus goes into ac; rel 2 ---- Files affected: SPECS: evince.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.30 SPECS/evince.spec:1.31 --- SPECS/evince.spec:1.30 Sat Aug 27 16:24:16 2005 +++ SPECS/evince.spec Sun Aug 28 21:53:38 2005 @@ -2,11 +2,12 @@ # # TODO: fix t1lib build time misdetection (very low prio) # +%bcond_with dbus Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 @@ -17,7 +18,7 @@ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -BuildRequires: dbus-glib-devel >= 0.36 +%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.36} BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -80,7 +81,7 @@ %configure \ --disable-static \ --disable-schemas-install \ - --enable-dbus \ + %{?with_dbus:--enable-dbus} \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/28 19:53:38 arekm +- disable dbus for now; reenable when new dbus goes into ac; rel 2 + Revision 1.30 2005/08/27 14:24:16 paladine - removed disable_dbus patch - works for me, rel. 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.30&r2=1.31&f=u From troll at pld-linux.org Sun Aug 28 21:55:42 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: xchat-xchatlibdir.patch (NEW) - patch correcting XCHATLIB... In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:55:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch correcting XCHATLIBDIR variable on architectures using /usr/lib64 directory for plugins. this fixes autoloading them at startup. ---- Files affected: SOURCES: xchat-xchatlibdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchat-xchatlibdir.patch diff -u /dev/null SOURCES/xchat-xchatlibdir.patch:1.1 --- /dev/null Sun Aug 28 21:55:42 2005 +++ SOURCES/xchat-xchatlibdir.patch Sun Aug 28 21:55:37 2005 @@ -0,0 +1,18 @@ +--- xchat-2.4.4/configure.in~ 2005-08-28 21:48:43.131905736 +0200 ++++ xchat-2.4.4/configure.in 2005-08-28 21:49:12.279474632 +0200 +@@ -635,13 +635,13 @@ + PLUGIN_INCLUDES='-I$(top_srcdir)/plugins' + AC_SUBST(PLUGIN_INCLUDES) + ++AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${libdir}/xchat") ++ + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PREFIX, "${ac_default_prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${ac_default_prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${ac_default_prefix}/share/xchat") + else + AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${prefix}/share/xchat") + fi + ================================================================ From darekr at pld-linux.org Sun Aug 28 21:56:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: multi-aterm.spec - fix Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 19:56:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix Source0 ---- Files affected: SPECS: multi-aterm.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/multi-aterm.spec diff -u SPECS/multi-aterm.spec:1.9 SPECS/multi-aterm.spec:1.10 --- SPECS/multi-aterm.spec:1.9 Tue Sep 7 10:06:21 2004 +++ SPECS/multi-aterm.spec Sun Aug 28 21:56:14 2005 @@ -7,7 +7,7 @@ Release: 2 License: GPL Group: X11/Applications -Source0: http://www.nongnu.org/materm//%{name}-%{version}.tar.gz +Source0: http://www.nongnu.org/materm/%{name}-%{version}.tar.gz # Source0-md5: 52f9c25a6fad7f638f7064ff6cc74c62 Source1: %{name}.desktop Source2: %{name}.png @@ -95,6 +95,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 19:56:14 darekr +- fix Source0 + Revision 1.9 2004/09/07 08:06:21 blues - enabled mousewheel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/multi-aterm.spec?r1=1.9&r2=1.10&f=u From troll at pld-linux.org Sun Aug 28 21:56:59 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: xchat.spec - added xchatlibdir patch, - rel 2 In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:56:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added xchatlibdir patch, - rel 2 ---- Files affected: SPECS: xchat.spec (1.164 -> 1.165) ---- Diffs: ================================================================ Index: SPECS/xchat.spec diff -u SPECS/xchat.spec:1.164 SPECS/xchat.spec:1.165 --- SPECS/xchat.spec:1.164 Mon Jun 20 21:02:52 2005 +++ SPECS/xchat.spec Sun Aug 28 21:56:53 2005 @@ -22,7 +22,7 @@ Summary(zh_CN): GTK+ IRC (????) ?????? Name: xchat Version: 2.4.4 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2 Group: X11/Applications/Networking @@ -33,6 +33,7 @@ Patch1: %{name}-locale_names.patch Patch2: %{name}-long-delimiter.patch Patch3: %{name}-domains.patch +Patch4: %{name}-xchatlibdir.patch Icon: xchat.xpm URL: http://www.xchat.org/ BuildRequires: autoconf @@ -134,6 +135,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} po/pl.po @@ -184,6 +186,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.165 2005/08/28 19:56:53 troll +- added xchatlibdir patch, +- rel 2 + Revision 1.164 2005/06/20 19:02:52 wolf - 2.4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchat.spec?r1=1.164&r2=1.165&f=u From arekm at pld-linux.org Sun Aug 28 22:04:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: gst-python-0.8.2.tar.gz Message-ID: <3010.1125259485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.8.2.tar.gz 35a735711f43551722b0dbcfc7895f3e gst-python-0.8.2.tar.gz Size: 418325 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:04:40 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: python-gstreamer.spec - up to 0.8.2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:04:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.8.2 ---- Files affected: SPECS: python-gstreamer.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.7 SPECS/python-gstreamer.spec:1.8 --- SPECS/python-gstreamer.spec:1.7 Sun Jan 9 18:55:40 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:04:35 2005 @@ -3,12 +3,12 @@ Summary: GStreamer Python bindings Summary(pl): Wi?zania j?zyka Python do GStreamera Name: python-gstreamer -Version: 0.8.1 -Release: 2 +Version: 0.8.2 +Release: 1 License: GPL Group: Libraries/Python Source0: http://gstreamer.freedesktop.org/src/%{pname}/%{pname}-%{version}.tar.gz -# Source0-md5: 4666978d610b48f7f7481e41433a856c +# Source0-md5: 35a735711f43551722b0dbcfc7895f3e Patch0: %{pname}-py2pyc.patch URL: http://gstreamer.freedesktop.org/modules/gst-python.html BuildRequires: gstreamer-devel >= 0.8.0 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 20:04:35 arekm +- up to 0.8.2 + Revision 1.7 2005/01/09 17:55:40 saq - missing pyreqeq, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 22:06:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: license-installer.sh - add @COPYSOURCES@ for adobe install In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:06:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add @COPYSOURCES@ for adobe install ---- Files affected: SOURCES: license-installer.sh (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.4 SOURCES/license-installer.sh:1.5 --- SOURCES/license-installer.sh:1.4 Sun Aug 28 17:28:44 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:06:22 2005 @@ -12,6 +12,14 @@ BACKUP=1 mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i $SOURCEDIR/$i.prev + BACKUP=1 + fi + done + fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then ( cd $SRPMDIR if echo "$3" | grep '://' >/dev/null; then @@ -20,10 +28,25 @@ cp -f "$3" . fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) - ) + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + done + fi + ) cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i $TMPDIR/$i $SOURCEDIR/$i || exit 1 + done + fi else cp -i "$3" $SPECDIR || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1 + done + fi fi ( cd $SPECDIR /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec @@ -35,6 +58,14 @@ if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i.prev $SOURCEDIR/$i + BACKUP=1 + fi + done fi fi else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Sun Aug 28 22:07:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: acroread.spec - use shared license-installer.sh from SOURCE... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:07:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh from SOURCES - rel 2 ---- Files affected: SPECS: acroread.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/acroread.spec diff -u SPECS/acroread.spec:1.45 SPECS/acroread.spec:1.46 --- SPECS/acroread.spec:1.45 Fri Aug 19 13:31:03 2005 +++ SPECS/acroread.spec Sun Aug 28 22:07:12 2005 @@ -14,7 +14,7 @@ Name: %{base_name}-installer %endif Version: 7.0.1 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} Epoch: 1 License: distribution restricted (http://www.adobe.com/products/acrobat/distribute.html) # in short: @@ -23,6 +23,8 @@ Group: X11/Applications/Graphics %if %{with license_agreement} Source0: http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz +%else +Source0: license-installer.sh %endif Source1: %{base_name}.desktop Source2: %{base_name}.png @@ -81,89 +83,18 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i ]; then - mv -f \$SOURCEDIR/\$i \$SOURCEDIR/\$i.prev - BACKUP=1 - fi - done - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) - for i in %{base_name}.desktop %{base_name}.png; do - rpm2cpio \$i | ( cd \$TMPDIR; cpio -i \$i ) - done ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i \$TMPDIR/\$i \$SOURCEDIR/\$i || exit 1 - done - else - cp -i "\$3" \$SPECDIR || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i %{_datadir}/%{base_name}/\$i \$SOURCEDIR/\$i || exit 1 - done - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME1=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-plugin-%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - echo "Installing \$RPMNAME1" - RPMNAMES=\$RPMDIR/\$RPMNAME1 - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" - else - echo "Not installing \$RPMNAME2" - fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i.prev ]; then - mv -f \$SOURCEDIR/\$i.prev \$SOURCEDIR/\$i - fi - done - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@DATADIR@,%{_datadir}/%{base_name},g + s/@COPYSOURCES@/%{base_name}{.desktop,.png}/g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -193,20 +124,14 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %files %defattr(644,root,root,755) -%if ! %{with license_agreement} +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else @@ -247,6 +172,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/28 20:07:12 glen +- use shared license-installer.sh from SOURCES +- rel 2 + Revision 1.45 2005/08/19 11:31:03 blekot - up to 701 (7.0.1) (security bug fixed) @@ -312,7 +241,7 @@ - updated to 509 Revision 1.30 2003/09/26 14:03:20 adgor -- Desktop file moved to %%{_desktopdir} +- Desktop file moved to %{_desktopdir} Revision 1.29 2003/09/12 22:35:39 grzegol - added icon @@ -359,7 +288,7 @@ - security update to 506, updated patch Revision 1.15 2002/05/23 20:58:50 qboosh -- new %%doc +- new %doc - +x for nppdf.so (but it doesn't work for me anyway) Revision 1.14 2002/05/22 10:36:53 zagrodzki @@ -370,7 +299,7 @@ - ... and placed in an appropriate subpackage Revision 1.12 2002/04/25 15:41:38 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/02/22 23:28:40 kloczek - removed all Group fields translations (our rpm now can handle translating @@ -381,7 +310,7 @@ - release 3 Revision 1.9 2002/01/18 02:12:18 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.8 2001/10/31 10:50:37 qboosh - adapterized, cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.45&r2=1.46&f=u From qboosh at pld-linux.org Sun Aug 28 22:07:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: geos-2.1.4.tar.bz2 Message-ID: <10251.1125259674@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geos.refractions.net/geos-2.1.4.tar.bz2 e00524abc2cb26c8fb9173b8696be3b7 geos-2.1.4.tar.bz2 Size: 506683 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:07:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: geos.spec - updated to 2.1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:07:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.4 ---- Files affected: SPECS: geos.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/geos.spec diff -u SPECS/geos.spec:1.6 SPECS/geos.spec:1.7 --- SPECS/geos.spec:1.6 Mon Jul 25 08:34:29 2005 +++ SPECS/geos.spec Sun Aug 28 22:07:47 2005 @@ -2,12 +2,12 @@ Summary: Geometry Engine - Open Source Summary(pl): GEOS - silnik geometryczny z otwartymi ?r?d?ami Name: geos -Version: 2.1.3 +Version: 2.1.4 Release: 1 License: LGPL Group: Libraries Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2 -# Source0-md5: 29aa82867cb68fed607cd015b61499df +# Source0-md5: e00524abc2cb26c8fb9173b8696be3b7 Patch0: %{name}-config.patch URL: http://geos.refractions.net/ BuildRequires: automake @@ -100,6 +100,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 20:07:47 qboosh +- updated to 2.1.4 + Revision 1.6 2005/07/25 06:34:29 qboosh - updated to 2.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/geos.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Sun Aug 28 22:10:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: vdk.spec - libsigc++1-devel and libsigc++12-devel BRs remov... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:10:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by vdk ---- Files affected: SPECS: vdk.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.25 SPECS/vdk.spec:1.26 --- SPECS/vdk.spec:1.25 Sun Aug 28 09:16:28 2005 +++ SPECS/vdk.spec Sun Aug 28 22:10:24 2005 @@ -21,9 +21,6 @@ BuildRequires: freetype-devel >= 2.0.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel -# both??? -BuildRequires: libsigc++1-devel -BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: perl-devel >= 1:5.6 @@ -123,6 +120,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 20:10:24 twittner +- libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by + vdk + Revision 1.25 2005/08/28 07:16:28 qboosh - updated gtk+2 epoch; sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.25&r2=1.26&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: ecasound.spec - updated to 2.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:19:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.4.3 ---- Files affected: SPECS: ecasound.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/ecasound.spec diff -u SPECS/ecasound.spec:1.88 SPECS/ecasound.spec:1.89 --- SPECS/ecasound.spec:1.88 Sat Aug 13 21:03:45 2005 +++ SPECS/ecasound.spec Sun Aug 28 22:19:23 2005 @@ -9,12 +9,12 @@ Summary: Software package for multitrack audio processing Summary(pl): Oprogramowanie do wielo?cie?kowego przetwarzania d?wi?ku Name: ecasound -Version: 2.4.2 +Version: 2.4.3 Release: 1 License: GPL Group: Applications/Sound Source0: http://ecasound.seul.org/download/%{name}-%{version}.tar.gz -# Source0-md5: 77c10152f5a15da13f7876f0da30d592 +# Source0-md5: ea4af6ffa9f00743270151927f7b4584 Patch0: %{name}-link.patch URL: http://ecasound.seul.org/ %{?with_alsa:BuildRequires: alsa-lib-devel} @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/28 20:19:23 qboosh +- updated to 2.4.3 + Revision 1.88 2005/08/13 19:03:45 qboosh - updated to 2.4.2, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecasound.spec?r1=1.88&r2=1.89&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: ecasound-2.4.3.tar.gz Message-ID: <26938.1125260380@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ecasound.seul.org/download/ecasound-2.4.3.tar.gz ea4af6ffa9f00743270151927f7b4584 ecasound-2.4.3.tar.gz Size: 1112995 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:20:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: python-gstreamer.spec - add pth file; import gst works now In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:20:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pth file; import gst works now ---- Files affected: SPECS: python-gstreamer.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.8 SPECS/python-gstreamer.spec:1.9 --- SPECS/python-gstreamer.spec:1.8 Sun Aug 28 22:04:35 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:20:12 2005 @@ -49,6 +49,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +echo "gst" > $RPM_BUILD_ROOT%{py_sitedir}/gst.pth + cp -R examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %clean @@ -59,6 +61,7 @@ %doc AUTHORS ChangeLog NEWS README TODO %dir %{py_sitedir}/gst %attr(755,root,root) %{py_sitedir}/gst/*.so +%{py_sitedir}/*.pth %{py_sitescriptdir}/gst/*py[co] %{_pkgconfigdir}/*.pc %{_datadir}/%{pname} @@ -70,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 20:20:12 arekm +- add pth file; import gst works now + Revision 1.8 2005/08/28 20:04:35 arekm - up to 0.8.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Sun Aug 28 22:24:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: license-installer.sh - fix for installing from local src.rpm In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:24:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix for installing from local src.rpm ---- Files affected: SOURCES: license-installer.sh (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.5 SOURCES/license-installer.sh:1.6 --- SOURCES/license-installer.sh:1.5 Sun Aug 28 22:06:22 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:24:17 2005 @@ -21,16 +21,18 @@ done fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR + ( if echo "$3" | grep '://' >/dev/null; then + cd $SRPMDIR wget --passive-ftp -t0 "$3" else - cp -f "$3" . + cp -f "$3" $SRPMDIR + cd $SRPMDIR fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then for i in @COPYSOURCES@; do - rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i $i ) done fi ) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: fakeroot.spec - updated to 1.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.3 ---- Files affected: SPECS: fakeroot.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: SPECS/fakeroot.spec diff -u SPECS/fakeroot.spec:1.46 SPECS/fakeroot.spec:1.47 --- SPECS/fakeroot.spec:1.46 Mon Jul 18 21:23:16 2005 +++ SPECS/fakeroot.spec Sun Aug 28 22:25:16 2005 @@ -3,12 +3,12 @@ Summary(pl): Umo?liwia uzyskanie ,,podrobionego'' ?rodowiska roota Summary(pt_BR): Cria um falso ambiente de root Name: fakeroot -Version: 1.4.2 +Version: 1.4.3 Release: 1 License: GPL (see COPYING) Group: Development/Tools Source0: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz -# Source0-md5: 42f7b5fa763c9a302387d4228d9376c2 +# Source0-md5: bf9cd1d9b98adcf1a94741fc2db0442e BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: libtool @@ -97,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.47 2005/08/28 20:25:16 qboosh +- updated to 1.4.3 + Revision 1.46 2005/07/18 19:23:16 darekr - updated to 1.4.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fakeroot.spec?r1=1.46&r2=1.47&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: fakeroot_1.4.3.tar.gz Message-ID: <3788.1125260725@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.4.3.tar.gz bf9cd1d9b98adcf1a94741fc2db0442e fakeroot_1.4.3.tar.gz Size: 1141657 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:26:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: file-ia64.patch (REMOVED), file-4.14.patch1 (REMOVED) - o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:26:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: file-ia64.patch (1.5 -> NONE) (REMOVED), file-4.14.patch1 (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 22:27:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES: file-debian.patch - updated for 4.15 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.15 ---- Files affected: SOURCES: file-debian.patch (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/file-debian.patch diff -u SOURCES/file-debian.patch:1.11 SOURCES/file-debian.patch:1.12 --- SOURCES/file-debian.patch:1.11 Mon Jul 18 23:19:42 2005 +++ SOURCES/file-debian.patch Sun Aug 28 22:27:00 2005 @@ -1,8 +1,8 @@ ---- file-4.13.orig/doc/file.man -+++ file-4.13/doc/file.man +--- file-4.15/doc/file.man.orig 2005-08-18 17:18:22.000000000 +0200 ++++ file-4.15/doc/file.man 2005-08-28 22:16:00.615271312 +0200 @@ -1,4 +1,4 @@ -.TH FILE __CSECTION__ "Copyright but distributable" -+.TH FILE __CSECTION__ "January 2004" "Copyrighted but distributable" ++.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable" .\" $Id$ .SH NAME file @@ -31,7 +31,7 @@ magic file .I __MAGIC__.mgc , or -@@ -339,12 +340,6 @@ +@@ -368,12 +369,6 @@ The order of entries in the magic file is significant. Depending on what system you are using, the order that they are put together may be incorrect. @@ -44,7 +44,7 @@ .SH EXAMPLES .nf $ file file.c file /dev/{wd0a,hda} -@@ -498,3 +493,7 @@ +@@ -527,3 +522,7 @@ .B ftp.astron.com in the directory .I /pub/file/file-X.YZ.tar.gz ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/file-debian.patch?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 22:27:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: file-4.15.tar.gz file-non-english-man-pages.tar.bz2 Message-ID: <7239.1125260868@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.astron.com/pub/file/file-4.15.tar.gz 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz Size: 546522 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/file-non-english-man-pages.tar.bz2 c157a183b64156f8baafaefd9cbf04c1 file-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:27:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: file.spec - updated to 4.15, updated debian patch, removed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches ---- Files affected: SPECS: file.spec (1.107 -> 1.108) ---- Diffs: ================================================================ Index: SPECS/file.spec diff -u SPECS/file.spec:1.107 SPECS/file.spec:1.108 --- SPECS/file.spec:1.107 Tue Jul 19 17:56:26 2005 +++ SPECS/file.spec Sun Aug 28 22:27:40 2005 @@ -28,25 +28,23 @@ Summary(zh_CN): ???????????????????? Summary(zh_TW): ?????M?w???????????@???u???{???C Name: file -Version: 4.14 +Version: 4.15 Release: 1 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz -# Source0-md5: 66983e60087e8bcd588c8ab38a861af0 +# Source0-md5: 09a6603dadbe06e577e98a2547201fab Source1: zisofs.magic Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source2-md5: c157a183b64156f8baafaefd9cbf04c1 Source3: %{name}-magic.mscompress Patch0: %{name}-debian.patch Patch1: %{name}-sparc.patch -Patch2: %{name}-ia64.patch -Patch3: %{name}-unicode.patch -Patch4: %{name}-dicom.patch -Patch5: %{name}-lmagic.patch -Patch6: %{name}-python2.4.patch -Patch7: %{name}-greedy-dump.patch -Patch8: ftp://ftp.astron.com/pub/file/%{name}-4.14.patch1 +Patch2: %{name}-unicode.patch +Patch3: %{name}-dicom.patch +Patch4: %{name}-lmagic.patch +Patch5: %{name}-python2.4.patch +Patch6: %{name}-greedy-dump.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -253,11 +251,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p0 - -# temporary workaround -touch magic/Magdir/mup %build %{__libtoolize} @@ -357,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108 2005/08/28 20:27:40 qboosh +- updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches + Revision 1.107 2005/07/19 15:56:26 qboosh - Conflicts: rpm-build < 4.4.1-9 (new .mgc format - needs internal file update in rpm) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file.spec?r1=1.107&r2=1.108&f=u From paladine at pld-linux.org Sun Aug 28 22:30:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: epiphany-1.7.6.tar.bz2 Message-ID: <12086.1125261049@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/epiphany-1.7.6.tar.bz2 f03624c24f021b058136b46fbf54bc31 epiphany-1.7.6.tar.bz2 Size: 3345557 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS (DEVEL): epiphany.spec - updated to 1.7.6 - enabled dbus and... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:30:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.6 - enabled dbus and python support ---- Files affected: SPECS: epiphany.spec (1.99.2.10 -> 1.99.2.11) ---- Diffs: ================================================================ Index: SPECS/epiphany.spec diff -u SPECS/epiphany.spec:1.99.2.10 SPECS/epiphany.spec:1.99.2.11 --- SPECS/epiphany.spec:1.99.2.10 Sun Aug 21 11:53:35 2005 +++ SPECS/epiphany.spec Sun Aug 28 22:30:40 2005 @@ -6,12 +6,12 @@ Summary(es): Epiphany - navigador Web de GNOME basado en gecko Summary(pl): Epiphany - przegl?darka WWW dla GNOME Name: epiphany -Version: 1.7.5 +Version: 1.7.6 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d27b716603b9c36be91430c366077423 +# Source0-md5: f03624c24f021b058136b46fbf54bc31 Patch0: %{name}-first-tab.patch Patch1: %{name}-desktop.patch Patch2: %{name}-mozilla_includes.patch @@ -22,6 +22,7 @@ BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 +BuildRequires: dbus-glib-devel >= 0.34 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gnome-desktop-devel >= 2.10.0-2 BuildRequires: gnome-doc-utils >= 0.3.2-1 @@ -45,8 +46,8 @@ BuildRequires: pango-devel >= 1:1.8.1 BuildRequires: pkgconfig # Requries but python package not present? -#BuildRequires: python-gnome-devel >= 2.6.0 -#BuildRequires: python-pygtk-devel >= 2.6.0 +BuildRequires: python-gnome-devel >= 2.6.0 +BuildRequires: python-pygtk-devel >= 2.6.0 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -113,7 +114,9 @@ %configure \ --disable-schemas-install \ + --enable-dbus \ --enable-gtk-doc \ + --enable-python \ --with-html-dir=%{_gtkdocdir} # CFLAGS is a hack for gcc 3.3 %{__make} \ @@ -179,6 +182,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99.2.11 2005/08/28 20:30:40 paladine +- updated to 1.7.6 +- enabled dbus and python support + Revision 1.99.2.10 2005/08/21 09:53:35 wiget - update to 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.99.2.10&r2=1.99.2.11&f=u From arekm at pld-linux.org Sun Aug 28 22:31:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: flumotion-0.1.9.tar.bz2 Message-ID: <13569.1125261112@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.flumotion.net/src/flumotion/flumotion-0.1.9.tar.bz2 7f2b4abbabd7756d1d689b38fd477d3e flumotion-0.1.9.tar.bz2 Size: 655419 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:31:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:29 2005 Subject: SPECS: flumotion.spec (NEW) - raw In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:31:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - raw ---- Files affected: SPECS: flumotion.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u /dev/null SPECS/flumotion.spec:1.1 --- /dev/null Sun Aug 28 22:31:47 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:31:42 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +# +Summary: the Fluendo Streaming Server +Name: flumotion +Version: 0.1.9 +Release: 0.1 +License: GPL +Group: Daemons +Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 +# Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e +URL: http://www.flumotion.net/ +BuildRequires: gstreamer-devel >= 0.8 +BuildRequires: python-pygtk-devel >= 2.4.0 +BuildRequires: python-gstreamer >= 0.8.2-1 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Flumotion is a streaming media server created with the backing of +Fluendo. It features intuitive graphical administration tools, making +the task of setting up and manipulating audio and video streams easy +for even novice system administrators. + +%prep +%setup -q + +%build +install %{_datadir}/automake/config.* . +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver +install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(644,root,root,755) + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 20:31:42 arekm +- raw + ================================================================ From paladine at pld-linux.org Sun Aug 28 22:32:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:29 2005 Subject: SOURCES (DEVEL): epiphany-extensions-mozilla_includes.patch, epiph... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:32:22 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 1.7.5 ---- Files affected: SOURCES: epiphany-extensions-mozilla_includes.patch (1.3 -> 1.3.2.1) , epiphany-extensions-locale-names.patch (1.8.2.2 -> 1.8.2.3) ---- Diffs: ================================================================ Index: SOURCES/epiphany-extensions-mozilla_includes.patch diff -u SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 SOURCES/epiphany-extensions-mozilla_includes.patch:1.3.2.1 --- SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 Mon Mar 14 11:37:43 2005 +++ SOURCES/epiphany-extensions-mozilla_includes.patch Sun Aug 28 22:32:16 2005 @@ -1,20 +1,43 @@ -diff -urN aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2005-02-08 17:20:49.260647760 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am 2005-08-28 20:49:56.203735032 +0200 ++++ epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am 2005-08-28 22:02:24.092755432 +0200 +@@ -11,6 +11,8 @@ + content \ + docshell \ + dom \ ++ necko \ ++ webbrwsr \ + xpcom + + libadblockmozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:49:56.494690800 +0200 ++++ epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:56:30.391809336 +0200 +@@ -9,6 +9,7 @@ + content \ + docshell \ + dom \ ++ webbrwsr \ + xpcom + + libautoscrollermozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:49:53.852092536 +0200 ++++ epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:54:26.401658704 +0200 @@ -16,7 +16,8 @@ . \ dom \ jsconsole \ - necko -+ necko \ ++ necko \ + webbrwsr liberrorviewermozilla_la_CPPFLAGS = \ -I.. \ -diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2005-02-08 17:25:38.975604392 +0100 -@@ -12,6 +12,7 @@ +diff -urN epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am 2005-08-28 20:49:53.625127040 +0200 ++++ epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am 2005-08-28 22:14:59.178964880 +0200 +@@ -14,6 +14,7 @@ layout \ nkcache \ necko \ @@ -22,14 +45,14 @@ uconv \ webbrwsr -diff -urN aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2004-12-08 16:33:53.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2005-02-08 17:28:31.583364024 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:49:55.301872136 +0200 ++++ epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:55:09.807060080 +0200 @@ -6,6 +6,7 @@ mozilla_include_subdirs = \ . \ -+ dom \ ++ dom \ necko \ nkcache \ webbrwsr ================================================================ Index: SOURCES/epiphany-extensions-locale-names.patch diff -u SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 SOURCES/epiphany-extensions-locale-names.patch:1.8.2.3 --- SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 Wed Jul 27 12:59:25 2005 +++ SOURCES/epiphany-extensions-locale-names.patch Sun Aug 28 22:32:17 2005 @@ -1,8 +1,8 @@ -diff -urN epiphany-extensions-1.7.3.orig/po/LINGUAS epiphany-extensions-1.7.3/po/LINGUAS ---- epiphany-extensions-1.7.3.orig/po/LINGUAS 2005-07-27 12:41:10.176624984 +0200 -+++ epiphany-extensions-1.7.3/po/LINGUAS 2005-07-27 12:41:54.018959936 +0200 +diff -urN epiphany-extensions-1.7.5.orig/po/LINGUAS epiphany-extensions-1.7.5/po/LINGUAS +--- epiphany-extensions-1.7.5.orig/po/LINGUAS 2005-08-28 19:21:04.768236424 +0200 ++++ epiphany-extensions-1.7.5/po/LINGUAS 2005-08-28 19:21:40.660779928 +0200 @@ -1,3 +1,3 @@ # please keep this list sorted alphabetically # --bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW -+bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nb nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW +-bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ++bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt nb ne nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/epiphany-extensions-mozilla_includes.patch?r1=1.3&r2=1.3.2.1&f=u http://cvs.pld-linux.org/SOURCES/epiphany-extensions-locale-names.patch?r1=1.8.2.2&r2=1.8.2.3&f=u From paladine at pld-linux.org Sun Aug 28 22:33:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:29 2005 Subject: DISTFILES: epiphany-extensions-1.7.5.tar.bz2 Message-ID: <16361.1125261216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/epiphany-extensions-1.7.5.tar.bz2 ff01cb95c6348501fbd69c4203147204 epiphany-extensions-1.7.5.tar.bz2 Size: 606693 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:33:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - updated to 1.7.5 - updat... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:33:33 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.5 - updated patches - it's DEVEL, so lets enable really all extensions ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.6 -> 1.37.2.7) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.6 SPECS/epiphany-extensions.spec:1.37.2.7 --- SPECS/epiphany-extensions.spec:1.37.2.6 Mon Aug 22 21:38:11 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 22:33:28 2005 @@ -5,18 +5,18 @@ Summary: Collection of extensions for Epiphany Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions -Version: 1.7.4 -Release: 3 +Version: 1.7.5 +Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d175f0747254595d369aa75baa64a0a4 +# Source0-md5: ff01cb95c6348501fbd69c4203147204 Patch0: %{name}-locale-names.patch Patch1: %{name}-mozilla_includes.patch URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.5 +BuildRequires: epiphany-devel >= 1.7.6 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=all + --with-extensions=really-all %{__make} %install @@ -94,6 +94,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.7 2005/08/28 20:33:28 paladine +- updated to 1.7.5 +- updated patches +- it's DEVEL, so lets enable really all extensions + Revision 1.37.2.6 2005/08/22 19:38:11 paladine - rel. 3 for epiphany 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.6&r2=1.37.2.7&f=u From darekr at pld-linux.org Sun Aug 28 22:37:09 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: flumotion.spec - BR: automake; unify In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 20:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: automake; unify ---- Files affected: SPECS: flumotion.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.1 SPECS/flumotion.spec:1.2 --- SPECS/flumotion.spec:1.1 Sun Aug 28 22:31:42 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:37:03 2005 @@ -9,6 +9,7 @@ Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 # Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e URL: http://www.flumotion.net/ +BuildRequires: automake BuildRequires: gstreamer-devel >= 0.8 BuildRequires: python-pygtk-devel >= 2.4.0 BuildRequires: python-gstreamer >= 0.8.2-1 @@ -24,7 +25,7 @@ %setup -q %build -install %{_datadir}/automake/config.* . +install /usr/share/automake/config.* . %configure %{__make} @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 20:37:03 darekr +- BR: automake; unify + Revision 1.1 2005/08/28 20:31:42 arekm - raw ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 22:44:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: flumotion.spec - pl, some files In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:44:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, some files ---- Files affected: SPECS: flumotion.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.2 SPECS/flumotion.spec:1.3 --- SPECS/flumotion.spec:1.2 Sun Aug 28 22:37:03 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:44:05 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -# -Summary: the Fluendo Streaming Server +Summary: The Fluendo Streaming Server +Summary(pl): Serwer strumieni Fluendo Name: flumotion Version: 0.1.9 Release: 0.1 @@ -21,6 +21,12 @@ the task of setting up and manipulating audio and video streams easy for even novice system administrators. +%description -l pl +Flumotion to serwer strumieni multimedialnych stworzony przy poparciu +Fluendo. Ma intuicyjne graficzne narz?dzia administracyjne, czyni?ce +zadanie konfiguracji i obr?bki strumieni d?wi?ku i obrazu ?atwym nawet +dla pocz?tkuj?cych administrator?w system?w. + %prep %setup -q @@ -46,6 +52,8 @@ %files %defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/ffserver +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -53,9 +61,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/28 20:44:05 qboosh +- pl, some files + Revision 1.2 2005/08/28 20:37:03 darekr - BR: automake; unify Revision 1.1 2005/08/28 20:31:42 arekm - raw - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.2&r2=1.3&f=u From twittner at pld-linux.org Sun Aug 28 22:59:06 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:30 2005 Subject: SOURCES: vdkbuilder.desktop (NEW) - desktop file for vdkbuilder In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - desktop file for vdkbuilder ---- Files affected: SOURCES: vdkbuilder.desktop (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder.desktop diff -u /dev/null SOURCES/vdkbuilder.desktop:1.1 --- /dev/null Sun Aug 28 22:59:05 2005 +++ SOURCES/vdkbuilder.desktop Sun Aug 28 22:59:00 2005 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=VDK Builder IDE +Comment=VDK Builder IDE +Icon=vdkb2.png +Exec=vdkb2 +Terminal=false +Type=Application +Categories=GTK2;Development;IDE; +Encoding=UTF-8 +# vi: encoding=utf-8 ================================================================ From twittner at pld-linux.org Sun Aug 28 22:59:37 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: vdkbuilder.spec - added tutorial and desktop file In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added tutorial and desktop file ---- Files affected: SPECS: vdkbuilder.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.15 SPECS/vdkbuilder.spec:1.16 --- SPECS/vdkbuilder.spec:1.15 Sun Aug 28 02:26:44 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 22:59:32 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%define _tutver 1.1 Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder @@ -8,6 +9,9 @@ Group: Development/Tools Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz # Source0-md5: 91216ce6659e447862b2bdc7335074fc +Source1: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-%{_tutver}.pdf.gz +# Source1-md5: 06d2e9b1dab6bec28d7ea3b6819dfb67 +Source2: %{name}.desktop Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf @@ -60,6 +64,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install %{SOURCE1} . +install -D %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -68,10 +75,11 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello vdktutorial-%{_tutver}.pdf.gz %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* +%{_desktopdir}/%{name}.desktop %{_pixmapsdir}/*.png %{_datadir}/vdkb2 @@ -86,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/28 20:59:32 twittner +- added tutorial and desktop file + Revision 1.15 2005/08/28 00:26:44 twittner - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.15&r2=1.16&f=u From qboosh at pld-linux.org Sun Aug 28 23:02:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: SOURCES: libfpx-fix.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: libfpx-fix.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sun Aug 28 23:02:41 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 09:39:30 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz vdktutorial-1.1.pdf.gz Message-ID: <19782.1125262961@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz STORED: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-1.1.pdf.gz 06d2e9b1dab6bec28d7ea3b6819dfb67 vdktutorial-1.1.pdf.gz Size: 1602382 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 23:02:46 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: libfpx.spec - updated to 1.2.0.13, removed obsolete fix patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.0.13, removed obsolete fix patch ---- Files affected: SPECS: libfpx.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/libfpx.spec diff -u SPECS/libfpx.spec:1.36 SPECS/libfpx.spec:1.37 --- SPECS/libfpx.spec:1.36 Wed Jun 15 23:39:26 2005 +++ SPECS/libfpx.spec Sun Aug 28 23:02:40 2005 @@ -1,19 +1,19 @@ # $Revision$, $Date$ +# # Conditional build: %bcond_without static_libs # don't build static library # Summary: FlashPIX OpenSource Toolkit Summary(pl): Biblioteka do obr?bki obrazk?w FlashPIX Name: libfpx -Version: 1.2.0.12 +Version: 1.2.0.13 Release: 1 License: distributable (see COPYING) Group: Libraries # Strange... [URL] says you can order it (for money) and doesn't contain any # link, but sources can be freely redistributed. Can be found on any IM mirror. Source0: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/%{name}-%{version}.tar.bz2 -# Source0-md5: a82d33cc0ede71752802da0f410398b8 -Patch0: %{name}-fix.patch +# Source0-md5: 5e781a17ec96e8f9af8c2ff319e8d706 URL: http://www.i3a.org/i_flashpix.html BuildRequires: autoconf >= 2.55 BuildRequires: automake >= 1:1.9 @@ -62,7 +62,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 21:02:40 qboosh +- updated to 1.2.0.13, removed obsolete fix patch + Revision 1.36 2005/06/15 21:39:26 witekfl - added bcond_without static_libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libfpx.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 23:09:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: DISTFILES: libfpx-1.2.0.13.tar.bz2 Message-ID: <24114.1125263342@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/libfpx-1.2.0.13.tar.bz2 5e781a17ec96e8f9af8c2ff319e8d706 libfpx-1.2.0.13.tar.bz2 Size: 2259745 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 23:14:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: aspell-pl-alt.spec - up to 20050828 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:14:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 20050828 ---- Files affected: SPECS: aspell-pl-alt.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/aspell-pl-alt.spec diff -u SPECS/aspell-pl-alt.spec:1.43 SPECS/aspell-pl-alt.spec:1.44 --- SPECS/aspell-pl-alt.spec:1.43 Mon Jul 25 11:44:45 2005 +++ SPECS/aspell-pl-alt.spec Sun Aug 28 23:14:21 2005 @@ -2,12 +2,12 @@ Summary: An alternative Polish dictionary for aspell by kurnik.pl Summary(pl): Alternatywny polski s?ownik dla aspella autorstwa kurnik.pl Name: aspell-pl-alt -Version: 20050725 +Version: 20050828 Release: 1 License: Creative Commons License (see legalcode.html) Group: Applications/Text Source0: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-%{version}.tar.bz2 -# Source0-md5: f48c44862fa9da9c9d109034702ab43c +# Source0-md5: 5d4b6fe220492e79290d64f27a0204ae Source1: http://creativecommons.org/licenses/sa/1.0/legalcode # Source1-md5: 0ed76e90db3d98d93cf6f7a610c10f77 Patch0: %{name}-configure.patch @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 21:14:21 arekm +- up to 20050828 + Revision 1.43 2005/07/25 09:44:45 blekot - up to 20050725 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aspell-pl-alt.spec?r1=1.43&r2=1.44&f=u From arekm at pld-linux.org Sun Aug 28 23:14:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:30 2005 Subject: DISTFILES: alt-aspell-pl-20050828.tar.bz2 legalcode Message-ID: <7759.1125263670@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-20050828.tar.bz2 5d4b6fe220492e79290d64f27a0204ae alt-aspell-pl-20050828.tar.bz2 Size: 653409 bytes ALREADY GOT: http://creativecommons.org/licenses/sa/1.0/legalcode 0ed76e90db3d98d93cf6f7a610c10f77 legalcode -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 23:35:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - disable adblock (epiphan... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 21:35:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - disable adblock (epiphany craches on exit) - disable net-monitor (experimental) - disable sample extensions - disable tabsmenu (doesn't work) - disable greasemonkey - rel. 2 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.7 -> 1.37.2.8) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.7 SPECS/epiphany-extensions.spec:1.37.2.8 --- SPECS/epiphany-extensions.spec:1.37.2.7 Sun Aug 28 22:33:28 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 23:35:22 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.5 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=really-all + --with-extensions=all,rss %{__make} %install @@ -94,6 +94,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.8 2005/08/28 21:35:22 paladine +- disable adblock (epiphany craches on exit) +- disable net-monitor (experimental) +- disable sample extensions +- disable tabsmenu (doesn't work) +- disable greasemonkey +- rel. 2 + Revision 1.37.2.7 2005/08/28 20:33:28 paladine - updated to 1.7.5 - updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.7&r2=1.37.2.8&f=u From qboosh at pld-linux.org Sun Aug 28 23:52:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: crossalpha-binutils.spec - updated to 2.16.91.0.3 (2.16.91.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:52:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) ---- Files affected: SPECS: crossalpha-binutils.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/crossalpha-binutils.spec diff -u SPECS/crossalpha-binutils.spec:1.18 SPECS/crossalpha-binutils.spec:1.19 --- SPECS/crossalpha-binutils.spec:1.18 Thu Jul 28 21:07:52 2005 +++ SPECS/crossalpha-binutils.spec Sun Aug 28 23:52:05 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - ALPHA binutils Summary(tr): GNU geli?tirme ara?lar? - ALPHA binutils Name: crossalpha-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/28 21:52:05 qboosh +- updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) + Revision 1.18 2005/07/28 19:07:52 pluto - updated to 2.16.91.0.2. @@ -166,4 +169,3 @@ Revision 1.1 2004/06/12 10:57:11 ankry - initial - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossalpha-binutils.spec?r1=1.18&r2=1.19&f=u From arekm at pld-linux.org Sun Aug 28 23:52:55 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: openclipart.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:52:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: openclipart.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/openclipart.spec diff -u SPECS/openclipart.spec:1.5 SPECS/openclipart.spec:1.6 --- SPECS/openclipart.spec:1.5 Sat Aug 13 13:28:00 2005 +++ SPECS/openclipart.spec Sun Aug 28 23:52:50 2005 @@ -3,7 +3,7 @@ Summary(pl): Archiwum klipart?w, kt?re mo?na u?ywa? w dowolny spos?b za darmo Name: openclipart Version: 0.16 -Release: 0.1 +Release: 1 Epoch: 0 License: Creative Commons and/or Public Domain Group: Applications/Graphics @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 21:52:50 arekm +- rel 1 + Revision 1.5 2005/08/13 11:28:00 qboosh - Obsoletes for dropped subpackages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openclipart.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: SPECS: inkscape.spec - updated to 0.42.2 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:58:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.42.2 ---- Files affected: SPECS: inkscape.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/inkscape.spec diff -u SPECS/inkscape.spec:1.39 SPECS/inkscape.spec:1.40 --- SPECS/inkscape.spec:1.39 Sun Jul 31 14:05:45 2005 +++ SPECS/inkscape.spec Sun Aug 28 23:58:00 2005 @@ -9,31 +9,33 @@ Summary: Scalable vector graphics editor Summary(pl): Edytor skalowalnej grafiki wektorowej Name: inkscape -Version: 0.42 -Release: 2 +Version: 0.42.2 +Release: 1 License: GPL v2, LGPL v2.1 Group: Applications/Graphics Source0: http://dl.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# Source0-md5: 4af587b942647bf9e27861e2238844c8 +# Source0-md5: a27172087018e850e92e97e52b5dad08 URL: http://www.inkscape.org/ BuildRequires: autoconf >= 2.59-3 BuildRequires: automake >= 1:1.9.4-2 BuildRequires: freetype-devel >= 2.0 BuildRequires: gc-devel >= 6.4 +BuildRequires: gcc-c++ >= 3.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: gtkmm-devel >= 2.4 -BuildRequires: gtkspell-devel -BuildRequires: intltool +BuildRequires: gtkspell-devel >= 2.0 +BuildRequires: intltool >= 0.22 BuildRequires: libart_lgpl-devel >= 2.3.10 %{?with_gnome_print:BuildRequires: libgnomeprintui-devel >= 1.116.0} -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 1.2 BuildRequires: libsigc++-devel >= 2.0.3 BuildRequires: libtool -BuildRequires: libxml2-devel >= 2.4.24 +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pkgconfig BuildRequires: popt-devel %{?with_xft:BuildRequires: xft-devel} +BuildRequires: zlib-devel Requires(post,postun): shared-mime-info Requires: gc >= 6.4 Requires: gtk+2 >= 2:2.4.0 @@ -116,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/28 21:58:00 qboosh +- updated to 0.42.2 + Revision 1.39 2005/07/31 12:05:45 wolf - fix extensions - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/inkscape.spec?r1=1.39&r2=1.40&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 09:39:30 2005 Subject: DISTFILES: inkscape-0.42.2.tar.bz2 Message-ID: <19635.1125266310@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/inkscape/inkscape-0.42.2.tar.bz2 a27172087018e850e92e97e52b5dad08 inkscape-0.42.2.tar.bz2 Size: 5724173 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 00:14:37 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: mutt.spec - a year has passed, time for an integer release ... In-Reply-To: References: Message-ID: Author: adamg Date: Sun Aug 21 22:14:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - a year has passed, time for an integer release :) - release 9 ---- Files affected: SPECS: mutt.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.181 SPECS/mutt.spec:1.182 --- SPECS/mutt.spec:1.181 Sun Aug 21 21:38:55 2005 +++ SPECS/mutt.spec Mon Aug 22 00:14:31 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 8.1 +Release: 9 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/21 22:14:31 adamg +- a year has passed, time for an integer release :) +- release 9 + Revision 1.181 2005/08/21 19:38:55 saq - bump ncurses BR for ncursesw - paths.patch for deterministic build with{,out} external progs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.181&r2=1.182&f=u From cvs at pld-linux.org Mon Aug 22 02:31:23 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 10:39:28 2005 Subject: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Message-ID: <6326@svn.pld-linux.org> Author: qwiat Date: Mon Aug 22 02:31:20 2005 New Revision: 6326 Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Log: - garsc roznych poprawek nadajacych rece i nogi rozdzialowi Modified: PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec ============================================================================== --- PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec (original) +++ PLD-doc/book/pl_book__konfiguracja/pl_konfiguracja__geninitrd.sec Mon Aug 22 02:31:20 2005 @@ -32,8 +32,22 @@ do niego za? prowadzi ??cze o nazwie initrd. - Uwaga! Opr?cz sterownika kontrolera b?dziemy musieli doda? - modu? obs?ugi systemu plik?w dla partycji "/". + Poni?ej przedstawiono trzy metody generowania initrd. W + wi?kszo?ci wypadk?w najwygodniejszy b?dzie pierwszy spos?b, w + przypadku dw?ch pozosta?ych musimy zna? nasz sprz?t i system + plik?w partycji "/" aby wskaza? nazwy w?a?ciwych modu??w. Dwie + ostatnie maj? jedn? zasadnicz? przewag?, mog? by? + przeprowadzane na dowolnej maszynie. + + + Opis wykrywania sprz?tu i dobierania w?a?ciwych modu??w + opisano w . Przy + tworzeniu initrd przewa?nie musimy skorzysta? z operacji + chroot-a, mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba + najwygodniejsze b?dzie u?ycie systemu uruchamianego z + p?yty CD np.: PLD-Live lub + RescueCD. Opis procedury chroot-a + z p?yty typu Live znajdziemy w . @@ -42,14 +56,11 @@
Automatyczne generowanie initrd - Ca?y proces mo?emy zautomatyzowa?, pod??czaj?c dysk do - docelowej maszyny, musimy wtedy pos?u?y? si? inn? dystrybucj? - i wykona? operacj? chroot-a - opis jak to zrobi? znajduje - si? tutaj . - Mo?emy u?y? dowolnej dystrybucji linuksa jednak chyba - najwygodniejsze b?dzie u?ycie systemu uruchamianego z - p?yty CD np.: PLD-Live lub - RescueCD. + Przewa?nie sprz?t i u?ywany system plik?w partycji + "/" mog? zosta? wykryte automatycznie. Proces ten zaczynamy + od pod??czenia dysku twardego do docelowej maszyny i + pos?u?enia si? inn? dystrybucj? w celu wykonania operacji + chroot-a. Je?li zmieni?y si? nazwy urz?dze? masowych po pod??czeniu dysku @@ -85,13 +96,13 @@
R?czne generowanie initrd - Ta operacja mo?e by? przeprowadzona z dowolnego komputera, - je?li nie jest to macierzysta maszyna u?yjemy dowolnej + Je?li nie jest to macierzysta maszyna u?yjemy dowolnej dystrybucji i operacji chroot-a. Metoda ta wymaga precyzyjnej znajomo?ci u?ywanego sprz?tu i systemu plik?w, gdy? sami musimy wskaza? odpowiednie modu?y. Jest jednak konieczna, - np. w sytuacji problemu z automatycznym wykryciem wymaganych - sterownik?w. + w przypadku problem?w z automatycznym wykryciem wymaganych + sterownik?w lub je?li chcemy operacj? wykona? na innej + maszynie ni? docelowa. Mo?emy wpisa? list? koniecznych modu??w do odpowiedniej @@ -112,30 +123,11 @@ {$nowy_initrd} {$wersja_j?dra} - np.: - -# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7 - - Powy?sze wywo?anie wymusi dodanie dodatkowo modu??w obs?ugi + Poni?ej zamieszczono przyk?adowe wywo?anie geninitrd dla systemu plik?w ext3 i kontrolera IDE - PDC20268 firmy Promise. - -
- - -
- Generowanie uniwersalnego initrd - - Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe. - Mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? - modu??w przy pomocy opcji - --with - tak jak to - przedstawiono w powy?szym rozdziale. - Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e - to spowodowa? wolniejszy start systemu i niepotrzebne - zu?ycie pami?ci operacyjnej przez nieu?ywane - sterowniki. + PDC20268 firmy Promise: +# geninitrd -v --with=ext3 --with=pdc202xx_new /boot/initrd_nowy 2.6.7
@@ -210,6 +202,27 @@
+
+ Uwagi + + Cz?ste zmiany u?ywanego obrazu initrd mog? by? uci??liwe, + mo?na to obej?? ??cz?c do jednego obrazu wi?ksz? ilo?? + modu??w. Aby to zrobi? mo?emy dopisa? nazwy modu??w do + przedstawionych poni?ej opcji w pliku + /etc/sysconfig/geninitrd: +## Basic modules to be loaded +BASICMODULES="" +## Modules that should be loaded before anything (i.e. jbd for ext3) +PREMODS="" + mo?emy te? u?y? opcji + --with programu geninitrd, lub doda? + dodatkowe modu?y przy "r?cznym" budowaniu obrazu. + Warto pami?ta? ?eby nie przesadza? z ich ilo?ci?, mo?e + to spowodowa? wolniejszy start systemu i niepotrzebne + zu?ycie pami?ci operacyjnej przez nieu?ywane + sterowniki. + +
From adamg at pld-linux.org Mon Aug 22 06:29:33 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: Net_SMTP-1.2.7.tgz Message-ID: <19691.1124684973@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_SMTP-1.2.7.tgz 11c4de943b07206aab6193eefd8f328e Net_SMTP-1.2.7.tgz Size: 10240 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: php-pear-Net_SMTP.spec - updated to 1.2.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.7 ---- Files affected: SPECS: php-pear-Net_SMTP.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_SMTP.spec diff -u SPECS/php-pear-Net_SMTP.spec:1.16 SPECS/php-pear-Net_SMTP.spec:1.17 --- SPECS/php-pear-Net_SMTP.spec:1.16 Sat Dec 4 14:21:59 2004 +++ SPECS/php-pear-Net_SMTP.spec Mon Aug 22 06:29:29 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - implementation of the SMTP protocol Summary(pl): %{_pearname} - implementacja protoko?u SMTP Name: php-pear-%{_pearname} -Version: 1.2.6 -Release: 2 +Version: 1.2.7 +Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 69bcb47d571b72060beed0a7d8d852a5 +# Source0-md5: 11c4de943b07206aab6193eefd8f328e URL: http://pear.php.net/package/Net_SMTP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 04:29:29 adamg +- updated to 1.2.7 + Revision 1.16 2004/12/04 13:21:59 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_SMTP.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Mon Aug 22 06:29:50 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: Mail-1.1.7.tgz Message-ID: <19805.1124684990@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.7.tgz f6307041810d18da6c6d04acdcc9b72a Mail-1.1.7.tgz Size: 16165 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 06:29:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.7 In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 04:29:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.7 ---- Files affected: SPECS: php-pear-Mail.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.21 SPECS/php-pear-Mail.spec:1.22 --- SPECS/php-pear-Mail.spec:1.21 Fri Dec 3 23:22:53 2004 +++ SPECS/php-pear-Mail.spec Mon Aug 22 06:29:44 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.4 -Release: 2 +Version: 1.1.7 +Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 3e14fef5bd418de87214a3271ffc4549 +# Source0-md5: f6307041810d18da6c6d04acdcc9b72a URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 04:29:44 adamg +- updated to 1.1.7 + Revision 1.21 2004/12/03 22:22:53 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.21&r2=1.22&f=u From aredridel at pld-linux.org Mon Aug 22 07:18:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: nss-mdns-0.6.tar.gz Message-ID: <7846.1124687938@distfiles.pld-linux.org> Files fetched: 1 STORED: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.6.tar.gz 46e4e6c200ee9dc4a466be5ff9247fbd nss-mdns-0.6.tar.gz Size: 323682 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Mon Aug 22 07:18:51 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: nss_mdns.spec - up to 0.6 In-Reply-To: References: Message-ID: Author: aredridel Date: Mon Aug 22 05:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6 ---- Files affected: SPECS: nss_mdns.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/nss_mdns.spec diff -u SPECS/nss_mdns.spec:1.4 SPECS/nss_mdns.spec:1.5 --- SPECS/nss_mdns.spec:1.4 Fri Feb 4 19:54:12 2005 +++ SPECS/nss_mdns.spec Mon Aug 22 07:18:44 2005 @@ -2,12 +2,12 @@ Summary: mDNS Service Switch Module Summary(pl): Modu? NSS mDNS Name: nss_mdns -Version: 0.3 +Version: 0.6 Release: 1 -License: LGPL +License: LGPL v2.1 Group: Base Source0: http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-%{version}.tar.gz -# Source0-md5: 8fae540908567a96c2c8d71d22ccf210 +# Source0-md5: 46e4e6c200ee9dc4a466be5ff9247fbd URL: http://0pointer.de/lennart/projects/nss-mdns/ BuildRequires: autoconf BuildRequires: automake @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 05:18:44 aredridel +- up to 0.6 + Revision 1.4 2005/02/04 18:54:12 matowy - up to 0.3, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nss_mdns.spec?r1=1.4&r2=1.5&f=u From adamg at pld-linux.org Mon Aug 22 08:52:42 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: grabcartoons.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:52:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: grabcartoons.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u /dev/null SPECS/grabcartoons.spec:1.1 --- /dev/null Mon Aug 22 08:52:42 2005 +++ SPECS/grabcartoons.spec Mon Aug 22 08:52:36 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +Summary: commic-summarizing utility +Name: grabcartoons +Version: 1.11 +Release: 0.1 +License: BSD +Group: Applications +Source0: http://dl.sourceforge.net/grabcartoons/%{name}-%{version}.tar.gz +# Source0-md5: 751234c5072bb4a65a8f8d9b1775cc8c +Patch0: %{name}-DESTDIR.patch +URL: http://grabcartoons.sourceforge.net/ +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +GrabCartoons is a comic-summarizing utility. It is modular, and it is +very easy to write modules for new comics. + +%prep +%setup -q +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + PREFIX=%{_prefix} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/* +/usr/lib/grabcartoons + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 06:52:36 adamg +- new + ================================================================ From adamg at pld-linux.org Mon Aug 22 08:52:44 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: grabcartoons-1.11.tar.gz Message-ID: <18171.1124693564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/grabcartoons/grabcartoons-1.11.tar.gz 751234c5072bb4a65a8f8d9b1775cc8c grabcartoons-1.11.tar.gz Size: 16881 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Mon Aug 22 08:53:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:28 2005 Subject: SOURCES: grabcartoons-DESTDIR.patch (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 06:53:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: grabcartoons-DESTDIR.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/grabcartoons-DESTDIR.patch diff -u /dev/null SOURCES/grabcartoons-DESTDIR.patch:1.1 --- /dev/null Mon Aug 22 08:53:05 2005 +++ SOURCES/grabcartoons-DESTDIR.patch Mon Aug 22 08:52:59 2005 @@ -0,0 +1,17 @@ +--- grabcartoons-1.11/Makefile~ 2004-05-18 11:33:59.000000000 +0200 ++++ grabcartoons-1.11/Makefile 2005-08-22 08:45:49.937799616 +0200 +@@ -8,10 +8,10 @@ + @echo "Valid Targets: install targz. Use with care." + + install: +- mkdir -p -m 755 $(PREFIX)/bin +- mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules +- install -m 755 grabcartoons.pl $(PREFIX)/bin +- install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/bin ++ mkdir -p -m 755 $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules ++ install -m 755 grabcartoons.pl $(DESTDIR)$(PREFIX)/bin ++ install -m 644 modules/*.pl $(DESTDIR)$(PREFIX)/lib/grabcartoons/modules + + targz: + cd $(TARGZDIR); rm -rf grabcartoon*; cvs -d :ext:zamboni@cvs.sourceforge.net:/cvsroot/grabcartoons export -Dtoday -d grabcartoons-$(VERSION) grabcartoons; tar zcvf $(TARGZFILE) grabcartoons-$(VERSION) ================================================================ From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: amavisd-new.spec - updated to 2.3.3 - release 2 ( rel 1 is ... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:08:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.3 - release 2 ( rel 1 is for Ra ) ---- Files affected: SPECS: amavisd-new.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/amavisd-new.spec diff -u SPECS/amavisd-new.spec:1.88 SPECS/amavisd-new.spec:1.89 --- SPECS/amavisd-new.spec:1.88 Tue Aug 9 21:50:14 2005 +++ SPECS/amavisd-new.spec Mon Aug 22 09:08:24 2005 @@ -5,13 +5,13 @@ Summary: A Mail Virus Scanner with SpamAssassin support - daemon Summary(pl): Antywirusowy skaner poczty elektronicznej z obs?ug? SpamAssasina - demon Name: amavisd-new -Version: 2.3.2 +Version: 2.3.3 Release: 2 Epoch: 1 License: GPL Group: Applications/Mail Source0: http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz -# Source0-md5: 4af47f7e0b2aaf71bd5783dc26a576a8 +# Source0-md5: 0b02df514c1a2bf8af346bc9c7e97111 Source1: %{name}.init Source2: %{name}-milter.init Patch0: %{name}-config.patch @@ -183,6 +183,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/22 07:08:24 paszczus +- updated to 2.3.3 +- release 2 ( rel 1 is for Ra ) + Revision 1.88 2005/08/09 19:50:14 hawk - updated to 2.3.2 - works for me, release 2 (1 will go to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/amavisd-new.spec?r1=1.88&r2=1.89&f=u From paszczus at pld-linux.org Mon Aug 22 09:08:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: amavisd-new-2.3.3.tar.gz Message-ID: <26767.1124694511@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ijs.si/software/amavisd/amavisd-new-2.3.3.tar.gz 0b02df514c1a2bf8af346bc9c7e97111 amavisd-new-2.3.3.tar.gz Size: 772280 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:15:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: awstats.spec - use apache config triggers, rel 1.10 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:15:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use apache config triggers, rel 1.10 ---- Files affected: SPECS: awstats.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/awstats.spec diff -u SPECS/awstats.spec:1.37 SPECS/awstats.spec:1.38 --- SPECS/awstats.spec:1.37 Sun Aug 21 19:59:25 2005 +++ SPECS/awstats.spec Mon Aug 22 09:15:07 2005 @@ -10,7 +10,7 @@ Summary(pl): Zaawansowany program do analizowania log?w serwera Name: awstats Version: 6.5 -Release: 1.5 +Release: 1.10 License: GPL Group: Applications/Networking Source0: http://awstats.sourceforge.net/files/%{name}-%{version}.tgz @@ -22,6 +22,8 @@ Patch1: %{name}-created_dir_mode.patch URL: http://awstats.sourceforge.net/ BuildRequires: rpm-perlprov +BuildRequires: rpmbuild(macros) >= 1.221 +Requires(triggerpostun): sed >= 4.0 Requires: perl-Geo-IP Requires: perl-Time-HiRes Requires: perl-Storable @@ -76,47 +78,51 @@ mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/awstats.model.conf $RPM_BUILD_ROOT%{_sysconfdir}/awstats mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/{lang,lib,plugins} $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/awstats -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf ln -s %{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl $RPM_BUILD_ROOT%{_bindir} -%post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf +%clean +rm -rf $RPM_BUILD_ROOT + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/awstats/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + +%triggerpostun -- %{name} < 6.5-1.10 +# migrate from old config location (only apache2, as there was no apache1 support) +if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then + cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} + mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/awstats/apache.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf +fi + +# nuke very-old config location +if [ ! -d /etc/httpd/httpd.conf ]; then + sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi +# apache2 +if [ -d /etc/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/awstats/apache.conf /etc/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %doc README.TXT docs/* tools/webmin tools/xslt %dir %{_sysconfdir}/awstats -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/*.conf -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/awstats*.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/awstats/apache.conf %attr(640,root,root) /etc/cron.d/awstats %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/%{name} @@ -138,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/22 07:15:07 glen +- use apache config triggers, rel 1.10 + Revision 1.37 2005/08/21 17:59:25 jajcus - Release: 1.5 - Awstats is started with uid of stats. Parsing logs with root privileges is a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/awstats.spec?r1=1.37&r2=1.38&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: neon.spec - updated to 0.25.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 07:19:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.25.3 ---- Files affected: SPECS: neon.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/neon.spec diff -u SPECS/neon.spec:1.48 SPECS/neon.spec:1.49 --- SPECS/neon.spec:1.48 Wed Jul 6 21:39:39 2005 +++ SPECS/neon.spec Mon Aug 22 09:19:21 2005 @@ -6,12 +6,12 @@ Summary: An HTTP and WebDAV client library Summary(pl): Biblioteka kliencka HTTP i WebDAV Name: neon -Version: 0.24.7 -Release: 5 +Version: 0.25.3 +Release: 1 License: GPL Group: Libraries Source0: http://www.webdav.org/neon/%{name}-%{version}.tar.gz -# Source0-md5: 5108bcbe41de4afe2e19cc58500fb9f2 +# Source0-md5: 7f0f9fe66dd8349b2aff2d8ab4d8683b URL: http://www.webdav.org/neon/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -139,6 +139,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/22 07:19:21 paszczus +- updated to 0.25.3 + Revision 1.48 2005/07/06 19:39:39 arekm - br heimdal >= 0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/neon.spec?r1=1.48&r2=1.49&f=u From paszczus at pld-linux.org Mon Aug 22 09:19:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: neon-0.25.3.tar.gz Message-ID: <531.1124695174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.webdav.org/neon/neon-0.25.3.tar.gz 7f0f9fe66dd8349b2aff2d8ab4d8683b neon-0.25.3.tar.gz Size: 730495 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 09:54:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: kde-splash-gartoon.spec - rel 0.2 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 07:54:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2 ---- Files affected: SPECS: kde-splash-gartoon.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.1 SPECS/kde-splash-gartoon.spec:1.2 --- SPECS/kde-splash-gartoon.spec:1.1 Sat Aug 20 21:41:00 2005 +++ SPECS/kde-splash-gartoon.spec Mon Aug 22 09:54:49 2005 @@ -4,7 +4,7 @@ Summary(pl): Ekran startowy KDE Name: kde-splash-%{_splash} Version: 0.1 -Release: 0.1 +Release: 0.2 License: GPL Group: X11/Amusements Source0: http://www.kde-look.org/content/files/20031-gartoonss.tar.gz @@ -40,6 +40,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 07:54:49 glen +- rel 0.2 + Revision 1.1 2005/08/20 19:41:00 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 10:09:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: PLD-doc: uid_gid.db.txt - register jserv (154) In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 08:09:18 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - register jserv (154) ---- Files affected: PLD-doc: uid_gid.db.txt (1.180 -> 1.181) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.180 PLD-doc/uid_gid.db.txt:1.181 --- PLD-doc/uid_gid.db.txt:1.180 Mon Aug 1 18:14:07 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 10:09:13 2005 @@ -166,6 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -328,6 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary +154 jserv jserv-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.180&r2=1.181&f=u From havner at pld-linux.org Mon Aug 22 10:17:15 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: openvpn.spec - dont use such releases ! In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:17:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - dont use such releases ! ---- Files affected: SPECS: openvpn.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.90 SPECS/openvpn.spec:1.91 --- SPECS/openvpn.spec:1.90 Fri Jul 22 11:15:00 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:17:08 2005 @@ -3,7 +3,7 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.7.1 +Release: 0.8 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/22 08:17:08 havner +- dont use such releases ! + Revision 1.90 2005/07/22 09:15:00 areq - 2.0.1_rc7 - lzo-2.01 ready ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.90&r2=1.91&f=u From havner at pld-linux.org Mon Aug 22 10:22:39 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: openvpn.spec - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 08:22:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ---- Files affected: SPECS: openvpn.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.91 SPECS/openvpn.spec:1.92 --- SPECS/openvpn.spec:1.91 Mon Aug 22 10:17:08 2005 +++ SPECS/openvpn.spec Mon Aug 22 10:22:33 2005 @@ -3,11 +3,11 @@ Summary(pl): Serwer VPN Name: openvpn Version: 2.0.1 -Release: 0.8 +Release: 1 License: GPL Group: Networking/Daemons -Source0: http://openvpn.net/beta/%{name}-%{version}_rc7.tar.gz -# Source0-md5: 258430d04413b430ceee6317f23c3b5f +Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz +# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version}_rc7 +%setup -q -n %{name}-%{version} %build %{__aclocal} @@ -93,6 +93,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/22 08:22:33 havner +- 2.0.1 final +- CAN-2005-2531, CAN-2005-2532 + Revision 1.91 2005/08/22 08:17:08 havner - dont use such releases ! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.91&r2=1.92&f=u From havner at pld-linux.org Mon Aug 22 10:22:47 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: openvpn-2.0.1.tar.gz Message-ID: <4959.1124698967@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.1.tar.gz fad7a08c0d68371c2c0e6428bcb98fa5 openvpn-2.0.1.tar.gz Size: 662428 bytes -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 10:46:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:28 2005 Subject: SOURCES (LINUX_2_6): dev-list, linux-static-dev.patch - revert /de... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 08:46:15 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - revert /dev/inotify minor change. ---- Files affected: SOURCES: dev-list (1.28 -> 1.29) , linux-static-dev.patch (1.1.6.2 -> 1.1.6.3) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.28 SOURCES/dev-list:1.29 --- SOURCES/dev-list:1.28 Fri Aug 19 16:58:17 2005 +++ SOURCES/dev-list Mon Aug 22 10:46:10 2005 @@ -3932,7 +3932,7 @@ %dev(c,185,1) %attr(600,root,root) /dev/intermezzo1 %dev(c,185,2) %attr(600,root,root) /dev/intermezzo2 %dev(c,185,3) %attr(600,root,root) /dev/intermezzo3 -%dev(c,10,62) %attr(444,root,root) /dev/inotify +%dev(c,10,61) %attr(444,root,root) /dev/inotify %dev(c,95,3) %attr(600,root,root) /dev/ipauth %dev(c,254,0) %attr(600,root,root) /dev/ipmi0 %dev(c,10,173) %attr(600,root,root) /dev/ipmikcs ================================================================ Index: SOURCES/linux-static-dev.patch diff -u SOURCES/linux-static-dev.patch:1.1.6.2 SOURCES/linux-static-dev.patch:1.1.6.3 --- SOURCES/linux-static-dev.patch:1.1.6.2 Fri Aug 19 16:58:17 2005 +++ SOURCES/linux-static-dev.patch Mon Aug 22 10:46:10 2005 @@ -5,7 +5,7 @@ if (misc->minor == MISC_DYNAMIC_MINOR) { - int i = DYNAMIC_MINORS; -+ int i = DYNAMIC_MINORS - 2 /* reserved */; ++ int i = DYNAMIC_MINORS - 3 /* reserved */; while (--i >= 0) if ( (misc_minors[i>>3] & (1 << (i&7))) == 0) break; @@ -27,7 +27,7 @@ static struct miscdevice inotify_device = { - .minor = MISC_DYNAMIC_MINOR, -+ .minor = 62 /* MISC_DYNAMIC_MINOR */, ++ .minor = 61 /* MISC_DYNAMIC_MINOR */, .name = "inotify", .fops = &inotify_fops, }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SOURCES/linux-static-dev.patch?r1=1.1.6.2&r2=1.1.6.3&f=u From glen at pld-linux.org Mon Aug 22 11:31:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: openvpn.spec - initscript is not config In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:31:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initscript is not config ---- Files affected: SPECS: openvpn.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.92 SPECS/openvpn.spec:1.93 --- SPECS/openvpn.spec:1.92 Mon Aug 22 10:22:33 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:31:14 2005 @@ -83,7 +83,7 @@ %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/openvpn %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name} -%attr(754,root,root) %config(noreplace) /etc/rc.d/init.d/%{name} +%attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man?/* %dir /var/run/openvpn @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/22 09:31:14 glen +- initscript is not config + Revision 1.92 2005/08/22 08:22:33 havner - 2.0.1 final - CAN-2005-2531, CAN-2005-2532 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.92&r2=1.93&f=u From glen at pld-linux.org Mon Aug 22 11:33:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: openvpn.spec - simplify %prep In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:33:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - simplify %prep ---- Files affected: SPECS: openvpn.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.93 SPECS/openvpn.spec:1.94 --- SPECS/openvpn.spec:1.93 Mon Aug 22 11:31:14 2005 +++ SPECS/openvpn.spec Mon Aug 22 11:33:20 2005 @@ -34,7 +34,7 @@ internet. %prep -%setup -q -n %{name}-%{version} +%setup -q %build %{__aclocal} @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/22 09:33:20 glen +- simplify %prep + Revision 1.93 2005/08/22 09:31:14 glen - initscript is not config @@ -375,9 +378,9 @@ - doesn't seem to build on Ra (old automake/autoconf) Revision 1.2 2002/05/21 23:14:19 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.1 2002/03/25 12:03:11 misiek - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.93&r2=1.94&f=u From glen at pld-linux.org Mon Aug 22 11:48:00 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: PLD-doc: uid_gid.db.txt - corrections In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 09:48:00 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - corrections ---- Files affected: PLD-doc: uid_gid.db.txt (1.181 -> 1.182) ---- Diffs: ================================================================ Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.181 PLD-doc/uid_gid.db.txt:1.182 --- PLD-doc/uid_gid.db.txt:1.181 Mon Aug 22 10:09:13 2005 +++ PLD-doc/uid_gid.db.txt Mon Aug 22 11:47:55 2005 @@ -166,7 +166,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner ============================================================================ @@ -329,7 +329,7 @@ 151 bopm bopm Blitzed BOPM 152 newscache NewsCache 153 tuxaator tuxaator-init Tuxaator: IRC Bot/Dictionary -154 jserv jserv-init ApacheJServ standalone +154 jserv ApacheJServ-init ApacheJServ standalone 210 qscand qmail-scanner 1000 users setup 65500 tpexec setup kernel 2.4.+ - grsecurity ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.181&r2=1.182&f=u From glen at pld-linux.org Mon Aug 22 12:21:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: mysql-connector-j.spec (NEW) - new In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:21:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: mysql-connector-j.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u /dev/null SPECS/mysql-connector-j.spec:1.1 --- /dev/null Mon Aug 22 12:21:35 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:21:26 2005 @@ -0,0 +1,70 @@ +# $Revision$, $Date$ +%bcond_without bindist # don't use binary distribution (not finished) +Summary: MySQL Connector/J +Name: mysql-connector-j +Version: 3.1.10 +Release: 0.1 +License: GPL v2+ + MySQL FLOSS Exception +Group: Libraries +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +# Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 +URL: http://www.mysql.com/products/connector/j/ +%{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL +and connect all corporate data, even in a heterogeneous environment. +MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC +feature set that supports the capabilities of MySQL. + +%package doc +Summary: Documentation for MySQL Connector/J +Group: Documentation + +%description doc +Documentation for MySQL Connector/J. + +%prep +%setup -q -n mysql-connector-java-%{version} +rm -f docs/README # duplicate + +%build +%{!?with_bindist:ant} + +%install +rm -rf $RPM_BUILD_ROOT + +%if %{with bindist} +install -d $RPM_BUILD_ROOT%{_javadir} +install mysql-connector-java-%{version}-bin.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java-%{version}.jar +ln -s mysql-connector-java-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/mysql-connector-java.jar +%else +%{error:not finished} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CHANGES EXCEPTIONS-CONNECTOR-J README +%{_javadir}/* + +%files doc +%defattr(644,root,root,755) +%doc docs + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:21:26 glen +- new + ================================================================ From glen at pld-linux.org Mon Aug 22 12:22:22 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: mysql-connector-j.spec - updated description In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:22:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated description ---- Files affected: SPECS: mysql-connector-j.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.1 SPECS/mysql-connector-j.spec:1.2 --- SPECS/mysql-connector-j.spec:1.1 Mon Aug 22 12:21:26 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:22:17 2005 @@ -22,6 +22,8 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. + %package doc Summary: Documentation for MySQL Connector/J Group: Documentation @@ -65,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:22:17 glen +- updated description + Revision 1.1 2005/08/22 10:21:26 glen - new ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Mon Aug 22 12:23:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <14816.1124706183@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: mysql-connector-java-3.1.10.tar.gz Message-ID: <15411.1124706216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz Size: 6892037 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 12:29:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS: mysql-connector-j.spec - adapterized, no extra subdir on -d... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 10:29:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterized, no extra subdir on -doc package ---- Files affected: SPECS: mysql-connector-j.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.2 SPECS/mysql-connector-j.spec:1.3 --- SPECS/mysql-connector-j.spec:1.2 Mon Aug 22 12:22:17 2005 +++ SPECS/mysql-connector-j.spec Mon Aug 22 12:29:40 2005 @@ -6,7 +6,7 @@ Release: 0.1 License: GPL v2+ + MySQL FLOSS Exception Group: Libraries -Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/mysql-connector-java-3.1.10.tar.gz +Source0: http://mysql.mirror.ok.ee/Downloads/Connector-J/%{name}ava-%{version}.tar.gz # Source0-md5: 337f7f31e726fb615d3f4f062030d1b5 URL: http://www.mysql.com/products/connector/j/ %{!?with_bindist:BuildRequires: jakarta-ant >= 1.5} @@ -22,7 +22,7 @@ MySQL Connector/J is a Type IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. -MySQL Connector/J is the official JDBC driver for MySQL. +MySQL Connector/J is the official JDBC driver for MySQL. %package doc Summary: Documentation for MySQL Connector/J @@ -59,7 +59,7 @@ %files doc %defattr(644,root,root,755) -%doc docs +%doc docs/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -67,9 +67,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 10:29:40 glen +- adapterized, no extra subdir on -doc package + Revision 1.2 2005/08/22 10:22:17 glen - updated description Revision 1.1 2005/08/22 10:21:26 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.2&r2=1.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:28 2005 Subject: SPECS (DEVEL): abiword.spec - verison 2.3.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 10:39:12 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - verison 2.3.5 ---- Files affected: SPECS: abiword.spec (1.106.2.2 -> 1.106.2.3) ---- Diffs: ================================================================ Index: SPECS/abiword.spec diff -u SPECS/abiword.spec:1.106.2.2 SPECS/abiword.spec:1.106.2.3 --- SPECS/abiword.spec:1.106.2.2 Tue Jul 26 00:19:22 2005 +++ SPECS/abiword.spec Mon Aug 22 12:39:04 2005 @@ -11,13 +11,13 @@ Summary: Multi-platform word processor Summary(pl): Wieloplatformowy procesor tekstu Name: abiword -Version: 2.3.4 +Version: 2.3.5 Release: 1 Epoch: 1 License: GPL Group: X11/Applications Source0: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2 -# Source0-md5: b205d8bb5240fdcb126daf8a7a9e45c8 +# Source0-md5: 2b2f2b5f5379b6dd7fe4145b3f7a28d4 Patch0: %{name}-desktop.patch Patch1: %{name}-home_etc.patch Patch2: %{name}-mailmerge.patch @@ -958,6 +958,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106.2.3 2005/08/22 10:39:04 aflinta +- verison 2.3.5 + Revision 1.106.2.2 2005/07/25 22:19:22 freetz - renumbered patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.106.2.2&r2=1.106.2.3&f=u From aflinta at pld-linux.org Mon Aug 22 12:39:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: abiword-2.3.5.tar.bz2 Message-ID: <25708.1124707190@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.abisource.com/downloads/abiword/2.3.5/source/abiword-2.3.5.tar.bz2 2b2f2b5f5379b6dd7fe4145b3f7a28d4 abiword-2.3.5.tar.bz2 Size: 24112015 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:50 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:28 2005 Subject: DISTFILES: kchmviewer-1.0.tar.gz Message-ID: <29803.1124707550@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/kchmviewer/kchmviewer-1.0.tar.gz 0f9595cbb13eb950261e660c168dc033 kchmviewer-1.0.tar.gz Size: 558754 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 12:45:49 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: kchmviewer.spec (NEW) - init In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:45:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init ---- Files affected: SPECS: kchmviewer.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u /dev/null SPECS/kchmviewer.spec:1.1 --- /dev/null Mon Aug 22 12:45:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:45:44 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_with kde # enable KDE support +%bcond_without arts # build without aRts default=no +# +Summary: KchmViewer is a chm (MS HTML help file format) viewer +Name: kchmviewer +Version: 1.0 +Release: 0.6 +License: GPL v2 +Group: Applications/Publishing +Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz +# Source0-md5: 0f9595cbb13eb950261e660c168dc033 +URL: http://kchmviewer.sourceforge.net/ +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +%{?with_kde:BuildRequires: kdelibs-devel} +BuildRequires: qt-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget +library, and does not depend on KDE or Gnome. However, it may be +compiled with full KDE support, including KDE widgets and KIO/KHTML. + +%prep +%setup -q + +%build +%configure \ + %{?with_kde:--with-kde} + %{?without_arts:--without-arts} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc ChangeLog +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/22 10:45:44 spider +- init + ================================================================ From spider at pld-linux.org Mon Aug 22 12:47:54 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: kchmviewer.spec - missing br In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 10:47:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br ---- Files affected: SPECS: kchmviewer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.1 SPECS/kchmviewer.spec:1.2 --- SPECS/kchmviewer.spec:1.1 Mon Aug 22 12:45:44 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 12:47:49 2005 @@ -16,6 +16,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel +BuildRequires: zlib-devel %{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/22 10:47:49 spider +- missing br + Revision 1.1 2005/08/22 10:45:44 spider - init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.1&r2=1.2&f=u From havner at pld-linux.org Mon Aug 22 13:19:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: evolution-webcal.spec - rebuild against gnutls SONAME chang... In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:19:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gnutls SONAME change - rel 2 ---- Files affected: SPECS: evolution-webcal.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20 SPECS/evolution-webcal.spec:1.21 --- SPECS/evolution-webcal.spec:1.20 Wed Apr 13 21:25:21 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 13:19:20 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal Version: 2.2.1 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.2/%{name}-%{version}.tar.bz2 @@ -72,6 +72,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 11:19:20 havner +- rebuild against gnutls SONAME change +- rel 2 + Revision 1.20 2005/04/13 19:25:21 paladine - updated to 2.2.1 - new style macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20&r2=1.21&f=u From havner at pld-linux.org Mon Aug 22 13:53:12 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: gpc.spec - rebuild against gcc 3.3.6 - rel 2 In-Reply-To: References: Message-ID: Author: havner Date: Mon Aug 22 11:53:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rebuild against gcc 3.3.6 - rel 2 ---- Files affected: SPECS: gpc.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gpc.spec diff -u SPECS/gpc.spec:1.26 SPECS/gpc.spec:1.27 --- SPECS/gpc.spec:1.26 Mon Jun 20 10:17:40 2005 +++ SPECS/gpc.spec Mon Aug 22 13:53:05 2005 @@ -7,7 +7,7 @@ Summary(pl): Kompilator Pascala GNU Name: gpc Version: %{GPC_VERSION} -Release: 1 +Release: 2 License: GPL Group: Development/Languages Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{GCC_VERSION}/gcc-%{GCC_VERSION}.tar.bz2 @@ -151,6 +151,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 11:53:05 havner +- rebuild against gcc 3.3.6 +- rel 2 + Revision 1.26 2005/06/20 08:17:40 qboosh - use gcc 3.3.6 (gpc patch for 3.3.5 still applies) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpc.spec?r1=1.26&r2=1.27&f=u From adamg at pld-linux.org Mon Aug 22 14:11:41 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: abridge.spec, libcfu.spec, muttprint.spec, patchutils.spec, ... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:11:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: ---- Files affected: SPECS: abridge.spec (1.7 -> 1.8) , libcfu.spec (1.2 -> 1.3) , muttprint.spec (1.27 -> 1.28) , patchutils.spec (1.27 -> 1.28) , pcre.spec (1.62 -> 1.63) , php-pear-HTML_Template_IT.spec (1.17 -> 1.18) , php-pear-MDB2.spec (1.7 -> 1.8) , php.spec (1.464 -> 1.465) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.62&r2=1.63&f=u http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php.spec?r1=1.464&r2=1.465&f=u From adamg at pld-linux.org Mon Aug 22 14:13:38 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: abridge.spec - reverted last commit In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: abridge.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/abridge.spec diff -u SPECS/abridge.spec:1.8 SPECS/abridge.spec:1.9 --- SPECS/abridge.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/abridge.spec Mon Aug 22 14:13:33 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: wxGTK2-devel -BuildRequires: wxWidgets-devel +BuildRequires: wxWindows-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -34,7 +34,7 @@ %{__autoheader} %{__automake} %configure \ - --with-wx-config=/usr/bin/wx-gtk2-ansi-config + --with-wx-config=/usr/bin/wxgtk2-2.4-config %{__make} %install @@ -58,8 +58,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.9 2005/08/22 12:13:33 adamg +- reverted last commit Revision 1.7 2005/05/21 15:59:17 ankry - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.8&r2=1.9&f=u From adamg at pld-linux.org Mon Aug 22 14:15:09 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: libcfu.spec, muttprint.spec, patchutils.spec - reverted las... In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:15:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SPECS: libcfu.spec (1.3 -> 1.4) , muttprint.spec (1.28 -> 1.29) , patchutils.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/libcfu.spec diff -u SPECS/libcfu.spec:1.3 SPECS/libcfu.spec:1.4 --- SPECS/libcfu.spec:1.3 Mon Aug 22 14:11:35 2005 +++ SPECS/libcfu.spec Mon Aug 22 14:15:03 2005 @@ -9,7 +9,6 @@ Source0: http://dl.sourceforge.net/libcfu/%{name}-%{version}.tar.bz2 # Source0-md5: 5e9e1a474119c8340509323f81c4c527 Patch0: %{name}-shared.patch -Patch1: %{name}-64bit.patch URL: http://www.sourceforge.net/projects/libcfu/ BuildRequires: autoconf BuildRequires: automake @@ -56,7 +55,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -110,8 +108,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.3 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.4 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.2 2005/08/02 22:07:17 qboosh - BR: ac,am,lt ================================================================ Index: SPECS/muttprint.spec diff -u SPECS/muttprint.spec:1.28 SPECS/muttprint.spec:1.29 --- SPECS/muttprint.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/muttprint.spec Mon Aug 22 14:15:03 2005 @@ -2,12 +2,12 @@ Summary: Formats the output of mail clients to a good-looking printing Summary(pl): Program formatuj?cy wyj?cie klient?w pocztowych w dobrze wygl?daj?cy wydruk Name: muttprint -Version: 0.72d +Version: 0.72c Release: 1 License: GPL Group: Applications/Printing Source0: http://dl.sourceforge.net/muttprint/%{name}-%{version}.tar.gz -# Source0-md5: cab04c11b7dfb29a9c3a6348a07b86a3 +# Source0-md5: b3e99f8f6f37c0711f6e20f8cf3ef6cb URL: http://muttprint.sourceforge.net/ Requires: perl-Text-Iconv Requires: psutils @@ -28,7 +28,7 @@ %{__make} -C langinfo clean %build -%{__make} \ +%{__make} -C langinfo \ CC="%{__cc}" \ CCFLAGS="%{rpmcflags}" @@ -90,8 +90,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2005/06/21 19:05:22 czucz - changed md5 ================================================================ Index: SPECS/patchutils.spec diff -u SPECS/patchutils.spec:1.28 SPECS/patchutils.spec:1.29 --- SPECS/patchutils.spec:1.28 Mon Aug 22 14:11:35 2005 +++ SPECS/patchutils.spec Mon Aug 22 14:15:03 2005 @@ -5,12 +5,12 @@ Summary(ru): ????? ???????????? ??? ?????? ? patch-??????? Summary(uk): ????? ???????????? ??? ?????? ? patch-??????? Name: patchutils -Version: 0.2.31 +Version: 0.2.30 Release: 1 License: GPL Group: Applications/Text Source0: http://cyberelk.net/tim/data/%{name}/stable/%{name}-%{version}.tar.bz2 -# Source0-md5: 3aa902cb7a57a4aa09427de603ebf17b +# Source0-md5: 6a33888e34c23f7fde09a6e94e4f5950 Patch1: %{name}-fixcvsdiff.patch URL: http://cyberelk.net/tim/patchutils/ BuildRequires: autoconf @@ -170,8 +170,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.28 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.29 2005/08/22 12:15:03 adamg +- reverted last commit Revision 1.27 2004/10/29 22:55:04 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcfu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/muttprint.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/patchutils.spec?r1=1.28&r2=1.29&f=u From adamg at pld-linux.org Mon Aug 22 14:17:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: pcre.spec - fixed previous changelog entry In-Reply-To: References: Message-ID: Author: adamg Date: Mon Aug 22 12:17:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed previous changelog entry ---- Files affected: SPECS: pcre.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.63 SPECS/pcre.spec:1.64 --- SPECS/pcre.spec:1.63 Mon Aug 22 14:11:35 2005 +++ SPECS/pcre.spec Mon Aug 22 14:16:57 2005 @@ -275,8 +275,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.64 2005/08/22 12:16:57 adamg +- fixed previous changelog entry + Revision 1.63 2005/08/22 12:11:35 adamg -*** empty log message *** +- updated to 6.3 +- -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.63&r2=1.64&f=u From adamg at pld-linux.org Mon Aug 22 14:17:06 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: pcre-6.3.tar.bz2 Message-ID: <27121.1124713026@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.3.tar.bz2 e6779ead12cd20fa055fb3a05b004f2c pcre-6.3.tar.bz2 Size: 565852 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 14:23:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES: ApacheJServ.init - still not finished In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 12:23:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - still not finished ---- Files affected: SOURCES: ApacheJServ.init (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ.init diff -u SOURCES/ApacheJServ.init:1.1 SOURCES/ApacheJServ.init:1.2 --- SOURCES/ApacheJServ.init:1.1 Fri Aug 19 19:14:27 2005 +++ SOURCES/ApacheJServ.init Mon Aug 22 14:23:36 2005 @@ -27,14 +27,13 @@ exit 0 fi - # See how we were called. case "$1" in start) # Check if the service is already running? if [ ! -f /var/lock/subsys/jserv ]; then msg_starting jserv - daemon jserv + daemon --user jserv jserv RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/jserv else @@ -58,12 +57,10 @@ ;; reload) if [ -f /var/lock/subsys/jserv ]; then - # show "Reload %s service" jserv msg_reloading jserv killproc jserv -HUP RETVAL=$? else - # show "%s service is not running." jserv msg_not_running jserv >&2 RETVAL=7 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/ApacheJServ.init?r1=1.1&r2=1.2&f=u From pluto at pld-linux.org Mon Aug 22 15:00:56 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES: qt4-buildsystem.patch, qt4-tools.patch - updated for 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:00:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.0.1. ---- Files affected: SOURCES: qt4-buildsystem.patch (1.4 -> 1.5) , qt4-tools.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/qt4-buildsystem.patch diff -u SOURCES/qt4-buildsystem.patch:1.4 SOURCES/qt4-buildsystem.patch:1.5 --- SOURCES/qt4-buildsystem.patch:1.4 Mon May 16 14:39:06 2005 +++ SOURCES/qt4-buildsystem.patch Mon Aug 22 15:00:49 2005 @@ -15,15 +15,14 @@ --- qt-copy/tools/assistant/lib/lib.pro.orig 2005-05-13 16:39:04.000000000 +0200 +++ qt-copy/tools/assistant/lib/lib.pro 2005-05-13 20:21:32.014137768 +0200 -@@ -4,9 +4,9 @@ +@@ -4,9 +4,8 @@ VERSION = 1.0 CONFIG += qt warn_on --CONFIG += staticlib debug_and_release -+CONFIG += dll debug_and_release +-CONFIG += staticlib debug_and_release ++CONFIG += dll debug_and_release mac:unix:CONFIG += explicitlib -CONFIG -= dll -+ HEADERS = qassistantclient.h SOURCES = qassistantclient.cpp ================================================================ Index: SOURCES/qt4-tools.patch diff -u SOURCES/qt4-tools.patch:1.3 SOURCES/qt4-tools.patch:1.4 --- SOURCES/qt4-tools.patch:1.3 Thu Jun 16 21:20:09 2005 +++ SOURCES/qt4-tools.patch Mon Aug 22 15:00:50 2005 @@ -7,6 +7,6 @@ - porting + porting \ + qvfb - !contains(QT_PRODUCT, .*Console.*):SUBDIRS += designer + !contains(QT_EDITION, Console):SUBDIRS += designer unix:SUBDIRS += qtconfig } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qt4-buildsystem.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.3&r2=1.4&f=u From pluto at pld-linux.org Mon Aug 22 15:01:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: qt4.spec - updated to 4.0.1. In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 13:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.0.1. ---- Files affected: SPECS: qt4.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.35 SPECS/qt4.spec:1.36 --- SPECS/qt4.spec:1.35 Tue Aug 16 12:02:06 2005 +++ SPECS/qt4.spec Mon Aug 22 15:01:45 2005 @@ -28,20 +28,18 @@ %define _withsql 1 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}} -%define _packager djurban - Summary: The Qt GUI application framework Summary(es): Biblioteca para ejecutar aplicaciones GUI Qt Summary(pl): Biblioteka Qt do tworzenia GUI Summary(pt_BR): Estrutura para rodar aplica??es GUI Qt Name: qt4 -Version: 4.0.0 +Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.3 +Release: 0.1 License: GPL/QPL Group: X11/Libraries -Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-%{version}.tar.bz2 -# Source0-md5: a6183269fab293282daf2da9ac940577 +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz +# Source0-md5: 2db4a4d797d37d0605b776420327503a Source2: qtconfig.desktop Source3: designer.desktop Source4: assistant.desktop @@ -598,15 +596,15 @@ %prep #setup -q -n %{_name}-copy-%{_snap} -%setup -q -n qt-x11-opensource-desktop-%{version} +%setup -q -n qt-x11-opensource-src-%{version} %patch0 -p1 %if %{with dont_enable} %patch1 -p1 %patch3 -p1 %endif -%patch2 -p1 -b .niedakh -%patch4 -p1 -b .niedakh -%patch8 -p1 -b .niedakh +%patch2 -p1 +%patch4 -p1 +%patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -1137,6 +1135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/22 13:01:45 pluto +- updated to 4.0.1. + Revision 1.35 2005/08/16 10:02:06 prism - commas in cflags are allowed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.35&r2=1.36&f=u From pluto at pld-linux.org Mon Aug 22 15:02:44 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: qt-x11-opensource-src-4.0.1.tar.gz Message-ID: <27767.1124715764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.0.1.tar.gz 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz Size: 20141717 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Mon Aug 22 15:08:04 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: kchmviewer.spec - spaces -> tabs In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 13:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs ---- Files affected: SPECS: kchmviewer.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.2 SPECS/kchmviewer.spec:1.3 --- SPECS/kchmviewer.spec:1.2 Mon Aug 22 12:47:49 2005 +++ SPECS/kchmviewer.spec Mon Aug 22 15:07:58 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_with kde # enable KDE support +%bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # Summary: KchmViewer is a chm (MS HTML help file format) viewer @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/22 13:07:58 spider +- spaces -> tabs + Revision 1.2 2005/08/22 10:47:49 spider - missing br ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.2&r2=1.3&f=u From saq at pld-linux.org Mon Aug 22 15:11:40 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES: mutt-paths.patch - fixed In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:11:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed ---- Files affected: SOURCES: mutt-paths.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mutt-paths.patch diff -u SOURCES/mutt-paths.patch:1.1 SOURCES/mutt-paths.patch:1.2 --- SOURCES/mutt-paths.patch:1.1 Sun Aug 21 21:38:05 2005 +++ SOURCES/mutt-paths.patch Mon Aug 22 15:11:35 2005 @@ -19,7 +19,7 @@ -ac_aux_path_sendmail=/usr/sbin:/usr/lib -AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail) -+SENDMAIL=/usr/sbin/sendmail ++ac_cv_path_SENDMAIL=/usr/sbin/sendmail AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) OPS='$(srcdir)/OPS' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mutt-paths.patch?r1=1.1&r2=1.2&f=u From saq at pld-linux.org Mon Aug 22 15:12:07 2005 From: saq at pld-linux.org (saq) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: mutt.spec - rel 10 for fixed paths.patch In-Reply-To: References: Message-ID: Author: saq Date: Mon Aug 22 13:12:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for fixed paths.patch ---- Files affected: SPECS: mutt.spec (1.182 -> 1.183) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.182 SPECS/mutt.spec:1.183 --- SPECS/mutt.spec:1.182 Mon Aug 22 00:14:31 2005 +++ SPECS/mutt.spec Mon Aug 22 15:12:02 2005 @@ -20,7 +20,7 @@ Summary(uk): ??????? ?????????? ???????? Mutt Name: mutt Version: 1.4.2.1 -Release: 9 +Release: 10 Epoch: 6 License: GPL Group: Applications/Mail @@ -249,6 +249,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.183 2005/08/22 13:12:02 saq +- rel 10 for fixed paths.patch + Revision 1.182 2005/08/21 22:14:31 adamg - a year has passed, time for an integer release :) - release 9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.182&r2=1.183&f=u From paszczus at pld-linux.org Mon Aug 22 15:49:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: mldonkey-2.6.3.tar.bz2 Message-ID: <12316.1124718543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://savannah.nongnu.org/download/mldonkey/mldonkey-2.6.3.tar.bz2 5a71317970b0c5c2a50d3d4e98c14f41 mldonkey-2.6.3.tar.bz2 Size: 2660337 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 15:48:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: mldonkey.spec - updated to 2.6.3 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 13:48:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.3 ---- Files affected: SPECS: mldonkey.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.121 SPECS/mldonkey.spec:1.122 --- SPECS/mldonkey.spec:1.121 Thu Aug 11 17:33:56 2005 +++ SPECS/mldonkey.spec Mon Aug 22 15:48:54 2005 @@ -26,7 +26,7 @@ Name: mldonkey %define ocaml_ver 3.08.3 #%define patch_pack c -%define real_ver 2.6.1 +%define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} Version: %{real_ver} Release: 1 @@ -36,7 +36,7 @@ #Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.gz #Source0: http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/%{name}-%{real_ver}.tar.bz2 Source0: http://savannah.nongnu.org/download/mldonkey/%{name}-%{version}.tar.bz2 -# Source0-md5: 193c397a0cb22391275054cebfaa5d8a +# Source0-md5: 5a71317970b0c5c2a50d3d4e98c14f41 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.sh @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 13:48:54 paszczus +- updated to 2.6.3 + Revision 1.121 2005/08/11 15:33:56 paszczus - removed 2 entries from TODO - added R: nc (small package, so no sense to move mldonkey_command to -utils) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.121&r2=1.122&f=u From matkor at pld-linux.org Mon Aug 22 16:03:14 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: kdetv.spec - Autoupdated to 0.8.8-0.1. Builds. Not tested. In-Reply-To: References: Message-ID: Author: matkor Date: Mon Aug 22 14:03:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Autoupdated to 0.8.8-0.1. Builds. Not tested. ---- Files affected: SPECS: kdetv.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/kdetv.spec diff -u SPECS/kdetv.spec:1.21 SPECS/kdetv.spec:1.22 --- SPECS/kdetv.spec:1.21 Fri Apr 29 14:16:40 2005 +++ SPECS/kdetv.spec Mon Aug 22 16:03:09 2005 @@ -2,12 +2,12 @@ Summary: KDE Video4Linux Stream Capture Viewer Summary(pl): Przegl?darka strumienia Video4Linux dla KDE Name: kdetv -Version: 0.8.7 -Release: 1 +Version: 0.8.8 +Release: 0.1 License: GPL Group: X11/Applications/Multimedia Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: e69c429497dc715b00f75fdada523fe7 +# Source0-md5: 587885b528b3b737d3bce07526b7f8e8 Patch0: %{name}.desktop.patch URL: http://www.kdetv.org/ BuildRequires: OpenGL-devel @@ -88,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 14:03:09 matkor +- Autoupdated to 0.8.8-0.1. Builds. Not tested. + Revision 1.21 2005/04/29 12:16:40 charles - updated to 0.8.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdetv.spec?r1=1.21&r2=1.22&f=u From matkor at pld-linux.org Mon Aug 22 16:04:27 2005 From: matkor at pld-linux.org (matkor) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: kdetv-0.8.8.tar.bz2 Message-ID: <21004.1124719467@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dziegel.free.fr/releases/kdetv-0.8.8.tar.bz2 587885b528b3b737d3bce07526b7f8e8 kdetv-0.8.8.tar.bz2 Size: 1184833 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: lighttpd-1.4.1.tar.gz Message-ID: <7434.1124720970@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.lighttpd.net/download/lighttpd-1.4.1.tar.gz 3abffbe574fd835721760a37c00d3714 lighttpd-1.4.1.tar.gz Size: 759063 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 16:29:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lighttpd.spec - 1.4.1 - reviewed dependencies - mod_webdav ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:29:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.1 - reviewed dependencies - mod_webdav subpackage due extra deps ---- Files affected: SPECS: lighttpd.spec (1.120 -> 1.121) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.120 SPECS/lighttpd.spec:1.121 --- SPECS/lighttpd.spec:1.120 Sat Aug 20 18:07:43 2005 +++ SPECS/lighttpd.spec Mon Aug 22 16:29:20 2005 @@ -2,7 +2,8 @@ # TODO: # - test ldap and mysql (failed at this time) # - mysql issue: http://www.freebsd.org/cgi/query-pr.cgi?pr=76866 -# - gdbm for mod_trigger_b4_dl http://www.lighttpd.net/documentation/trigger_b4_dl.html +# - fam over gamin is possible, just configure doesn't check other than gamin +# - lua50 isn't properly detected # # NOTES: # - fcgi-devel is only used for the test-scripts @@ -10,16 +11,19 @@ # see http://article.gmane.org/gmane.comp.web.lighttpd:722 # # Conditional build for lighttpd: -%bcond_without xattr # with support of extended attributes (doesn't compile in 1.4.0) -%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) -%bcond_without largefile # without largefile support (see notes above) -%bcond_without ssl # disable ssl support -%bcond_without mysql # without mysql -%bcond_with ldap # with ldap -%bcond_with lua # enable LUA support in mod_cml -%bcond_with memcache # enable memcached support in mod_cml / mod_trigger_b4_dl -%bcond_with valgrind # compile code with valgrind support. -%bcond_with dirhide # with 'hide from dirlisting' hack +%bcond_without xattr # support of extended attributes +%bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) +%bcond_without largefile # largefile support (see notes above) +%bcond_without ssl # ssl support +%bcond_with mysql # mysql support in mod_mysql_vhost +%bcond_with ldap # ldap support in mod_auth +%bcond_with lua # LUA support in mod_cml +%bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl +%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gdbm # gdbm in mod_trigger_b4_dl +%bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) +%bcond_with valgrind # compile code with valgrind support. +%bcond_with dirhide # with 'hide from dirlisting' hack # Prerelease snapshot: DATE-TIME #define _snap 20050116-1743 @@ -30,17 +34,17 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 1 +%define _rel 0.1 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.0 +Version: 1.4.1 Release: %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)} Group: Networking/Daemons License: BSD Source0: %{_source} -# Source0-md5: 926a3603615c9edf5859977f1b8b6033 +# Source0-md5: 3abffbe574fd835721760a37c00d3714 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -54,12 +58,16 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bzip2-devel +%{?with_gamin:BuildRequires: gamin-devel} +%{?with_webdav_props:BuildRequires: sqlite3-devel} +%{?with_webdav_props:BuildRequires: libxml2-devel} BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} %{?with_lua:BuildRequires: lua50-devel} %{?with_memcache:BuildRequires: libmemcache-devel} +%{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel BuildRequires: rpmbuild(macros) >= 1.202 %{?debug:BuildRequires: valgrind} @@ -146,6 +154,28 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%package mod_webdav +Summary: WebDAV module for lighttpd +Group: Networking/Daemons +URL: http://www.lighttpd.net/documentation/webdav.html +Requires: %{name} = %{version}-%{release} + +%description mod_webdav +The WebDAV module is a very minimalistic implementation of RFC 2518. +Minimalistic means that not all operations are implementated yet. + +So far we have +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT + +and the usual GET, POST, HEAD from HTTP/1.1. + +So far mounting a webdav resource into Windows XP works and the basic +litmus tests are passed. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -166,21 +196,23 @@ %patch2 -p1 %build -sed -i -e 's#stat_cache_attr_get#stat_cache_entry_attr_get#g' src/stat_cache.c %{__libtoolize} %{__aclocal} %{__autoconf} %configure \ + %{!?with_ipv6:--disable-ipv6} \ + %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ %{?with_xattr:--with-attr} \ %{?with_mysql:--with-mysql} \ %{?with_ldap:--with-ldap} \ - %{!?with_ipv6:--disable-ipv6} \ - %{!?with_largefile:--disable-lfs} \ %{?with_ssl:--with-openssl} \ %{?with_lua:--with-lua} \ - %{?with_memcache:--with-memcache} + %{?with_memcache:--with-memcache} \ + %{?with_webdav_props:--with-webdav-props} \ + %{?with_gamin:--with-gamin} \ + %{?with_gdbm:--with-gdbm} %{__make} @@ -268,7 +300,6 @@ %attr(755,root,root) %{_libdir}/mod_status.so %attr(755,root,root) %{_libdir}/mod_userdir.so %attr(755,root,root) %{_libdir}/mod_usertrack.so -%attr(755,root,root) %{_libdir}/mod_webdav.so %attr(750,root,root) %dir /var/log/archiv/%{name} %dir %attr(750,lighttpd,root) /var/log/%{name} %attr(755,lighttpd,lighttpd) %{_lighttpddir} @@ -288,14 +319,20 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_cml.so +%if %{with mysql} %files mod_mysql_vhost %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_mysql_vhost.so +%endif %files mod_trigger_b4_dl %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/mod_trigger_b4_dl.so +%files mod_webdav +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/mod_webdav.so + %files -n spawn-fcgi %defattr(644,root,root,755) %doc doc/spawn-php.sh @@ -307,6 +344,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.121 2005/08/22 14:29:20 glen +- 1.4.1 +- reviewed dependencies +- mod_webdav subpackage due extra deps + Revision 1.120 2005/08/20 16:07:43 arekm - reenable xattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.120&r2=1.121&f=u From paszczus at pld-linux.org Mon Aug 22 16:35:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: nmm.spec - sorted BR In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:35:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BR ---- Files affected: SPECS: nmm.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/nmm.spec diff -u SPECS/nmm.spec:1.11 SPECS/nmm.spec:1.12 --- SPECS/nmm.spec:1.11 Thu Aug 18 00:45:31 2005 +++ SPECS/nmm.spec Mon Aug 22 16:35:41 2005 @@ -15,11 +15,11 @@ BuildRequires: automake BuildRequires: avifile-devel BuildRequires: htmldoc -BuildRequires: libtool BuildRequires: libdivxdecore-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel BuildRequires: libshout-devel +BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: lirc-devel BuildRequires: live @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 14:35:41 paszczus +- sorted BR + Revision 1.11 2005/08/17 22:45:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nmm.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Mon Aug 22 16:36:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lua50.spec - parallel make unfriendly make In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 14:36:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - parallel make unfriendly make ---- Files affected: SPECS: lua50.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.19 SPECS/lua50.spec:1.20 --- SPECS/lua50.spec:1.19 Thu Aug 11 11:46:18 2005 +++ SPECS/lua50.spec Mon Aug 22 16:36:22 2005 @@ -116,7 +116,7 @@ %{__make} clean %endif -%{__make} all so sobin \ +%{__make} -j1 all so sobin \ CC="%{__cc}" \ MYCFLAGS="%{rpmcflags} -fPIC" \ EXTRA_DEFS="-DPIC -D_GNU_SOURCE" @@ -185,6 +185,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:36:22 glen +- parallel make unfriendly make + Revision 1.19 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:43:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <19209.1124721809@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:43:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: rlocate.spec - updated to 0.3.2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:43:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.2 ---- Files affected: SPECS: rlocate.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.26 SPECS/rlocate.spec:1.27 --- SPECS/rlocate.spec:1.26 Tue May 31 09:22:46 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:43:26 2005 @@ -19,7 +19,7 @@ Summary: Finds files on a system via a central database Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate -Version: 0.3.1 +Version: 0.3.2 %define _rel 0.1 Release: %{_rel} License: GPL @@ -239,6 +239,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/22 14:43:26 paszczus +- updated to 0.3.2 + Revision 1.26 2005/05/31 07:22:46 glen - sgid rlocate the rlocate binary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.26&r2=1.27&f=u From blekot at pld-linux.org Mon Aug 22 16:50:11 2005 From: blekot at pld-linux.org (blekot) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: darkice.spec - BR: s/lame-libs-devel/lame-libs-static/ In-Reply-To: References: Message-ID: Author: blekot Date: Mon Aug 22 14:50:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: s/lame-libs-devel/lame-libs-static/ ---- Files affected: SPECS: darkice.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.19 SPECS/darkice.spec:1.20 --- SPECS/darkice.spec:1.19 Thu Oct 28 12:15:41 2004 +++ SPECS/darkice.spec Mon Aug 22 16:50:06 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-devel +BuildRequires: lame-libs-static BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/22 14:50:06 blekot +- BR: s/lame-libs-devel/lame-libs-static/ + Revision 1.19 2004/10/28 10:15:41 paladine - "MP3" unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.19&r2=1.20&f=u From paszczus at pld-linux.org Mon Aug 22 16:50:33 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: ERRORS: rlocate-0.3.2.tar.gz Message-ID: <24301.1124722233@distfiles.pld-linux.org> FATAL: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz md5 mismatch, needed d65e350fe83480cc1db40912a0dfa87b, got e3c8371a6659bf1e0d9d1fe02c0efe6d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 16:50:34 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: rlocate.spec - added init script (temporary from redhat) In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 14:50:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added init script (temporary from redhat) ---- Files affected: SPECS: rlocate.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.27 SPECS/rlocate.spec:1.28 --- SPECS/rlocate.spec:1.27 Mon Aug 22 16:43:26 2005 +++ SPECS/rlocate.spec Mon Aug 22 16:50:29 2005 @@ -35,10 +35,11 @@ %endif BuildRequires: libtool BuildRequires: perl-base -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.228 Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(postun): /usr/sbin/groupdel +Requires(post,preun): /sbin/chkconfig Requires: crondaemon Provides: group(rlocate) Conflicts: slocate @@ -159,6 +160,8 @@ %install rm -rf $RPM_BUILD_ROOT +install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -197,6 +200,16 @@ %groupremove rlocate fi +%post init +/sbin/chkconfig --add %{name} +%service %{name} restart + +%preun init +if [ "$1" = "0" ]; then + %service -q %{name} stop + /sbin/chkconfig --del %{name} +fi + %if %{with kernel} %files -n kernel-misc-%{name} %defattr(644,root,root,755) @@ -211,6 +224,9 @@ %endif %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} + %if %{with userspace} %files %defattr(644,root,root,755) @@ -239,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/22 14:50:29 paszczus +- added init script (temporary from redhat) + Revision 1.27 2005/08/22 14:43:26 paszczus - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.27&r2=1.28&f=u From pawcioos at pld-linux.org Mon Aug 22 16:51:55 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: tomboy-0.3.3.tar.gz Message-ID: <25171.1124722315@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.beatniksoftware.com/tomboy/releases/tomboy-0.3.3.tar.gz 7ad987216b484f747f53aa7f9055a46b tomboy-0.3.3.tar.gz Size: 608252 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Mon Aug 22 16:51:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: tomboy.spec - updated to 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 14:51:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.3 ---- Files affected: SPECS: tomboy.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.8 SPECS/tomboy.spec:1.9 --- SPECS/tomboy.spec:1.8 Sun May 15 16:33:03 2005 +++ SPECS/tomboy.spec Mon Aug 22 16:51:48 2005 @@ -2,12 +2,12 @@ Summary: Tomboy - a desktop note-taking application Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy -Version: 0.3.2 +Version: 0.3.3 Release: 1 License: GPL Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz -# Source0-md5: cb4c48860601e636e075644c40b973de +# Source0-md5: 7ad987216b484f747f53aa7f9055a46b Source1: %{name}.desktop #Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ @@ -86,12 +86,14 @@ %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins +%{_libdir}/dbus-1.0/services/*.service %{_libdir}/%{name}/Plugins/*.dll %{_libdir}/bonobo/servers/* %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png +%{_pkgconfigdir}/tomboy-plugins.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -99,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 14:51:48 pawcioos +- updated to 0.3.3 + Revision 1.8 2005/05/15 14:33:03 pawcioos - updated to 0.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.8&r2=1.9&f=u From wolf at pld-linux.org Mon Aug 22 17:07:53 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: f-spot.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 15:07:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: f-spot.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.16 SPECS/f-spot.spec:1.17 --- SPECS/f-spot.spec:1.16 Sat Aug 20 00:16:32 2005 +++ SPECS/f-spot.spec Mon Aug 22 17:07:47 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot @@ -78,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 15:07:47 wolf +- mono auto deps + Revision 1.16 2005/08/19 22:16:32 aflinta - rebuild with better gtk-sharp ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.16&r2=1.17&f=u From paszczus at pld-linux.org Mon Aug 22 17:16:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: CVSROOT: users - chwilowo, gmail.com In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - chwilowo, gmail.com ---- Files affected: CVSROOT: users (1.384 -> 1.385) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.384 CVSROOT/users:1.385 --- CVSROOT/users:1.384 Wed Jul 20 18:40:45 2005 +++ CVSROOT/users Mon Aug 22 17:16:05 2005 @@ -167,7 +167,7 @@ osamyn:osamyn@easynet.be:Olivier Samyn paladine:paladine@pld-dc.org:Kamil Kosi?ski:paladine@chrome.pl pascalek:rafi@pers.pl:Rafa? Cygnarowski:pascalek79@jabber.org -paszczus:paszczus@darpa.pl:S?awomir Paszkiewicz:paszczus@pld-linux.org +paszczus:paszczus@gmail.com:S?awomir Paszkiewicz:paszczus@pld-linux.org patrys:patrys@pld-dc.org:Patryk Zawadzki:patrys@pld-linux.org pawcioos:pawcio-s@go2.pl:Pawe? Synowiec:pawcioos@pld-linux.org pawelb:pawelb@students.mimuw.edu.pl:Pawe? Boguszewski:pawelb@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.384&r2=1.385&f=u From glen at pld-linux.org Mon Aug 22 17:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES: lighttpd-lua-pkgconfig.patch (NEW) - use pkgconfig first ... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:17:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use pkgconfig first to find lua, this way configure is able to pick up lua libs ---- Files affected: SOURCES: lighttpd-lua-pkgconfig.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-lua-pkgconfig.patch diff -u /dev/null SOURCES/lighttpd-lua-pkgconfig.patch:1.1 --- /dev/null Mon Aug 22 17:17:52 2005 +++ SOURCES/lighttpd-lua-pkgconfig.patch Mon Aug 22 17:17:46 2005 @@ -0,0 +1,61 @@ +--- ./configure.in 2005-08-22 13:56:17.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/configure.in 2005-08-22 18:03:23.000000000 +0300 +@@ -328,21 +328,35 @@ + + AC_MSG_RESULT($WITH_LUA) + if test "$WITH_LUA" != "no"; then ++ PKG_CHECK_MODULES(LUA, lua50, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ ++ if test $succeeded = no; then ++ PKG_CHECK_MODULES(LUA, lua, [ ++ AC_DEFINE([HAVE_LUA], [1], [liblua]) ++ AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) ++ ]) ++ fi ++ ++ if test $succeeded = no; then + AC_PATH_PROG(LUACONFIG, lua-config) + if test x"$LUACONFIG" != x; then + LUA_CFLAGS=`$LUACONFIG --include` +- LUA_LIB=`$LUACONFIG --libs --extralibs` ++ LUA_LIBS=`$LUACONFIG --libs --extralibs` + else + AC_CHECK_LIB(lua, lua_open, [ + AC_CHECK_HEADERS([lua.h],[ +- LUA_LIB=-llua ++ LUA_LIBS=-llua + AC_DEFINE([HAVE_LUA], [1], [liblua]) + AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) + ]) + ]) + fi + AC_SUBST(LUA_CFLAGS) +- AC_SUBST(LUA_LIB) ++ AC_SUBST(LUA_LIBS) ++ fi + fi + + +@@ -511,7 +525,7 @@ + fi + + plugins="mod_cml" +-if test ! "x$LUA_LIB" = x; then ++if test ! "x$LUA_LIBS" = x; then + do_build="$do_build $plugins" + else + no_build="$no_build $plugins" +--- ./src/Makefile.am 2005-08-20 12:16:29.000000000 +0300 ++++ ../lighttpd-1.4.1-pkgconfig/src/Makefile.am 2005-08-22 18:05:10.000000000 +0300 +@@ -78,7 +78,7 @@ + mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c + mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) + mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +-mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIB) ++mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS) + + lib_LTLIBRARIES += mod_trigger_b4_dl.la + mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c ================================================================ From glen at pld-linux.org Mon Aug 22 17:18:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lighttpd.spec - add pkgconfig support for locating lua libs In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:18:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pkgconfig support for locating lua libs ---- Files affected: SPECS: lighttpd.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.121 SPECS/lighttpd.spec:1.122 --- SPECS/lighttpd.spec:1.121 Mon Aug 22 16:29:20 2005 +++ SPECS/lighttpd.spec Mon Aug 22 17:18:39 2005 @@ -9,6 +9,9 @@ # - fcgi-devel is only used for the test-scripts # - disable largefile, if you have 2.4 kernel to get sendfile() support, and don't need > 2GB file requests, # see http://article.gmane.org/gmane.comp.web.lighttpd:722 +# - please make subpackages of modules that depend other modules than: +# - pcre (core binary needs it too) +# - openssl (core binary needs it too) # # Conditional build for lighttpd: %bcond_without xattr # support of extended attributes @@ -19,7 +22,7 @@ %bcond_with ldap # ldap support in mod_auth %bcond_with lua # LUA support in mod_cml %bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl -%bcond_without gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" +%bcond_with gamin # gamin for reducing number of stat() calls. NOTE: must be enabled in config: server.stat-cache-engine = "fam" %bcond_with gdbm # gdbm in mod_trigger_b4_dl %bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) %bcond_with valgrind # compile code with valgrind support. @@ -34,7 +37,7 @@ %define _source http://www.lighttpd.net/download/%{name}-%{version}.tar.gz %endif -%define _rel 0.1 +%define _rel 0.4 Summary: Fast and light HTTP server Summary(pl): Szybki i lekki serwer HTTP @@ -53,6 +56,7 @@ Patch0: http://minghetti.ch/blob/dirlist-hide.patch Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch +Patch3: %{name}-lua-pkgconfig.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -65,7 +69,7 @@ %{?with_mysql:BuildRequires: mysql-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} -%{?with_lua:BuildRequires: lua50-devel} +%{?with_lua:BuildRequires: lua50-devel >= 5.0.2-4.1} %{?with_memcache:BuildRequires: libmemcache-devel} %{?with_gdbm:BuildRequires: gdbm-devel} BuildRequires: pcre-devel @@ -194,11 +198,13 @@ %{?with_dirhide:%patch0 -p0} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} %{__aclocal} %{__autoconf} +%{__automake} %configure \ %{!?with_ipv6:--disable-ipv6} \ @@ -344,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/22 15:18:39 glen +- add pkgconfig support for locating lua libs + Revision 1.121 2005/08/22 14:29:20 glen - 1.4.1 - reviewed dependencies ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.121&r2=1.122&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:17 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: gnomebaker.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Mon Aug 22 15:19:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: gnomebaker.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/gnomebaker.spec diff -u SPECS/gnomebaker.spec:1.12 SPECS/gnomebaker.spec:1.13 --- SPECS/gnomebaker.spec:1.12 Tue Aug 16 17:10:39 2005 +++ SPECS/gnomebaker.spec Mon Aug 22 17:19:12 2005 @@ -2,12 +2,12 @@ Summary: GNOME program for creating CDs Summary(pl): Program dla GNOME do nagrywania p?yt CD Name: gnomebaker -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Multimedia Source0: http://dl.sourceforge.net/gnomebaker/%{name}-%{version}.tar.gz -# Source0-md5: 11bd141fc1f3a52729c4baeff3578899 +# Source0-md5: caac582ec6896a49cd76779e54ef6d3e Patch0: %{name}-desktop.patch URL: http://gnomebaker.sourceforge.net/ BuildRequires: autoconf @@ -106,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 15:19:12 pawcioos +- updated to 0.4.2 + Revision 1.12 2005/08/16 15:10:39 freetz - 0.4.1, updated banner, R: gst-gnomevfs, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnomebaker.spec?r1=1.12&r2=1.13&f=u From pawcioos at pld-linux.org Mon Aug 22 17:19:18 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: gnomebaker-0.4.2.tar.gz Message-ID: <11490.1124723958@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnomebaker/gnomebaker-0.4.2.tar.gz caac582ec6896a49cd76779e54ef6d3e gnomebaker-0.4.2.tar.gz Size: 761044 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 17:19:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lua50.spec - create lua50.pc. inspired from gentoo In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:19:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - create lua50.pc. inspired from gentoo ---- Files affected: SPECS: lua50.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.20 SPECS/lua50.spec:1.21 --- SPECS/lua50.spec:1.20 Mon Aug 22 16:36:22 2005 +++ SPECS/lua50.spec Mon Aug 22 17:19:20 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4 +Release: 4.1 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -148,6 +148,23 @@ install bin.static/luac $RPM_BUILD_ROOT%{_bindir}/luac50.static %endif +# create pkgconfig file +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +cat > $RPM_BUILD_ROOT%{_pkgconfigdir}/%{name}.pc <<'EOF' +prefix=%{_prefix} +exec_prefix=%{_exec_prefix} +includedir=%{_includedir}/%{name} +libdir=%{_libdir} +interpreter=%{_bindir}/%{name} +compiler=%{_bindir}/%{name} + +Name: Lua +Description: An extension programming language +Version: %{version} +Cflags: -I%{_includedir}/%{name} +Libs: -L%{_libdir} -llua50 -llualib50 -ldl -lm +EOF + %clean rm -rf $RPM_BUILD_ROOT @@ -168,6 +185,7 @@ %doc refman.ps.gz doc test %attr(755,root,root) %{_libdir}/lib*.so %{_includedir}/lua50 +%{_pkgconfigdir}/%{name}.pc %files static %defattr(644,root,root,755) @@ -185,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/22 15:19:20 glen +- create lua50.pc. inspired from gentoo + Revision 1.20 2005/08/22 14:36:22 glen - parallel make unfriendly make ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.20&r2=1.21&f=u From baggins at pld-linux.org Mon Aug 22 17:20:58 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: pam: configure.in, modules/pammodutil/modutil_cleanup.c, modules/p... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:20:58 2005 GMT Module: pam Tag: HEAD ---- Log message: - include config.h and check for required functions ---- Files affected: pam: configure.in (1.65 -> 1.66) pam/modules/pammodutil: modutil_cleanup.c (1.1 -> 1.2) , modutil_getgrgid.c (1.2 -> 1.3) , modutil_getgrnam.c (1.2 -> 1.3) , modutil_getlogin.c (1.4 -> 1.5) , modutil_getpwnam.c (1.3 -> 1.4) , modutil_getpwuid.c (1.3 -> 1.4) , modutil_getspnam.c (1.2 -> 1.3) , modutil_ingroup.c (1.1 -> 1.2) , modutil_ioloop.c (1.1 -> 1.2) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.65 pam/configure.in:1.66 --- pam/configure.in:1.65 Thu Jul 14 17:40:31 2005 +++ pam/configure.in Mon Aug 22 17:20:53 2005 @@ -173,7 +173,7 @@ AC_FUNC_MMAP AC_FUNC_VPRINTF AC_CHECK_FUNCS(gethostname gettimeofday mkdir select strcspn strdup strerror strspn strstr strtol) -AC_CHECK_FUNCS(getpwnam_r getgrnam_r) +AC_CHECK_FUNCS(getgrgid_r getpwuid_r getspnam_r getpwnam_r getgrnam_r getgrouplist) dnl Checks for libraries. ================================================================ Index: pam/modules/pammodutil/modutil_cleanup.c diff -u pam/modules/pammodutil/modutil_cleanup.c:1.1 pam/modules/pammodutil/modutil_cleanup.c:1.2 --- pam/modules/pammodutil/modutil_cleanup.c:1.1 Thu Mar 7 14:30:17 2002 +++ pam/modules/pammodutil/modutil_cleanup.c Mon Aug 22 17:20:53 2005 @@ -4,6 +4,8 @@ * This function provides a common pam_set_data() friendly version of free(). */ +#include "config.h" + #include "pammodutil.h" void _pammodutil_cleanup(pam_handle_t *pamh, void *data, int error_status) ================================================================ Index: pam/modules/pammodutil/modutil_getgrgid.c diff -u pam/modules/pammodutil/modutil_getgrgid.c:1.2 pam/modules/pammodutil/modutil_getgrgid.c:1.3 --- pam/modules/pammodutil/modutil_getgrgid.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrgid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getgrnam.c diff -u pam/modules/pammodutil/modutil_getgrnam.c:1.2 pam/modules/pammodutil/modutil_getgrnam.c:1.3 --- pam/modules/pammodutil/modutil_getgrnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getgrnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getlogin.c diff -u pam/modules/pammodutil/modutil_getlogin.c:1.4 pam/modules/pammodutil/modutil_getlogin.c:1.5 --- pam/modules/pammodutil/modutil_getlogin.c:1.4 Mon Jul 11 16:58:44 2005 +++ pam/modules/pammodutil/modutil_getlogin.c Mon Aug 22 17:20:53 2005 @@ -6,6 +6,8 @@ * there. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwnam.c diff -u pam/modules/pammodutil/modutil_getpwnam.c:1.3 pam/modules/pammodutil/modutil_getpwnam.c:1.4 --- pam/modules/pammodutil/modutil_getpwnam.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getpwuid.c diff -u pam/modules/pammodutil/modutil_getpwuid.c:1.3 pam/modules/pammodutil/modutil_getpwuid.c:1.4 --- pam/modules/pammodutil/modutil_getpwuid.c:1.3 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getpwuid.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_getspnam.c diff -u pam/modules/pammodutil/modutil_getspnam.c:1.2 pam/modules/pammodutil/modutil_getspnam.c:1.3 --- pam/modules/pammodutil/modutil_getspnam.c:1.2 Thu Apr 7 14:54:24 2005 +++ pam/modules/pammodutil/modutil_getspnam.c Mon Aug 22 17:20:53 2005 @@ -7,6 +7,8 @@ * XXX - or at least it should provide a thread-safe alternative. */ +#include "config.h" + #include "pammodutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ingroup.c diff -u pam/modules/pammodutil/modutil_ingroup.c:1.1 pam/modules/pammodutil/modutil_ingroup.c:1.2 --- pam/modules/pammodutil/modutil_ingroup.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ingroup.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * specified group. */ +#include "config.h" + #include "pammodutil.h" #include "include/security/_pam_modutil.h" #include ================================================================ Index: pam/modules/pammodutil/modutil_ioloop.c diff -u pam/modules/pammodutil/modutil_ioloop.c:1.1 pam/modules/pammodutil/modutil_ioloop.c:1.2 --- pam/modules/pammodutil/modutil_ioloop.c:1.1 Fri Oct 1 15:12:21 2004 +++ pam/modules/pammodutil/modutil_ioloop.c Mon Aug 22 17:20:53 2005 @@ -5,6 +5,8 @@ * write occurs. It handles EINTR and partial read/write returns. */ +#include "config.h" + #include #include ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.65&r2=1.66&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_cleanup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrgid.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getgrnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getlogin.c?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwnam.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getpwuid.c?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_getspnam.c?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ingroup.c?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/pam/modules/pammodutil/modutil_ioloop.c?r1=1.1&r2=1.2&f=u From baggins at pld-linux.org Mon Aug 22 17:21:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: pam: configure.in - 0.80.1 In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:21:17 2005 GMT Module: pam Tag: HEAD ---- Log message: - 0.80.1 ---- Files affected: pam: configure.in (1.66 -> 1.67) ---- Diffs: ================================================================ Index: pam/configure.in diff -u pam/configure.in:1.66 pam/configure.in:1.67 --- pam/configure.in:1.66 Mon Aug 22 17:20:53 2005 +++ pam/configure.in Mon Aug 22 17:21:12 2005 @@ -5,7 +5,7 @@ PAM_MAJOR_VERSION=0 PAM_MINOR_VERSION=80 -PAM_MICRO_VERSION=0 +PAM_MICRO_VERSION=1 PAM_VERSION=$PAM_MAJOR_VERSION.$PAM_MINOR_VERSION.$PAM_MICRO_VERSION PAM_VERSION_INFO=$PAM_MINOR_VERSION:$PAM_MAJOR_VERSION:$PAM_MINOR_VERSION ================================================================ ---- CVS-web: http://cvs.pld-linux.org/pam/configure.in?r1=1.66&r2=1.67&f=u From glen at pld-linux.org Mon Aug 22 17:22:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lua50.spec - rel 5 with included pkgconfig. STBR aswell In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:22:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 5 with included pkgconfig. STBR aswell ---- Files affected: SPECS: lua50.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.21 SPECS/lua50.spec:1.22 --- SPECS/lua50.spec:1.21 Mon Aug 22 17:19:20 2005 +++ SPECS/lua50.spec Mon Aug 22 17:22:21 2005 @@ -7,7 +7,7 @@ Summary(pl): Prosty, lekki ale pot??ny, osadzalny j?zyk programowania Name: lua50 Version: 5.0.2 -Release: 4.1 +Release: 5 License: MIT Group: Development/Languages Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/22 15:22:21 glen +- rel 5 with included pkgconfig. STBR aswell + Revision 1.21 2005/08/22 15:19:20 glen - create lua50.pc. inspired from gentoo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Mon Aug 22 17:27:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lua50.spec - fix compiler path in pkgconfig file In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 15:27:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix compiler path in pkgconfig file ---- Files affected: SPECS: lua50.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/lua50.spec diff -u SPECS/lua50.spec:1.22 SPECS/lua50.spec:1.23 --- SPECS/lua50.spec:1.22 Mon Aug 22 17:22:21 2005 +++ SPECS/lua50.spec Mon Aug 22 17:27:36 2005 @@ -156,7 +156,7 @@ includedir=%{_includedir}/%{name} libdir=%{_libdir} interpreter=%{_bindir}/%{name} -compiler=%{_bindir}/%{name} +compiler=%{_bindir}/luac50 Name: Lua Description: An extension programming language @@ -203,6 +203,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/22 15:27:36 glen +- fix compiler path in pkgconfig file + Revision 1.22 2005/08/22 15:22:21 glen - rel 5 with included pkgconfig. STBR aswell ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lua50.spec?r1=1.22&r2=1.23&f=u From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <5715.1124725884@distfiles.pld-linux.org> wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/e73ddc36-af7c-4bc5-8e3d-3fc9e2b6d1b1/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From baggins at pld-linux.org Mon Aug 22 17:51:24 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: pam.spec - 0.80.1 - fix modules miscompile due to lack of i... In-Reply-To: References: Message-ID: Author: baggins Date: Mon Aug 22 15:51:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.80.1 - fix modules miscompile due to lack of includes ---- Files affected: SPECS: pam.spec (1.223 -> 1.224) ---- Diffs: ================================================================ Index: SPECS/pam.spec diff -u SPECS/pam.spec:1.223 SPECS/pam.spec:1.224 --- SPECS/pam.spec:1.223 Thu Aug 11 11:46:18 2005 +++ SPECS/pam.spec Mon Aug 22 17:51:18 2005 @@ -21,13 +21,13 @@ Summary(tr): Mod?ler, art?msal do?rulama birimleri Summary(uk): ??????????, ?? ?????????? ?????????????? ??? ??????? Name: pam -Version: 0.80.0 +Version: 0.80.1 Release: 1 Epoch: 0 License: GPL or BSD Group: Base Source0: ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{version}.tar.gz -# Source0-md5: 330683490b44e2fe584efb0b1bf52fbd +# Source0-md5: df374f625e7178f43a263a32e376dd46 Source1: system-auth.pamd URL: http://www.kernel.org/pub/linux/libs/pam/ BuildRequires: bison @@ -446,6 +446,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.224 2005/08/22 15:51:18 baggins +- 0.80.1 +- fix modules miscompile due to lack of includes + Revision 1.223 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.223&r2=1.224&f=u From baggins at pld-linux.org Mon Aug 22 17:52:38 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <6541.1124725958@distfiles.pld-linux.org> wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/585dc31b-f8f2-46dc-bca7-60c01716b24e/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 17:58:11 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: mldonkey.spec - ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 15:58:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ocaml 3.08.4 ---- Files affected: SPECS: mldonkey.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.122 SPECS/mldonkey.spec:1.123 --- SPECS/mldonkey.spec:1.122 Mon Aug 22 15:48:54 2005 +++ SPECS/mldonkey.spec Mon Aug 22 17:58:04 2005 @@ -24,7 +24,7 @@ Summary: eDonkey 2000 p2p network client Summary(pl): Klient sieci p2p eDonkey 2000 Name: mldonkey -%define ocaml_ver 3.08.3 +%define ocaml_ver 3.08.4 #%define patch_pack c %define real_ver 2.6.3 #Version: %{real_ver}%{patch_pack} @@ -368,6 +368,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/22 15:58:04 paszczus +- ocaml 3.08.4 + Revision 1.122 2005/08/22 13:48:54 paszczus - updated to 2.6.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.122&r2=1.123&f=u From spider at pld-linux.org Mon Aug 22 18:05:14 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: idesk.spec - extended description In-Reply-To: References: Message-ID: Author: spider Date: Mon Aug 22 16:05:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - extended description ---- Files affected: SPECS: idesk.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.16 SPECS/idesk.spec:1.17 --- SPECS/idesk.spec:1.16 Mon Aug 8 17:49:04 2005 +++ SPECS/idesk.spec Mon Aug 22 18:05:09 2005 @@ -21,7 +21,11 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not -provided by all window managers. +provided by all window managers. The icon graphics are either from a +png or svg (vector) file and support some eyecandy effects like +transparency. Each icon can be confgured to run one or more shell +commands and the actions which run those commands are completely +configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie @@ -60,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/22 16:05:09 spider +- extended description + Revision 1.16 2005/08/08 15:49:04 kolodko - up to 0.7.3, fixed bug with CaptionTip - rm Makefile patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.16&r2=1.17&f=u From baggins at pld-linux.org Mon Aug 22 18:13:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: ERRORS: pam-pld-0.80.1.tar.gz Message-ID: <20370.1124727183@distfiles.pld-linux.org> wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. FATAL: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz (df374f625e7178f43a263a32e376dd46) was not fetched (wget -nv -O ./tmp/3f1a0d5f-a7ef-489b-925a-eb25c783176c/df374f625e7178f43a263a32e376dd46/pam-pld-0.80.1.tar.gz "ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz": No such file `pam-pld-0.80.1.tar.gz'. No such file `pam-pld-0.80.1.tar.gz'. ) Files fetched: 0 -- Virtually Yours: distfiles. From pluto at pld-linux.org Mon Aug 22 18:14:30 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES (LINUX_2_6): bootsplash-3.1.6-2.6.12.diff (NEW) - official... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:14:30 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - official bootsplash patch + minor rework. ---- Files affected: SOURCES: bootsplash-3.1.6-2.6.12.diff (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/bootsplash-3.1.6-2.6.12.diff diff -u /dev/null SOURCES/bootsplash-3.1.6-2.6.12.diff:1.1.2.1 --- /dev/null Mon Aug 22 18:14:30 2005 +++ SOURCES/bootsplash-3.1.6-2.6.12.diff Mon Aug 22 18:14:25 2005 @@ -0,0 +1,2788 @@ +diff -urN linux-2.6.12/drivers/char/keyboard.c linux-2.6.12-bootsplash/drivers/char/keyboard.c +--- linux-2.6.12/drivers/char/keyboard.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/keyboard.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1063,6 +1063,15 @@ + if (keycode < BTN_MISC) + printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode); + ++#ifdef CONFIG_BOOTSPLASH ++ /* This code has to be redone for some non-x86 platforms */ ++ if (down == 1 && (keycode == 0x3c || keycode == 0x01)) { /* F2 and ESC on PC keyboard */ ++ extern int splash_verbose(void); ++ if (splash_verbose()) ++ return; ++ } ++#endif ++ + #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ + if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) { + sysrq_down = down; +diff -urN linux-2.6.12/drivers/char/n_tty.c linux-2.6.12-bootsplash/drivers/char/n_tty.c +--- linux-2.6.12/drivers/char/n_tty.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/n_tty.c 2005-06-18 09:22:11.000000000 +0200 +@@ -1299,6 +1299,15 @@ + tty->minimum_to_wake = (minimum - (b - buf)); + + if (!input_available_p(tty, 0)) { ++#ifdef CONFIG_BOOTSPLASH ++ if (file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,1) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,0) || ++ file->f_dentry->d_inode->i_rdev == MKDEV(TTYAUX_MAJOR,1)) { ++ extern int splash_verbose(void); ++ (void)splash_verbose(); ++ } ++#endif + if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { + retval = -EIO; + break; +diff -urN linux-2.6.12/drivers/char/vt.c linux-2.6.12-bootsplash/drivers/char/vt.c +--- linux-2.6.12/drivers/char/vt.c 2005-06-17 21:48:29.000000000 +0200 ++++ linux-2.6.12-bootsplash/drivers/char/vt.c 2005-06-18 09:22:11.000000000 +0200 +@@ -3221,6 +3221,31 @@ + } + } + ++#ifdef CONFIG_BOOTSPLASH ++void con_remap_def_color(struct vc_data *vc, int new_color) ++{ ++ unsigned short *sbuf = vc->vc_screenbuf; ++ unsigned c, len = vc->vc_screenbuf_size >> 1; ++ int old_color; ++ ++ if (sbuf) { ++ old_color = vc->vc_def_color << 8; ++ new_color <<= 8; ++ while(len--) { ++ c = *sbuf; ++ if (((c ^ old_color) & 0xf000) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0xf000; ++ if (((c ^ old_color) & 0x0f00) == 0) ++ *sbuf ^= (old_color ^ new_color) & 0x0f00; ++ sbuf++; ++ } ++ new_color >>= 8; ++ } ++ vc->vc_def_color = vc->vc_color = new_color; ++ update_attr(vc); ++} ++#endif ++ + /* + * Visible symbols for modules + */ +diff -urN linux-2.6.12/drivers/video/bootsplash/bootsplash.c linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c +--- linux-2.6.12/drivers/video/bootsplash/bootsplash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.12-bootsplash/drivers/video/bootsplash/bootsplash.c 2005-06-18 09:22:11.000000000 +0200 +@@ -0,0 +1,984 @@ ++/* ++ * linux/drivers/video/bootsplash/bootsplash.c - ++ * splash screen handling functions. ++ * ++ * (w) 2001-2004 by Volker Poplawski, , ++ * Stefan Reinauer, , ++ * Steffen Winterfeldt, , ++ * Michael Schroeder ++ * ++ * Ideas & SuSE screen work by Ken Wimer, ++ * ++ * For more information on this code check http://www.bootsplash.org/ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "../console/fbcon.h" ++#include "bootsplash.h" ++#include "decode-jpg.h" ++ ++/* extern struct fb_ops vesafb_ops; */ ++extern signed char con2fb_map[MAX_NR_CONSOLES]; ++ ++#define SPLASH_VERSION "3.1.6-2004/03/31" ++ ++/* These errors have to match fbcon-jpegdec.h */ ++static unsigned char *jpg_errors[] = { ++ "no SOI found", ++ "not 8 bit", ++ "height mismatch", ++ "width mismatch", ++ "bad width or height", ++ "too many COMPPs", ++ "illegal HV", ++ "quant table selector", ++ "picture is not YCBCR 221111", ++ "unknow CID in scan", ++ "dct not sequential", ++ "wrong marker", ++ "no EOI", ++ "bad tables", ++ "depth mismatch" ++}; ++ ++static struct jpeg_decdata *decdata = 0; /* private decoder data */ ++ ++static int splash_registered = 0; ++static int splash_usesilent = 0; /* shall we display the silentjpeg? */ ++int splash_default = 0xf01; ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth); ++ ++static int __init splash_setup(char *options) ++{ ++ if(!strncmp("silent", options, 6)) { ++ printk(KERN_INFO "bootsplash: silent mode.\n"); ++ splash_usesilent = 1; ++ /* skip "silent," */ ++ if (strlen(options) == 6) ++ return 0; ++ options += 7; ++ } ++ if(!strncmp("verbose", options, 7)) { ++ printk(KERN_INFO "bootsplash: verbose mode.\n"); ++ splash_usesilent = 0; ++ return 0; ++ } ++ splash_default = simple_strtoul(options, NULL, 0); ++ return 0; ++} ++ ++__setup("splash=", splash_setup); ++ ++ ++static int splash_hasinter(unsigned char *buf, int num) ++{ ++ unsigned char *bufend = buf + num * 12; ++ while(buf < bufend) { ++ if (buf[1] > 127) /* inter? */ ++ return 1; ++ buf += buf[3] > 127 ? 24 : 12; /* blend? */ ++ } ++ return 0; ++} ++ ++static int boxextract(unsigned char *buf, unsigned short *dp, unsigned char *cols, int *blendp) ++{ ++ dp[0] = buf[0] | buf[1] << 8; ++ dp[1] = buf[2] | buf[3] << 8; ++ dp[2] = buf[4] | buf[5] << 8; ++ dp[3] = buf[6] | buf[7] << 8; ++ *(unsigned int *)(cols + 0) = ++ *(unsigned int *)(cols + 4) = ++ *(unsigned int *)(cols + 8) = ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 8); ++ if (dp[1] > 32767) { ++ dp[1] = ~dp[1]; ++ *(unsigned int *)(cols + 4) = *(unsigned int *)(buf + 12); ++ *(unsigned int *)(cols + 8) = *(unsigned int *)(buf + 16); ++ *(unsigned int *)(cols + 12) = *(unsigned int *)(buf + 20); ++ *blendp = 1; ++ return 24; ++ } ++ return 12; ++} ++ ++static void boxit(unsigned char *pic, int bytes, unsigned char *buf, int num, int percent, int overpaint) ++{ ++ int x, y, i, p, doblend, r, g, b, a, add; ++ unsigned short data1[4]; ++ unsigned char cols1[16]; ++ unsigned short data2[4]; ++ unsigned char cols2[16]; ++ unsigned char *bufend; ++ unsigned short *picp; ++ unsigned int stipple[32], sti, stin, stinn, stixs, stixe, stiys, stiye; ++ int xs, xe, ys, ye, xo, yo; ++ ++ if (num == 0) ++ return; ++ bufend = buf + num * 12; ++ stipple[0] = 0xffffffff; ++ stin = 1; ++ stinn = 0; ++ stixs = stixe = 0; ++ stiys = stiye = 0; ++ while(buf < bufend) { ++ doblend = 0; ++ buf += boxextract(buf, data1, cols1, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32767) { ++ /* box stipple */ ++ if (stinn == 32) ++ continue; ++ if (stinn == 0) { ++ stixs = data1[2]; ++ stixe = data1[3]; ++ stiys = stiye = 0; ++ } else if (stinn == 4) { ++ stiys = data1[2]; ++ stiye = data1[3]; ++ } ++ stipple[stinn++] = (cols1[ 0] << 24) | (cols1[ 1] << 16) | (cols1[ 2] << 8) | cols1[ 3] ; ++ stipple[stinn++] = (cols1[ 4] << 24) | (cols1[ 5] << 16) | (cols1[ 6] << 8) | cols1[ 7] ; ++ stipple[stinn++] = (cols1[ 8] << 24) | (cols1[ 9] << 16) | (cols1[10] << 8) | cols1[11] ; ++ stipple[stinn++] = (cols1[12] << 24) | (cols1[13] << 16) | (cols1[14] << 8) | cols1[15] ; ++ stin = stinn; ++ continue; ++ } ++ stinn = 0; ++ if (data1[0] > 32767) ++ buf += boxextract(buf, data2, cols2, &doblend); ++ if (data1[0] == 32767 && data1[1] == 32766) { ++ /* box copy */ ++ i = 12 * (short)data1[3]; ++ doblend = 0; ++ i += boxextract(buf + i, data1, cols1, &doblend); ++ if (data1[0] > 32767) ++ boxextract(buf + i, data2, cols2, &doblend); ++ } ++ if (data1[0] == 32767) ++ continue; ++ if (data1[2] > 32767) { ++ if (overpaint) ++ continue; ++ data1[2] = ~data1[2]; ++ } ++ if (data1[3] > 32767) { ++ if (percent == 65536) ++ continue; ++ data1[3] = ~data1[3]; ++ } ++ if (data1[0] > 32767) { ++ data1[0] = ~data1[0]; ++ for (i = 0; i < 4; i++) ++ data1[i] = (data1[i] * (65536 - percent) + data2[i] * percent) >> 16; ++ for (i = 0; i < 16; i++) ++ cols1[i] = (cols1[i] * (65536 - percent) + cols2[i] * percent) >> 16; ++ } ++ *(unsigned int *)cols2 = *(unsigned int *)cols1; ++ a = cols2[3]; ++ if (a == 0 && !doblend) ++ continue; ++ ++ if (stixs >= 32768) { ++ xo = xs = (stixs ^ 65535) + data1[0]; ++ xe = stixe ? stixe + data1[0] : data1[2]; ++ } else if (stixe >= 32768) { ++ xs = stixs ? data1[2] - stixs : data1[0]; ++ xe = data1[2] - (stixe ^ 65535); ++ xo = xe + 1; ++ } else { ++ xo = xs = stixs; ++ xe = stixe ? stixe : data1[2]; ++ } ++ if (stiys >= 32768) { ++ yo = ys = (stiys ^ 65535) + data1[1]; ++ ye = stiye ? stiye + data1[1] : data1[3]; ++ } else if (stiye >= 32768) { ++ ys = stiys ? data1[3] - stiys : data1[1]; ++ ye = data1[3] - (stiye ^ 65535); ++ yo = ye + 1; ++ } else { ++ yo = ys = stiys; ++ ye = stiye ? stiye : data1[3]; ++ } ++ xo = 32 - (xo & 31); ++ yo = stin - (yo % stin); ++ if (xs < data1[0]) ++ xs = data1[0]; ++ if (xe > data1[2]) ++ xe = data1[2]; ++ if (ys < data1[1]) ++ ys = data1[1]; ++ if (ye > data1[3]) ++ ye = data1[3]; ++ ++ for (y = ys; y <= ye; y++) { ++ sti = stipple[(y + yo) % stin]; ++ x = (xs + xo) & 31; ++ if (x) ++ sti = (sti << x) | (sti >> (32 - x)); ++ if (doblend) { ++ if ((p = data1[3] - data1[1]) != 0) ++ p = ((y - data1[1]) << 16) / p; ++ for (i = 0; i < 8; i++) ++ cols2[i + 8] = (cols1[i] * (65536 - p) + cols1[i + 8] * p) >> 16; ++ } ++ add = (xs & 1); ++ add ^= (add ^ y) & 1 ? 1 : 3; /* 2x2 ordered dithering */ ++ picp = (unsigned short *)(pic + xs * 2 + y * bytes); ++ for (x = xs; x <= xe; x++) { ++ if (!(sti & 0x80000000)) { ++ sti <<= 1; ++ picp++; ++ add ^= 3; ++ continue; ++ } ++ sti = (sti << 1) | 1; ++ if (doblend) { ++ if ((p = data1[2] - data1[0]) != 0) ++ p = ((x - data1[0]) << 16) / p; ++ for (i = 0; i < 4; i++) ++ cols2[i] = (cols2[i + 8] * (65536 - p) + cols2[i + 12] * p) >> 16; ++ a = cols2[3]; ++ } ++ r = cols2[0]; ++ g = cols2[1]; ++ b = cols2[2]; ++ if (a != 255) { ++ i = *picp; ++ r = ((i >> 8 & 0xf8) * (255 - a) + r * a) / 255; ++ g = ((i >> 3 & 0xfc) * (255 - a) + g * a) / 255; ++ b = ((i << 3 & 0xf8) * (255 - a) + b * a) / 255; ++ } ++ #define CLAMP(x) ((x) >= 256 ? 255 : (x)) ++ i = ((CLAMP(r + add*2+1) & 0xf8) << 8) | ++ ((CLAMP(g + add ) & 0xfc) << 3) | ++ ((CLAMP(b + add*2+1) ) >> 3); ++ *picp++ = i; ++ add ^= 3; ++ } ++ } ++ } ++} ++ ++static int splash_check_jpeg(unsigned char *jpeg, int width, int height, int depth) ++{ ++ int size, err; ++ unsigned char *mem; ++ ++ size = ((width + 15) & ~15) * ((height + 15) & ~15) * (depth >> 3); ++ mem = vmalloc(size); ++ if (!mem) { ++ printk(KERN_INFO "bootsplash: no memory for decoded picture.\n"); ++ return -1; ++ } ++ if (!decdata) ++ decdata = vmalloc(sizeof(*decdata)); ++ if ((err = jpeg_decode(jpeg, mem, ((width + 15) & ~15), ((height + 15) & ~15), depth, decdata))) ++ printk(KERN_INFO "bootsplash: error while decompressing picture: %s (%d)\n",jpg_errors[err - 1], err); ++ vfree(mem); ++ return err ? -1 : 0; ++} ++ ++static void splash_free(struct vc_data *vc, struct fb_info *info) ++{ ++ if (!vc->vc_splash_data) ++ return; ++ if (info->silent_screen_base) ++ info->screen_base = info->silent_screen_base; ++ info->silent_screen_base = 0; ++ if (vc->vc_splash_data->splash_silentjpeg) ++ vfree(vc->vc_splash_data->splash_sboxes); ++ vfree(vc->vc_splash_data); ++ vc->vc_splash_data = 0; ++ info->splash_data = 0; ++} ++ ++static int splash_mkpenguin(struct splash_data *data, int pxo, int pyo, int pwi, int phe, int pr, int pg, int pb) ++{ ++ unsigned char *buf; ++ int i; ++ ++ if (pwi ==0 || phe == 0) ++ return 0; ++ buf = (unsigned char *)data + sizeof(*data); ++ pwi += pxo - 1; ++ phe += pyo - 1; ++ *buf++ = pxo; ++ *buf++ = pxo >> 8; ++ *buf++ = pyo; ++ *buf++ = pyo >> 8; ++ *buf++ = pwi; ++ *buf++ = pwi >> 8; ++ *buf++ = phe; ++ *buf++ = phe >> 8; ++ *buf++ = pr; ++ *buf++ = pg; ++ *buf++ = pb; ++ *buf++ = 0; ++ for (i = 0; i < 12; i++, buf++) ++ *buf = buf[-12]; ++ buf[-24] ^= 0xff; ++ buf[-23] ^= 0xff; ++ buf[-1] = 0xff; ++ return 2; ++} ++ ++static const int splash_offsets[3][16] = { ++ /* len, unit, size, state, fgcol, col, xo, yo, wi, he ++ boxcnt, ssize, sboxcnt, percent, overok, palcnt */ ++ /* V1 */ ++ { 20, -1, 16, -1, -1, -1, 8, 10, 12, 14, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V2 */ ++ { 35, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ -1, -1, -1, -1, -1, -1 }, ++ /* V3 */ ++ { 38, 8, 12, 9, 10, 11, 16, 18, 20, 22, ++ 24, 28, 32, 34, 36, 37 }, ++}; ++ ++#define SPLASH_OFF_LEN offsets[0] ++#define SPLASH_OFF_UNIT offsets[1] ++#define SPLASH_OFF_SIZE offsets[2] ++#define SPLASH_OFF_STATE offsets[3] ++#define SPLASH_OFF_FGCOL offsets[4] ++#define SPLASH_OFF_COL offsets[5] ++#define SPLASH_OFF_XO offsets[6] ++#define SPLASH_OFF_YO offsets[7] ++#define SPLASH_OFF_WI offsets[8] ++#define SPLASH_OFF_HE offsets[9] ++#define SPLASH_OFF_BOXCNT offsets[10] ++#define SPLASH_OFF_SSIZE offsets[11] ++#define SPLASH_OFF_SBOXCNT offsets[12] ++#define SPLASH_OFF_PERCENT offsets[13] ++#define SPLASH_OFF_OVEROK offsets[14] ++#define SPLASH_OFF_PALCNT offsets[15] ++ ++static inline int splash_getb(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off]; ++} ++ ++static inline int splash_gets(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : pos[off] | pos[off + 1] << 8; ++} ++ ++static inline int splash_geti(unsigned char *pos, int off) ++{ ++ return off == -1 ? 0 : ++ pos[off] | pos[off + 1] << 8 | pos[off + 2] << 16 | pos[off + 3] << 24; ++} ++ ++static int splash_getraw(unsigned char *start, unsigned char *end, int *update) ++{ ++ unsigned char *ndata; ++ int version; ++ int splash_size; ++ int unit; ++ int width, height; ++ int silentsize; ++ int boxcnt; ++ int sboxcnt; ++ int palcnt; ++ int i, len; ++ const int *offsets; ++ struct vc_data *vc; ++ struct fb_info *info; ++ struct splash_data *sd; ++ ++ if (update) ++ *update = -1; ++ ++ if (!update || start[7] < '2' || start[7] > '3' || splash_geti(start, 12) != (int)0xffffffff) ++ printk(KERN_INFO "bootsplash %s: looking for picture...", SPLASH_VERSION); ++ ++ for (ndata = start; ndata < end; ndata++) { ++ if (ndata[0] != 'B' || ndata[1] != 'O' || ndata[2] != 'O' || ndata[3] != 'T') ++ continue; ++ if (ndata[4] != 'S' || ndata[5] != 'P' || ndata[6] != 'L' || ndata[7] < '1' || ndata[7] > '3') ++ continue; ++ version = ndata[7] - '0'; ++ offsets = splash_offsets[version - 1]; ++ len = SPLASH_OFF_LEN; ++ unit = splash_getb(ndata, SPLASH_OFF_UNIT); ++ if (unit >= MAX_NR_CONSOLES) ++ continue; ++ if (unit) { ++ vc_allocate(unit); ++ } ++ vc = vc_cons[unit].d; ++ info = registered_fb[(int)con2fb_map[unit]]; ++ width = info->var.xres; ++ height = info->var.yres; ++ splash_size = splash_geti(ndata, SPLASH_OFF_SIZE); ++ if (splash_size == (int)0xffffffff && version > 1) { ++ if ((sd = vc->vc_splash_data) != 0) { ++ int up = 0; ++ i = splash_getb(ndata, SPLASH_OFF_STATE); ++ if (i != 255) { ++ sd->splash_state = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_FGCOL); ++ if (i != 255) { ++ sd->splash_fg_color = i; ++ up = -1; ++ } ++ i = splash_getb(ndata, SPLASH_OFF_COL); ++ if (i != 255) { ++ sd->splash_color = i; ++ up = -1; ++ } ++ boxcnt = sboxcnt = 0; ++ if (ndata + len <= end) { ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ } ++ if (boxcnt) { ++ i = splash_gets(ndata, len); ++ if (boxcnt + i <= sd->splash_boxcount && ndata + len + 2 + boxcnt * 12 <= end) { ++ ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_boxes + i * 12, 8)) { ++ ++ memcpy(sd->splash_boxes + i * 12, ndata + len + 2, boxcnt * 12); ++ up |= 1; ++ } ++ } ++ len += boxcnt * 12 + 2; ++ } ++ if (sboxcnt) { ++ i = splash_gets(ndata, len); ++ if (sboxcnt + i <= sd->splash_sboxcount && ndata + len + 2 + sboxcnt * 12 <= end) { ++ if (splash_geti(ndata, len + 2) != 0x7ffd7fff || !memcmp(ndata + len + 2, sd->splash_sboxes + i * 12, 8)) { ++ memcpy(sd->splash_sboxes + i * 12, ndata + len + 2, sboxcnt * 12); ++ up |= 2; ++ } ++ } ++ } ++ if (update) ++ *update = up; ++ } ++ return unit; ++ } ++ if (splash_size == 0) { ++ printk(KERN_INFO"...found, freeing memory.\n"); ++ if (vc->vc_splash_data) ++ splash_free(vc, info); ++ return unit; ++ } ++ boxcnt = splash_gets(ndata, SPLASH_OFF_BOXCNT); ++ palcnt = 3 * splash_getb(ndata, SPLASH_OFF_PALCNT); ++ if (ndata + len + splash_size > end) { ++ printk(KERN_INFO "...found, but truncated!\n"); ++ return -1; ++ } ++ if (!jpeg_check_size(ndata + len + boxcnt * 12 + palcnt, width, height)) { ++ ndata += len + splash_size - 1; ++ continue; ++ } ++ if (splash_check_jpeg(ndata + len + boxcnt * 12 + palcnt, width, height, info->var.bits_per_pixel)) ++ return -1; ++ silentsize = splash_geti(ndata, SPLASH_OFF_SSIZE); ++ if (silentsize) ++ printk(KERN_INFO" silentjpeg size %d bytes,", silentsize); ++ if (silentsize >= splash_size) { ++ printk(KERN_INFO " bigger than splashsize!\n"); ++ return -1; ++ } ++ splash_size -= silentsize; ++ if (!splash_usesilent) ++ silentsize = 0; ++ else if (height * 2 * info->fix.line_length > info->fix.smem_len) { ++ printk(KERN_INFO " does not fit into framebuffer.\n"); ++ silentsize = 0; ++ } ++ sboxcnt = splash_gets(ndata, SPLASH_OFF_SBOXCNT); ++ if (silentsize) { ++ unsigned char *simage = ndata + len + splash_size + 12 * sboxcnt; ++ if (!jpeg_check_size(simage, width, height) || ++ splash_check_jpeg(simage, width, height, info->var.bits_per_pixel)) { ++ printk(KERN_INFO " error in silent jpeg.\n"); <> From pluto at pld-linux.org Mon Aug 22 18:20:06 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: SOURCES (LINUX_2_6): kernel-i386.config, kernel-i386-smp.config -C... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:20:06 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set +CONFIG_BOOTSPLASH=y ---- Files affected: SOURCES: kernel-i386.config (1.82.10.107 -> 1.82.10.108) , kernel-i386-smp.config (1.59.10.102 -> 1.59.10.103) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.107 SOURCES/kernel-i386.config:1.82.10.108 --- SOURCES/kernel-i386.config:1.82.10.107 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386.config Mon Aug 22 18:20:01 2005 @@ -2151,16 +2151,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.102 SOURCES/kernel-i386-smp.config:1.59.10.103 --- SOURCES/kernel-i386-smp.config:1.59.10.102 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-i386-smp.config Mon Aug 22 18:20:01 2005 @@ -2069,16 +2069,18 @@ # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y CONFIG_FB_SPLASH=y + +# +# Bootsplash configuration +# +CONFIG_BOOTSPLASH=y # # Sound ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.107&r2=1.82.10.108&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.102&r2=1.59.10.103&f=u From pluto at pld-linux.org Mon Aug 22 18:22:04 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (LINUX_2_6): kernel.spec - fbsplash dropped, bootsplash-3.1.... In-Reply-To: References: Message-ID: Author: pluto Date: Mon Aug 22 16:22:04 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ---- Files affected: SPECS: kernel.spec (1.441.2.1159 -> 1.441.2.1160) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1159 SPECS/kernel.spec:1.441.2.1160 --- SPECS/kernel.spec:1.441.2.1159 Thu Aug 18 13:59:16 2005 +++ SPECS/kernel.spec Mon Aug 22 18:21:58 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.2 +%define _rel 0.3 %define _netfilter_snap 20050801 @@ -213,8 +213,7 @@ Patch58: inotify-2.6.12.patch # derived from http://www.syskonnect.com/syskonnect/support/driver/zip/linux/install-8_18.tar.bz2 Patch59: linux-2.6-sk98lin-8.18.2.2.patch -# http://dev.gentoo.org/~spock/projects/gensplash/ -Patch60: fbsplash-0.9.2-r3-2.6.12-rc3.patch +Patch60: bootsplash-3.1.6-2.6.12.diff # reserve dynamic minors for fbsplash and device mapper Patch61: linux-static-dev.patch Patch62: linux-2.6-lirc-0.7.patch @@ -1467,6 +1466,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1160 2005/08/22 16:21:58 pluto +- fbsplash dropped, bootsplash-3.1.6 added, release 0.3. + Revision 1.441.2.1159 2005/08/18 11:59:16 pluto - nptl signal delivery deadlock fix. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1159&r2=1.441.2.1160&f=u From twittner at pld-linux.org Mon Aug 22 18:32:23 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: luma.spec $ luma QPainter::begin: Cannot paint null pixmap ... In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 16:32:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: $ luma QPainter::begin: Cannot paint null pixmap QPainter::setPen: Will be reset by begin() zsh: segmentation fault luma $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ - unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py ---- Files affected: SPECS: luma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.6 SPECS/luma.spec:1.7 --- SPECS/luma.spec:1.6 Thu Aug 18 12:14:37 2005 +++ SPECS/luma.spec Mon Aug 22 18:32:07 2005 @@ -39,12 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.pyc' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png %py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} -find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.py -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +64,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 16:32:07 twittner +$ luma +QPainter::begin: Cannot paint null pixmap +QPainter::setPen: Will be reset by begin() +zsh: segmentation fault luma +$ cat /usr/bin/luma +#!/usr/bin/python /usr/lib/luma/luma.pyc +$ +- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py + Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.6&r2=1.7&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): evolution-webcal.spec - up to version 2.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 16:59:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.4.0 ---- Files affected: SPECS: evolution-webcal.spec (1.20.2.1 -> 1.20.2.2) ---- Diffs: ================================================================ Index: SPECS/evolution-webcal.spec diff -u SPECS/evolution-webcal.spec:1.20.2.1 SPECS/evolution-webcal.spec:1.20.2.2 --- SPECS/evolution-webcal.spec:1.20.2.1 Mon Jul 25 21:40:07 2005 +++ SPECS/evolution-webcal.spec Mon Aug 22 18:59:12 2005 @@ -2,25 +2,25 @@ Summary: Web calendar subscription utility for Evolution Summary(pl): Narz?dzie do subskrypcji sieciowego kalendarza dla Evolution Name: evolution-webcal -Version: 2.3.90 +Version: 2.4.0 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ff5d99835ba505f92ce2671fc0223792 +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/%{name}-%{version}.tar.bz2 +# Source0-md5: 3a09711675d82075f007e565a0277185 BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.53 BuildRequires: automake -BuildRequires: evolution-data-server-devel >= 1.3.5 -BuildRequires: gtk+2-devel >= 2:2.6.4 +BuildRequires: evolution-data-server-devel >= 1.3.7-3 +BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: intltool BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libsoup-devel >= 2.2.3 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: evolution >= 2.3.5.1 -Requires: gtk+2 >= 2:2.6.4 +Requires: evolution >= 2.3.7-3 +Requires: gtk+2 >= 2:2.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_libdir}/evolution-webcal -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/evolution-webcal.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.2 2005/08/22 16:59:12 aflinta +- up to version 2.4.0 + Revision 1.20.2.1 2005/07/25 19:40:07 freetz - 2.3.90, bumped evo BRs/Rs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-webcal.spec?r1=1.20.2.1&r2=1.20.2.2&f=u From aflinta at pld-linux.org Mon Aug 22 18:59:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: evolution-webcal-2.4.0.tar.bz2 Message-ID: <15275.1124729971@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/2.4/evolution-webcal-2.4.0.tar.bz2 3a09711675d82075f007e565a0277185 evolution-webcal-2.4.0.tar.bz2 Size: 147170 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:06:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: gdm.spec - version 2.8.0.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:06:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.8.0.3 ---- Files affected: SPECS: gdm.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: SPECS/gdm.spec diff -u SPECS/gdm.spec:1.165 SPECS/gdm.spec:1.166 --- SPECS/gdm.spec:1.165 Tue Aug 9 15:57:53 2005 +++ SPECS/gdm.spec Mon Aug 22 19:05:56 2005 @@ -15,13 +15,13 @@ Summary(ru): ?????????? ???????? GNOME Summary(uk): ?????????? ???????? GNOME Name: gdm -Version: 2.8.0.2 +Version: 2.8.0.3 Release: 0.1 Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 738287f41471194b1b770a145590dc44 +# Source0-md5: e5fc040850ae90c456716d3dd6493f27 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}-pld-logo.png @@ -263,7 +263,7 @@ %{_pixmapsdir}/* %{_desktopdir}/gdmsetup.desktop %{_desktopdir}/gdmflexiserver.desktop -%{_datadir}/gnome/capplets/* +%{_desktopdir}/gdmphotosetup.desktop %{_datadir}/gdm #%%{_datadir}/xsessions - moved to gnome-session %{_datadir}/xsessions/default.desktop @@ -288,6 +288,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166 2005/08/22 17:05:56 aflinta +- version 2.8.0.3 + Revision 1.165 2005/08/09 13:57:53 aflinta - up to version 2.8.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.165&r2=1.166&f=u From aflinta at pld-linux.org Mon Aug 22 19:06:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: gdm-2.8.0.3.tar.bz2 gdm-storky.tar.gz Message-ID: <19193.1124730366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/gdm-2.8.0.3.tar.bz2 e5fc040850ae90c456716d3dd6493f27 gdm-2.8.0.3.tar.bz2 Size: 3920359 bytes ALREADY GOT: no-url://gdm-storky.tar.gz e293fbe4a60004056f6894463b874ae8 gdm-storky.tar.gz -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:12:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): gnome-games.spec - up to version 2.11.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:12:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - up to version 2.11.5 ---- Files affected: SPECS: gnome-games.spec (1.159.2.4 -> 1.159.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-games.spec diff -u SPECS/gnome-games.spec:1.159.2.4 SPECS/gnome-games.spec:1.159.2.5 --- SPECS/gnome-games.spec:1.159.2.4 Thu Aug 18 00:57:49 2005 +++ SPECS/gnome-games.spec Mon Aug 22 19:11:54 2005 @@ -7,13 +7,13 @@ Summary(uk): ???? ??? GNOME Summary(wa): Djeus po GNOME Name: gnome-games -Version: 2.11.4 -Release: 2 +Version: 2.11.5 +Release: 1 Epoch: 1 License: LGPL Group: X11/Applications/Games Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a1918551b282a04d74d4950955a433f0 +# Source0-md5: 7e55c2cce68886b48b81a513175956cb Patch0: %{name}-schemas.patch Patch1: %{name}-include.patch Patch2: %{name}-desktop.patch @@ -822,6 +822,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.159.2.5 2005/08/22 17:11:54 aflinta +- up to version 2.11.5 + Revision 1.159.2.4 2005/08/17 22:57:49 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-games.spec?r1=1.159.2.4&r2=1.159.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:12:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: gnome-games-2.11.5.tar.bz2 Message-ID: <22838.1124730726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.11/gnome-games-2.11.5.tar.bz2 7e55c2cce68886b48b81a513175956cb gnome-games-2.11.5.tar.bz2 Size: 4967289 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: libwnck-2.11.92.tar.bz2 Message-ID: <25075.1124730926@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/libwnck-2.11.92.tar.bz2 a21bde983e63bd3f12b44484b39c13e6 libwnck-2.11.92.tar.bz2 Size: 428692 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 19:15:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): libwnck.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:15:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: libwnck.spec (1.46.2.3 -> 1.46.2.4) ---- Diffs: ================================================================ Index: SPECS/libwnck.spec diff -u SPECS/libwnck.spec:1.46.2.3 SPECS/libwnck.spec:1.46.2.4 --- SPECS/libwnck.spec:1.46.2.3 Sun Aug 21 10:02:06 2005 +++ SPECS/libwnck.spec Mon Aug 22 19:15:19 2005 @@ -2,12 +2,12 @@ Summary: General Window Manager interfacing for GNOME utilities Summary(pl): Interfejs General Window Manager dla narz?dzi GNOME Name: libwnck -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 930daefe4d6bc2fce9426b0a594e1b0e +# Source0-md5: a21bde983e63bd3f12b44484b39c13e6 BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk+2-devel >= 2:2.8.0 @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.4 2005/08/22 17:15:19 aflinta +- version 2.11.92 + Revision 1.46.2.3 2005/08/21 08:02:06 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libwnck.spec?r1=1.46.2.3&r2=1.46.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 19:18:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): GConf2.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 17:18:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: GConf2.spec (1.91.2.4 -> 1.91.2.5) ---- Diffs: ================================================================ Index: SPECS/GConf2.spec diff -u SPECS/GConf2.spec:1.91.2.4 SPECS/GConf2.spec:1.91.2.5 --- SPECS/GConf2.spec:1.91.2.4 Wed Aug 17 23:12:34 2005 +++ SPECS/GConf2.spec Mon Aug 22 19:18:53 2005 @@ -11,12 +11,12 @@ Summary(pt_BR): Sistema de Configura??o do GNOME 2 Summary(ru): ??????? ???????????? GNOME 2 Name: GConf2 -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-%{version}.tar.bz2 -# Source0-md5: a36b17b2d5c58db36b17e826de0e0f25 +# Source0-md5: e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 Patch0: %{name}-NO_MAJOR_VERSION.patch Patch1: %{name}-path.patch URL: http://www.gnome.org/ @@ -165,6 +165,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91.2.5 2005/08/22 17:18:53 aflinta +- version 2.11.92 + Revision 1.91.2.4 2005/08/17 21:12:34 aflinta - rebuild with new cairo, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.91.2.4&r2=1.91.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 19:19:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: GConf-2.11.92.tar.bz2 Message-ID: <27037.1124731141@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/GConf/2.11/GConf-2.11.92.tar.bz2 e9f1b4f5d843a1b3ca7a9ffcaa93f1c2 GConf-2.11.92.tar.bz2 Size: 1891439 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:21:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: MayaVi.spec - fixed License field - added %doc, missing BRs... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:21:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed License field - added %doc, missing BRs and R ---- Files affected: SPECS: MayaVi.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/MayaVi.spec diff -u SPECS/MayaVi.spec:1.11 SPECS/MayaVi.spec:1.12 --- SPECS/MayaVi.spec:1.11 Tue Jun 29 12:55:03 2004 +++ SPECS/MayaVi.spec Mon Aug 22 19:21:05 2005 @@ -4,11 +4,14 @@ Name: MayaVi Version: 1.3 Release: 1 -License: GPL +License: BSD Group: Applications/Graphics Source0: http://dl.sourceforge.net/mayavi/%{name}-%{version}.tar.gz # Source0-md5: 38ae9dbe09a6bdb35289d8d6d98c65ba URL: http://mayavi.sourceforge.net/ +BuildRequires: python +BuildRequires: python-devel +Requires: python-tkinter BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,6 +42,7 @@ %files %defattr(644,root,root,755) +%doc doc/guide/*.html doc/CREDITS.txt doc/NEWS.txt doc/README.txt doc/TODO.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/mayavi %{py_sitescriptdir}/vtkPipeline @@ -49,6 +53,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 17:21:05 darekr +- fixed License field +- added %doc, missing BRs and R + Revision 1.11 2004/06/29 10:55:03 qboosh - use proper py macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/MayaVi.spec?r1=1.11&r2=1.12&f=u From undefine at pld-linux.org Mon Aug 22 19:35:19 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: getdp.spec - up to 1.1.0 In-Reply-To: References: Message-ID: Author: undefine Date: Mon Aug 22 17:35:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.1.0 ---- Files affected: SPECS: getdp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.4 SPECS/getdp.spec:1.5 --- SPECS/getdp.spec:1.4 Wed Jun 1 13:05:41 2005 +++ SPECS/getdp.spec Mon Aug 22 19:35:13 2005 @@ -2,12 +2,12 @@ Summary: A General environment for the treatment of Discrete Problems Summary(pl): ?rodowisko do rozwi?zywania problem?w dyskretnych Name: getdp -Version: 1.0.1 +Version: 1.1.0 Release: 1 License: GPL Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz -# Source0-md5: 5ed9b143d2205a7bbe5a13c91065593c +# Source0-md5: cceb5f66c3d2889048fd5f35d178171e URL: http://www.geuz.org/getdp/ BuildRequires: gcc-g77 BuildRequires: gsl-devel @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/22 17:35:13 undefine +- up to 1.1.0 + Revision 1.4 2005/06/01 11:05:41 zbyniu - BR: texinfo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.4&r2=1.5&f=u From undefine at pld-linux.org Mon Aug 22 19:35:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: getdp-1.1.0-source.tgz Message-ID: <6658.1124732123@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geuz.org/getdp/src/getdp-1.1.0-source.tgz cceb5f66c3d2889048fd5f35d178171e getdp-1.1.0-source.tgz Size: 1426981 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:37:47 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: alien.spec - updated to 8.56 In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 8.56 ---- Files affected: SPECS: alien.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/alien.spec diff -u SPECS/alien.spec:1.61 SPECS/alien.spec:1.62 --- SPECS/alien.spec:1.61 Mon Jun 27 02:35:00 2005 +++ SPECS/alien.spec Mon Aug 22 19:37:41 2005 @@ -3,12 +3,12 @@ Summary: Pakages converter (tgz, rpm, deb, slp) Summary(pl): Konwerter pakiet?w (tgz, rpm, deb, slp) Name: alien -Version: 8.53 +Version: 8.56 Release: 1 License: GPL Group: Applications/System Source0: http://kitenet.net/programs/alien/%{name}_%{version}.tar.gz -# Source0-md5: 48ace120b3f3810e0d2d005b6f8b0512 +# Source0-md5: a6b1f6278ab819635e65b0836186c777 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 44f9b3381776077447bbdb8c64d3f215 Patch0: %{name}-DESTDIR.patch @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/22 17:37:41 darekr +- updated to 8.56 + Revision 1.61 2005/06/27 00:35:00 undefine - up to 8.53 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/alien.spec?r1=1.61&r2=1.62&f=u From darekr at pld-linux.org Mon Aug 22 19:37:48 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: alien_8.56.tar.gz alien-non-english-man-pages.tar.bz2 Message-ID: <8173.1124732268@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kitenet.net/programs/alien/alien_8.56.tar.gz a6b1f6278ab819635e65b0836186c777 alien_8.56.tar.gz Size: 73618 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/alien-non-english-man-pages.tar.bz2 44f9b3381776077447bbdb8c64d3f215 alien-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 19:42:25 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: getdp.spec - kill setting perms in %install In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 17:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill setting perms in %install ---- Files affected: SPECS: getdp.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.5 SPECS/getdp.spec:1.6 --- SPECS/getdp.spec:1.5 Mon Aug 22 19:35:13 2005 +++ SPECS/getdp.spec Mon Aug 22 19:42:20 2005 @@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_infodir}} -install -m 755 bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp +install bin/getdp $RPM_BUILD_ROOT%{_bindir}/getdp install doc/getdp.1 $RPM_BUILD_ROOT%{_mandir}/man1 install doc/texinfo/getdp.info* $RPM_BUILD_ROOT%{_infodir} @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 17:42:20 darekr +- kill setting perms in %install + Revision 1.5 2005/08/22 17:35:13 undefine - up to 1.1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.5&r2=1.6&f=u From wolf at pld-linux.org Mon Aug 22 19:50:39 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: dotnet-gecko-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 17:50:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14 SPECS/dotnet-gecko-sharp.spec:1.15 --- SPECS/dotnet-gecko-sharp.spec:1.14 Tue May 3 23:15:27 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 19:50:34 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -92,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 17:50:34 wolf +- mono auto deps + Revision 1.14 2005/05/03 21:15:27 qboosh - build on alpha, revised deps, fix webshot if only mint is available; release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Mon Aug 22 19:56:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: lat.spec - up to 0.7 In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 17:56:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7 ---- Files affected: SPECS: lat.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/lat.spec diff -u SPECS/lat.spec:1.8 SPECS/lat.spec:1.9 --- SPECS/lat.spec:1.8 Mon Aug 1 17:40:11 2005 +++ SPECS/lat.spec Mon Aug 22 19:56:16 2005 @@ -2,12 +2,12 @@ Summary: LAT - LDAP Administration Tool Summary(pl): LAT - narz?dzie administracyjne dla LDAP Name: lat -Version: 0.6.1 +Version: 0.7 Release: 0.1 License: GPL v2 Group: Applications/Networking Source0: http://people.mmgsecurity.com/~lorenb/lat/releases/%{name}-%{version}.tar.gz -# Source0-md5: 59eb63b1cd8273822eca1198b3fcbff6 +# Source0-md5: cb9c01a20bf58bb8e6396f54a148f4e8 Source1: %{name}.png Patch0: %{name}-scrollkeeper_dir.patch Patch1: %{name}-desktop.patch @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/22 17:56:16 twittner +- up to 0.7 + Revision 1.8 2005/08/01 15:40:11 twittner - up to 0.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lat.spec?r1=1.8&r2=1.9&f=u From twittner at pld-linux.org Mon Aug 22 19:56:36 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: lat-0.7.tar.gz Message-ID: <19981.1124733396@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.mmgsecurity.com/~lorenb/lat/releases/lat-0.7.tar.gz cb9c01a20bf58bb8e6396f54a148f4e8 lat-0.7.tar.gz Size: 591415 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 20:01:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: getdp.spec - proper License, added README to %doc In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 18:01:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License, added README to %doc ---- Files affected: SPECS: getdp.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/getdp.spec diff -u SPECS/getdp.spec:1.6 SPECS/getdp.spec:1.7 --- SPECS/getdp.spec:1.6 Mon Aug 22 19:42:20 2005 +++ SPECS/getdp.spec Mon Aug 22 20:01:16 2005 @@ -4,7 +4,7 @@ Name: getdp Version: 1.1.0 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Engineering Source0: http://geuz.org/getdp/src/%{name}-%{version}-source.tgz # Source0-md5: cceb5f66c3d2889048fd5f35d178171e @@ -63,7 +63,7 @@ %files %defattr(644,root,root,755) -%doc doc/VERSIONS doc/FAQ doc/CREDITS demos +%doc doc/VERSIONS doc/FAQ doc/CREDITS demos README %attr(755,root,root) %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_infodir}/%{name}* @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/22 18:01:16 darekr +- proper License, added README to %doc + Revision 1.6 2005/08/22 17:42:20 darekr - kill setting perms in %install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/getdp.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Mon Aug 22 20:19:05 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: nx.spec - typo In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 18:19:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: nx.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/nx.spec diff -u SPECS/nx.spec:1.3 SPECS/nx.spec:1.4 --- SPECS/nx.spec:1.3 Sat Nov 20 14:21:30 2004 +++ SPECS/nx.spec Mon Aug 22 20:18:59 2005 @@ -44,7 +44,7 @@ dialup links or anything better. %description -l pl -NoMachine NX to schemat kompresji dla X nowej generacji. Dziala na +NoMachine NX to schemat kompresji dla X nowej generacji. Dzia?a na zdalnych sesjach X11 nawet przy pr?dkosci 56k albo wi?kszej. %prep @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/22 18:18:59 twittner +- typo + Revision 1.3 2004/11/20 13:21:30 qboosh - adjusted build for clean to work, fixed dups in files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nx.spec?r1=1.3&r2=1.4&f=u From wolf at pld-linux.org Mon Aug 22 20:28:57 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): dotnet-gecko-sharp.spec - mono auto deps - monodoc ... In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:28:57 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps - monodoc documentation ---- Files affected: SPECS: dotnet-gecko-sharp.spec (1.14.2.4 -> 1.14.2.5) ---- Diffs: ================================================================ Index: SPECS/dotnet-gecko-sharp.spec diff -u SPECS/dotnet-gecko-sharp.spec:1.14.2.4 SPECS/dotnet-gecko-sharp.spec:1.14.2.5 --- SPECS/dotnet-gecko-sharp.spec:1.14.2.4 Sun Jun 19 18:35:07 2005 +++ SPECS/dotnet-gecko-sharp.spec Mon Aug 22 20:28:51 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: Gecko# - A Gtk# Mozilla binding Summary(pl): Gecko# - wi?zanie Gtk# dla Mozilli Name: dotnet-gecko-sharp @@ -13,14 +14,13 @@ URL: http://www.mono-project.com/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.3 BuildRequires: mono-csharp >= 1.1.0 BuildRequires: gtk+2-devel >= 2.0.0 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildConflicts: gecko-sharp < 0.2 Requires: mozilla-embedded -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: dotnet-gecko Provides: gecko-sharp = %{version} Obsoletes: dotnet-gecko @@ -92,6 +92,7 @@ %files devel %defattr(644,root,root,755) %{_pkgconfigdir}/* +%{_libdir}/monodoc/sources/* /usr/lib/mono/gecko-sharp-2.0 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -100,6 +101,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14.2.5 2005/08/22 18:28:51 wolf +- mono auto deps +- monodoc documentation + Revision 1.14.2.4 2005/06/19 16:35:07 prism - fixed install (mv failed because a destination was the same as a source) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gecko-sharp.spec?r1=1.14.2.4&r2=1.14.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:41 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: horde-passwd.spec - updated to 3.0-beta which works with ho... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:32:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0-beta which works with horde 3.x series ---- Files affected: SPECS: horde-passwd.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.11 SPECS/horde-passwd.spec:1.12 --- SPECS/horde-passwd.spec:1.11 Sun May 29 14:39:38 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:32:36 2005 @@ -4,19 +4,19 @@ Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd -Version: 2.2.2 +Version: 3.0 Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: http://ftp.horde.org/pub/passwd/passwd-%{version}.tar.gz -# Source0-md5: d1c63a16c67e302c9e4885c1386d638e +Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 PreReq: apache Requires(post): grep -Requires: horde < 3.0 +Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch @@ -38,16 +38,16 @@ modu?. %prep -%setup -q -n passwd-%{version} +%setup -q -n passwd-h3-%{version}-beta %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{graphics,lib,locale,templates,scripts} +install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} install -d $RPM_BUILD_ROOT%{confdir}/passwd cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/graphics +cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates @@ -106,7 +106,7 @@ %doc README docs/* %dir %{hordedir}/passwd %attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/graphics +%attr(750,root,http) %{hordedir}/passwd/themes/graphics %attr(750,root,http) %{hordedir}/passwd/lib %attr(750,root,http) %{hordedir}/passwd/locale %attr(750,root,http) %{hordedir}/passwd/templates @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/22 18:32:36 paszczus +- updated to 3.0-beta which works with horde 3.x series + Revision 1.11 2005/05/29 12:39:38 paszczus - runs only with horde >= 2.0 but < 3.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.11&r2=1.12&f=u From paszczus at pld-linux.org Mon Aug 22 20:32:55 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: passwd-h3-3.0-beta.tar.gz Message-ID: <10609.1124735575@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/passwd/passwd-h3-3.0-beta.tar.gz 9ea299d2822c9d3ca5efca03ce6a23a4 passwd-h3-3.0-beta.tar.gz Size: 894549 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 20:33:18 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): dotnet-gtksourceview-sharp.spec - mono auto deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:33:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - mono auto deps ---- Files affected: SPECS: dotnet-gtksourceview-sharp.spec (1.17.2.7 -> 1.17.2.8) ---- Diffs: ================================================================ Index: SPECS/dotnet-gtksourceview-sharp.spec diff -u SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.8 --- SPECS/dotnet-gtksourceview-sharp.spec:1.17.2.7 Sun Jul 17 14:11:04 2005 +++ SPECS/dotnet-gtksourceview-sharp.spec Mon Aug 22 20:33:13 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.mono Summary: .NET language bindings for GtkSourceView Summary(pl): Wi?zania GtkSourceView dla .NET Name: dotnet-gtksourceview-sharp @@ -13,15 +14,13 @@ ExcludeArch: alpha BuildRequires: autoconf BuildRequires: automake >= 1:1.7 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.3 -BuildRequires: dotnet-gtk-sharp-gnome-devel >= 1.9.3 +BuildRequires: dotnet-gtk-sharp2-gnome-devel >= 1.9.3 BuildRequires: gtksourceview-devel >= 1.0.1 BuildRequires: libtool BuildRequires: monodoc >= 0.16 BuildRequires: mono-csharp >= 1.1.6 BuildRequires: pkgconfig Requires: gtksourceview >= 1.0.1 -Requires: dotnet-gtk-sharp >= 1.9.3 Provides: gtksourceview-sharp Obsoletes: gtksourceview-sharp Provides: dotnet-gtksourceview @@ -105,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17.2.8 2005/08/22 18:33:13 wolf +- mono auto deps + Revision 1.17.2.7 2005/07/17 12:11:04 deejay1 - BR: dotnet-gtk-sharp-gnome-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dotnet-gtksourceview-sharp.spec?r1=1.17.2.7&r2=1.17.2.8&f=u From paszczus at pld-linux.org Mon Aug 22 20:37:59 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: horde-passwd.spec - added _noautoreq In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 18:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq ---- Files affected: SPECS: horde-passwd.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.12 SPECS/horde-passwd.spec:1.13 --- SPECS/horde-passwd.spec:1.12 Mon Aug 22 20:32:36 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 20:37:53 2005 @@ -22,6 +22,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' + %define apachedir /etc/httpd %define hordedir /usr/share/horde %define confdir /etc/horde.org @@ -124,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/22 18:37:53 paszczus +- added _noautoreq + Revision 1.12 2005/08/22 18:32:36 paszczus - updated to 3.0-beta which works with horde 3.x series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.12&r2=1.13&f=u From wolf at pld-linux.org Mon Aug 22 20:42:30 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: monodevelop.spec - auto mono deps In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 18:42:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - auto mono deps ---- Files affected: SPECS: monodevelop.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/monodevelop.spec diff -u SPECS/monodevelop.spec:1.23 SPECS/monodevelop.spec:1.24 --- SPECS/monodevelop.spec:1.23 Wed Jun 29 02:23:21 2005 +++ SPECS/monodevelop.spec Mon Aug 22 20:42:25 2005 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -%define monoversion 1.1.5 +%include /usr/lib/rpm/macros.mono Summary: Mono IDE Summary(pl): IDE dla Mono Name: monodevelop @@ -19,7 +19,7 @@ BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: dotnet-gecko-sharp-devel >= 0.10 -BuildRequires: dotnet-gtk-sharp-devel >= 1.9.5 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.5 BuildRequires: dotnet-gtksourceview-sharp-devel >= 0.10 BuildRequires: gettext-devel BuildRequires: intltool @@ -29,12 +29,7 @@ BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildRequires: shared-mime-info -Requires: mono -Requires: monodoc Requires: mozilla-embedded -Requires: dotnet-gtksourceview-sharp -Requires: dotnet-gecko-sharp -Requires: dotnet-gtk-sharp Requires(post,postun): shared-mime-info Obsoletes: MonoDevelop ExcludeArch: alpha @@ -136,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/22 18:42:25 wolf +- auto mono deps + Revision 1.23 2005/06/29 00:23:21 charles - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monodevelop.spec?r1=1.23&r2=1.24&f=u From arekm at pld-linux.org Mon Aug 22 21:02:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: digikam.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:02:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikam.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.41 SPECS/digikam.spec:1.42 --- SPECS/digikam.spec:1.41 Mon Jul 18 13:15:53 2005 +++ SPECS/digikam.spec Mon Aug 22 21:01:58 2005 @@ -2,12 +2,12 @@ Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.3 +Version: 0.7.4 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 19a2b479ea16ce4a227e04215f885780 +# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -105,6 +105,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la +%{_includedir}/*.h %{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -113,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/22 19:01:58 arekm +- up to 0.7.4 + Revision 1.41 2005/07/18 11:15:53 charles - updated to 0.7.3 - updated build section, added --all-name to find_lang ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Mon Aug 22 21:02:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: digikam-0.7.4.tar.bz2 Message-ID: <683.1124737335@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikam-0.7.4.tar.bz2 3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 Size: 2322119 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:03:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS: horde-passwd.spec - convert to horde 3.x style In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:03:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - convert to horde 3.x style ---- Files affected: SPECS: horde-passwd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.13 SPECS/horde-passwd.spec:1.14 --- SPECS/horde-passwd.spec:1.13 Mon Aug 22 20:37:53 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:03:39 2005 @@ -1,11 +1,12 @@ # $Revision$, $Date$ # +%define _hordeapp passwd %include /usr/lib/rpm/macros.php Summary: passwd - password change module for Horde Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.1 +Release: 0.4 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -13,20 +14,23 @@ # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf URL: http://www.horde.org/passwd/ +BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 -PreReq: apache -Requires(post): grep +Requires: apache >= 1.3.33-2 +Requires: apache(mod_access) Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-passwd BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'pear(../lib/.*)' 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +# horde accesses it directly in help->about +%define _noautocompressdoc CREDITS +%define _noautoreq 'pear(Horde/.*)' -%define apachedir /etc/httpd %define hordedir /usr/share/horde -%define confdir /etc/horde.org +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} %description Passwd is the Horde password changing application. While it has been @@ -42,58 +46,52 @@ %prep %setup -q -n passwd-h3-%{version}-beta +# considered harmful (horde/docs/SECURITY) +rm -f test.php + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{apachedir} $RPM_BUILD_ROOT%{hordedir}/passwd/{themes/graphics,lib,locale,templates,scripts} -install -d $RPM_BUILD_ROOT%{confdir}/passwd +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ + $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} + +cp -pR *.php $RPM_BUILD_ROOT%{_appdir} +for i in config/*.dist; do + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) +done + +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak + +cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib +cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale +cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates +cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/passwd -cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/passwd -cp -pR themes/graphics/* $RPM_BUILD_ROOT%{hordedir}/passwd/themes/graphics -cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/passwd/lib -cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/passwd/locale -cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/passwd/templates -cp -p config/.htaccess $RPM_BUILD_ROOT%{confdir}/passwd -cp -p templates/.htaccess $RPM_BUILD_ROOT%{hordedir}/passwd/templates - -ln -fs %{confdir}/passwd $RPM_BUILD_ROOT%{hordedir}/passwd/config - -install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir} - -# bit unclean.. -cd $RPM_BUILD_ROOT%{confdir}/passwd -for i in *.dist; do cp $i `basename $i .dist`; done +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -elif [ -d /etc/httpd/httpd.conf ]; then - ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - fi - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi -fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %triggerpostun -- horde-passwd <= 2.2-0.1 for i in backends.php conf.php; do @@ -105,20 +103,22 @@ %files %defattr(644,root,root,755) -%doc README docs/* -%dir %{hordedir}/passwd -%attr(640,root,http) %{hordedir}/passwd/*.php -%attr(750,root,http) %{hordedir}/passwd/themes/graphics -%attr(750,root,http) %{hordedir}/passwd/lib -%attr(750,root,http) %{hordedir}/passwd/locale -%attr(750,root,http) %{hordedir}/passwd/templates - -%attr(750,root,http) %dir %{confdir}/passwd -%{hordedir}/passwd/config -%attr(640,root,http) %{confdir}/passwd/*.dist -%attr(640,root,http) %{confdir}/passwd/.htaccess -%attr(640,root,http) %config(noreplace) %{confdir}/passwd/*.php -%attr(640,root,http) %{apachedir}/%{name}.conf +%doc README docs/* scripts +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml + +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/config +%{_appdir}/docs +%{_appdir}/lib +%{_appdir}/locale +%{_appdir}/templates +%{_appdir}/themes %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/22 19:03:39 glen +- convert to horde 3.x style + Revision 1.13 2005/08/22 18:37:53 paszczus - added _noautoreq ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.13&r2=1.14&f=u From paszczus at pld-linux.org Mon Aug 22 21:10:24 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: DISTFILES: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <6908.1124737824@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz de81a870fda572fe1d4d81db8c31f41f imp-FRAMEWORK_3-2005-08-22.tar.gz Size: 3307364 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 21:10:06 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:29 2005 Subject: SPECS (DEVEL): imp.spec - updated to 2005-08-22 snap ; removed TODO In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 19:10:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-22 snap ; removed TODO ---- Files affected: SPECS: imp.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.2 SPECS/imp.spec:1.81.2.3 --- SPECS/imp.spec:1.81.2.2 Thu Jul 21 00:07:56 2005 +++ SPECS/imp.spec Mon Aug 22 21:10:00 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# TODO -# - imap login broken, see http://bugs.horde.org/ticket/?id=1937 -%define _snap 2005-05-21 +%define _snap 2005-08-22 %include /usr/lib/rpm/macros.php Summary: Web Based IMAP Mail Program @@ -14,13 +12,8 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW -%if 0%{?_snap} Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: 15e787abce02eaafeb4fab78aa653e02 -%else -Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz -# Source0-md5: 42e7232663f65c2edf5e5bb8c85e84f9 -%endif +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -164,6 +157,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/22 19:10:00 paszczus +- updated to 2005-08-22 snap ; removed TODO + Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From arekm at pld-linux.org Mon Aug 22 21:13:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: digikamimageplugins.spec - up to 0.7.4 In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 19:13:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.4 ---- Files affected: SPECS: digikamimageplugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.5 SPECS/digikamimageplugins.spec:1.6 --- SPECS/digikamimageplugins.spec:1.5 Mon May 23 17:25:47 2005 +++ SPECS/digikamimageplugins.spec Mon Aug 22 21:13:06 2005 @@ -2,12 +2,12 @@ Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.2 -Release: 0.1 +Version: 0.7.4 +Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: ff3d2da71168b7e2f166b450fe8053e2 +# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -51,7 +51,8 @@ %setup -q %build -%configure +%configure \ + --with-qt-libraries=%{_libdir} %{__make} %install @@ -82,6 +83,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/22 19:13:06 arekm +- up to 0.7.4 + Revision 1.5 2005/05/23 15:25:47 darekr - 1.129 macros for _kdedocdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.5&r2=1.6&f=u From arekm at pld-linux.org Mon Aug 22 21:13:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: digikamimageplugins-0.7.4.tar.bz2 Message-ID: <8804.1124737994@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/digikam/digikamimageplugins-0.7.4.tar.bz2 5ea3c0dd6e6f1eb99211e75d0bf17d3d digikamimageplugins-0.7.4.tar.bz2 Size: 2341192 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Mon Aug 22 21:13:38 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: f-spot.spec - remove manual requires In-Reply-To: References: Message-ID: Author: wolf Date: Mon Aug 22 19:13:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - remove manual requires ---- Files affected: SPECS: f-spot.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.17 SPECS/f-spot.spec:1.18 --- SPECS/f-spot.spec:1.17 Mon Aug 22 17:07:47 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:13:33 2005 @@ -24,8 +24,6 @@ BuildRequires: mono-csharp >= 1.0 BuildRequires: sqlite-devel >= 2.8.6 BuildRequires: pkgconfig -Requires: dotnet-gtk-sharp2 >= 2.3.90 -Requires: mono >= 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -79,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/22 19:13:33 wolf +- remove manual requires + Revision 1.17 2005/08/22 15:07:47 wolf - mono auto deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.17&r2=1.18&f=u From aflinta at pld-linux.org Mon Aug 22 21:21:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-desktop-2.11.92.tar.bz2 pld-logo.svg Message-ID: <14995.1124738485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/gnome-desktop-2.11.92.tar.bz2 1addb9e2b94d9df9b6463643419c53ba gnome-desktop-2.11.92.tar.bz2 Size: 1035085 bytes ALREADY GOT: no-url://pld-logo.svg 9fda4ca70a6e8e82e8e5bebe0e28db74 pld-logo.svg -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:21:20 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-desktop.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:21:20 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-desktop.spec (1.83.2.4 -> 1.83.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-desktop.spec diff -u SPECS/gnome-desktop.spec:1.83.2.4 SPECS/gnome-desktop.spec:1.83.2.5 --- SPECS/gnome-desktop.spec:1.83.2.4 Wed Aug 17 22:37:59 2005 +++ SPECS/gnome-desktop.spec Mon Aug 22 21:21:13 2005 @@ -2,12 +2,12 @@ Summary: The core programs for the GNOME2 GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME2 Name: gnome-desktop -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 704d14f959ab6a9186f45d27bb83e4b7 +# Source0-md5: 1addb9e2b94d9df9b6463643419c53ba Source1: pld-logo.svg # Source1-md5: 9fda4ca70a6e8e82e8e5bebe0e28db74 Patch0: %{name}-crystalsvg.patch @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83.2.5 2005/08/22 19:21:13 aflinta +- version 2.11.92 + Revision 1.83.2.4 2005/08/17 20:37:59 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-desktop.spec?r1=1.83.2.4&r2=1.83.2.5&f=u From glen at pld-linux.org Mon Aug 22 21:24:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): imp.spec - fix broken trigger In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:24:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix broken trigger ---- Files affected: SPECS: imp.spec (1.81.2.3 -> 1.81.2.4) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.3 SPECS/imp.spec:1.81.2.4 --- SPECS/imp.spec:1.81.2.3 Mon Aug 22 21:10:00 2005 +++ SPECS/imp.spec Mon Aug 22 21:24:39 2005 @@ -12,8 +12,9 @@ Release: 0.%(echo %{_snap} | tr -d -).1 License: GPL v2 Group: Applications/WWW +#Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: de81a870fda572fe1d4d81db8c31f41f +# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -69,7 +70,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} @@ -122,9 +123,9 @@ done %triggerpostun -- imp <= 4.0.2-1 -if [ -f %{_apache2dir}/imp.conf.rpmsave ]; then +if [ -f /etc/httpd/imp.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi if [ -f /var/lock/subsys/httpd ]; then @@ -157,8 +158,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.4 2005/08/22 19:24:39 glen +- fix broken trigger + Revision 1.81.2.3 2005/08/22 19:10:00 paszczus -- updated to 2005-08-22 snap ; removed TODO +- updated to 2005-08-22 snap; removed TODO Revision 1.81.2.2 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.3&r2=1.81.2.4&f=u From glen at pld-linux.org Mon Aug 22 21:25:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: ERRORS: imp-FRAMEWORK_3-2005-08-22.tar.gz Message-ID: <17040.1124738708@distfiles.pld-linux.org> FATAL: http://ftp.horde.org/pub/snaps/2005-08-22/imp-FRAMEWORK_3-2005-08-22.tar.gz md5 mismatch, needed c222e646c31afe0f3d7934880aa1aa0c, got de81a870fda572fe1d4d81db8c31f41f Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:25:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): imp.spec - fixed md5 In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:25:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed md5 ---- Files affected: SPECS: imp.spec (1.81.2.4 -> 1.81.2.5) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.81.2.4 SPECS/imp.spec:1.81.2.5 --- SPECS/imp.spec:1.81.2.4 Mon Aug 22 21:24:39 2005 +++ SPECS/imp.spec Mon Aug 22 21:25:45 2005 @@ -14,7 +14,7 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/imp-FRAMEWORK_3-%{_snap}.tar.gz -# Source0-md5: c222e646c31afe0f3d7934880aa1aa0c +# Source0-md5: de81a870fda572fe1d4d81db8c31f41f Source1: %{name}.conf Source2: %{name}-pgsql_create.sql Source3: %{name}-pgsql_cuser.sh @@ -158,6 +158,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.5 2005/08/22 19:25:45 glen +- fixed md5 + Revision 1.81.2.4 2005/08/22 19:24:39 glen - fix broken trigger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.4&r2=1.81.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 21:28:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-netstatus-2.11.92.tar.bz2 Message-ID: <20208.1124738935@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/gnome-netstatus-2.11.92.tar.bz2 3dcd5a260b74f0ec8cdbd09578011f0c gnome-netstatus-2.11.92.tar.bz2 Size: 467494 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:28:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:28:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.3 -> 1.20.2.4) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.3 SPECS/gnome-netstatus.spec:1.20.2.4 --- SPECS/gnome-netstatus.spec:1.20.2.3 Thu Aug 18 12:58:11 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:28:51 2005 @@ -2,12 +2,12 @@ Summary: Applet that displays the network status in a GNOME panel Summary(pl): Aplet wy?wietlaj?cy stan po??cze? sieciowych na panelu GNOME Name: gnome-netstatus -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: eea34fad7531398d68dc880fb343c296 +# Source0-md5: 3dcd5a260b74f0ec8cdbd09578011f0c URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -43,7 +43,8 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.4 2005/08/22 19:28:51 aflinta +- version 2.11.92 + Revision 1.20.2.3 2005/08/18 10:58:11 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.3&r2=1.20.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:32:46 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: vino-2.11.92.tar.bz2 Message-ID: <22923.1124739166@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/vino-2.11.92.tar.bz2 58047c590714e983e2a3daafb3661c81 vino-2.11.92.tar.bz2 Size: 566304 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 21:32:32 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): vino.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:32:32 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: vino.spec (1.18.2.3 -> 1.18.2.4) ---- Diffs: ================================================================ Index: SPECS/vino.spec diff -u SPECS/vino.spec:1.18.2.3 SPECS/vino.spec:1.18.2.4 --- SPECS/vino.spec:1.18.2.3 Thu Aug 18 14:07:20 2005 +++ SPECS/vino.spec Mon Aug 22 21:32:19 2005 @@ -2,12 +2,12 @@ Summary: A remote desktop system for GNOME Summary(pl): System zdalnego pulpitu dla GNOME Name: vino -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/vino/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 78440fe650378c2d6b63ff7174558df3 +# Source0-md5: 58047c590714e983e2a3daafb3661c81 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18.2.4 2005/08/22 19:32:19 aflinta +- version 2.11.92 + Revision 1.18.2.3 2005/08/18 12:07:20 aflinta - rebuild with caito, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vino.spec?r1=1.18.2.3&r2=1.18.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 21:36:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES (DEVEL): gnome-menus-pl.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:36:26 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - obsoleted ---- Files affected: SOURCES: gnome-menus-pl.patch (1.1.2.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Mon Aug 22 21:37:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-menus.spec - version 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:37:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.92 ---- Files affected: SPECS: gnome-menus.spec (1.24.2.8 -> 1.24.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-menus.spec diff -u SPECS/gnome-menus.spec:1.24.2.8 SPECS/gnome-menus.spec:1.24.2.9 --- SPECS/gnome-menus.spec:1.24.2.8 Tue Aug 9 15:37:41 2005 +++ SPECS/gnome-menus.spec Mon Aug 22 21:37:45 2005 @@ -2,14 +2,13 @@ Summary: Implementation of the draft Desktop Menu Specification Summary(pl): Implementacja specyfikacji menu system?w biurkowych Name: gnome-menus -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 7e90fda926e28dc31043281562a83da4 +# Source0-md5: 75ba6497923b00a2f186f27a135b6800 Patch0: %{name}-PLD.patch -Patch1: %{name}-pl.patch URL: http://www.gnome.org/ BuildRequires: autoconf BuildRequires: automake @@ -106,7 +105,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -175,6 +173,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24.2.9 2005/08/22 19:37:45 aflinta +- version 2.11.92 + Revision 1.24.2.8 2005/08/09 13:37:41 aflinta - ups, missing desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-menus.spec?r1=1.24.2.8&r2=1.24.2.9&f=u From aflinta at pld-linux.org Mon Aug 22 21:37:49 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-menus-2.11.92.tar.bz2 Message-ID: <26277.1124739469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-menus/2.11/gnome-menus-2.11.92.tar.bz2 75ba6497923b00a2f186f27a135b6800 gnome-menus-2.11.92.tar.bz2 Size: 389415 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Mon Aug 22 21:38:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - rel. 3 for epiphany 1.7.5 In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:38:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - rel. 3 for epiphany 1.7.5 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.5 -> 1.37.2.6) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.5 SPECS/epiphany-extensions.spec:1.37.2.6 --- SPECS/epiphany-extensions.spec:1.37.2.5 Tue Aug 9 16:19:33 2005 +++ SPECS/epiphany-extensions.spec Mon Aug 22 21:38:11 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.4 -Release: 2 +Release: 3 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -16,7 +16,7 @@ URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.4 +BuildRequires: epiphany-devel >= 1.7.5 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.6 2005/08/22 19:38:11 paladine +- rel. 3 for epiphany 1.7.5 + Revision 1.37.2.5 2005/08/09 14:19:33 paladine - rel. 2 for rebuild with epiphany 1.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.5&r2=1.37.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: f-spot.spec - version 0.1.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 19:41:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 0.1.1 ---- Files affected: SPECS: f-spot.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/f-spot.spec diff -u SPECS/f-spot.spec:1.18 SPECS/f-spot.spec:1.19 --- SPECS/f-spot.spec:1.18 Mon Aug 22 21:13:33 2005 +++ SPECS/f-spot.spec Mon Aug 22 21:41:11 2005 @@ -3,12 +3,12 @@ Summary: Personal photo manager Summary(pl): Mened?er prywatnych galerii fotograficznych Name: f-spot -Version: 0.1.0 -Release: 0.2 +Version: 0.1.1 +Release: 0.1 License: GPL Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/%{name}-%{version}.tar.bz2 -# Source0-md5: f9cab78264a978e025d2af6425ea0ec5 +# Source0-md5: 7f0230dd8fa1e0bc071951c03c6ac375 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/projects/f-spot/ BuildRequires: GConf2-devel @@ -77,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/22 19:41:11 aflinta +- version 0.1.1 + Revision 1.18 2005/08/22 19:13:33 wolf - remove manual requires ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/f-spot.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Mon Aug 22 21:41:17 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: f-spot-0.1.1.tar.bz2 Message-ID: <28577.1124739677@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.1/f-spot-0.1.1.tar.bz2 7f0230dd8fa1e0bc071951c03c6ac375 f-spot-0.1.1.tar.bz2 Size: 792413 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 21:41:46 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: horde-passwd.spec - set default list of usernames where pas... In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 19:41:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - set default list of usernames where password set is refused based on target machine system users ---- Files affected: SPECS: horde-passwd.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.14 SPECS/horde-passwd.spec:1.15 --- SPECS/horde-passwd.spec:1.14 Mon Aug 22 21:03:39 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 21:41:41 2005 @@ -6,7 +6,7 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.4 +Release: 0.10 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -16,6 +16,7 @@ URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -81,6 +82,15 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi +# take uids with < 500 and update refused logins in default conf.xml +USERLIST=$(awk -F: '{ if ($3 < 500) print $1 }' < /etc/passwd | xargs | tr ' ' ',') +if [ "$USERLIST" ]; then + sed -i -e " + # primitive xml parser ;) + /configlist name=\"refused\"/s/>.*$USERLIST= 1.3.33-2 %apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf @@ -126,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/22 19:41:41 glen +- set default list of usernames where password set is refused based on target machine system users + Revision 1.14 2005/08/22 19:03:39 glen - convert to horde 3.x style ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.14&r2=1.15&f=u From paladine at pld-linux.org Mon Aug 22 21:49:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-netstatus.spec - gnome-doc-utils for omf file... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 19:49:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - gnome-doc-utils for omf files - itemize schemas ---- Files affected: SPECS: gnome-netstatus.spec (1.20.2.4 -> 1.20.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-netstatus.spec diff -u SPECS/gnome-netstatus.spec:1.20.2.4 SPECS/gnome-netstatus.spec:1.20.2.5 --- SPECS/gnome-netstatus.spec:1.20.2.4 Mon Aug 22 21:28:51 2005 +++ SPECS/gnome-netstatus.spec Mon Aug 22 21:49:29 2005 @@ -14,6 +14,7 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-panel-devel >= 2.10.0 BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.0 @@ -37,15 +38,14 @@ %setup -q %build +gnome-doc-prepare --copy --force %{__gnome_doc_common} %{__libtoolize} %{__aclocal} %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ - --disable-scrollkeeper - + --disable-schemas-install %{__make} %install @@ -82,7 +82,7 @@ %{_libdir}/bonobo/servers/* %{_omf_dest_dir}/%{name} %{_pixmapsdir}/* -%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/netstatus.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -90,6 +90,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20.2.5 2005/08/22 19:49:29 paladine +- gnome-doc-utils for omf files +- itemize schemas + Revision 1.20.2.4 2005/08/22 19:28:51 aflinta - version 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-netstatus.spec?r1=1.20.2.4&r2=1.20.2.5&f=u From arekm at pld-linux.org Mon Aug 22 22:03:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: tpop3d.spec - rel 16; new cvs patch In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 16; new cvs patch ---- Files affected: SPECS: tpop3d.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/tpop3d.spec diff -u SPECS/tpop3d.spec:1.62 SPECS/tpop3d.spec:1.63 --- SPECS/tpop3d.spec:1.62 Fri Jul 22 01:59:42 2005 +++ SPECS/tpop3d.spec Mon Aug 22 22:03:46 2005 @@ -9,6 +9,7 @@ %bcond_without pgsql # without PostgreSQL support %bcond_without ssl # without ssl support %bcond_without whoson # without WHOSON protocol support +%bcond_without gdbm # without gdbm auth db %bcond_without snide # without snide server responses %bcond_with skipgetpwcheck # with getpwuid returned struct check ommited (see patch for details) # @@ -16,7 +17,7 @@ Summary(pl): Serwer POP3 Name: tpop3d Version: 1.5.3 -Release: 15 +Release: 16 License: GPL Group: Networking/Daemons Source0: http://www.ex-parrot.com/~chris/tpop3d/%{name}-%{version}.tar.gz @@ -25,7 +26,7 @@ Source2: %{name}.init Source3: %{name}.conf Patch0: %{name}-ac_am_fixes.patch -Patch1: %{name}-cvs20041005.patch +Patch1: %{name}-cvs20050822.patch Patch2: %{name}-resolv.patch Patch3: %{name}-pam-vdomain.patch Patch4: %{name}-disable-dotfile-locking.patch @@ -39,6 +40,7 @@ %{?with_pgsql:BuildRequires: postgresql-devel} %{?with_whoson:BuildRequires: whoson-devel} %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +%{?with_gdbm:BuildRequires: gdbm-devel} PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig Requires: pam >= 0.79.0 @@ -136,6 +138,7 @@ %{?with_whoson: --enable-whoson} \ %{?with_perl: --enable-auth-perl} \ %{?with_pgsql: --enable-auth-pgsql} \ +%{?with_gdbm: --enable-gdbm} \ %{?with_authother: --enable-auth-other} \ --enable-mbox-maildir \ %{?with_ssl: --enable-tls} \ @@ -193,6 +196,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/22 20:03:46 arekm +- rel 16; new cvs patch + Revision 1.62 2005/07/21 23:59:42 romke - added bcond skipgetpwcheck - it allows using uids (in {my,pg}sql virtual users) that don't belong to any system user (when getpwuid returns NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tpop3d.spec?r1=1.62&r2=1.63&f=u From arekm at pld-linux.org Mon Aug 22 22:03:42 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES: tpop3d-cvs20050822.patch (NEW), tpop3d-cvs20041005.patch ... In-Reply-To: References: Message-ID: Author: arekm Date: Mon Aug 22 20:03:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up cvs patch to 20050822 ---- Files affected: SOURCES: tpop3d-cvs20050822.patch (NONE -> 1.1) (NEW), tpop3d-cvs20041005.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: SOURCES/tpop3d-cvs20050822.patch diff -u /dev/null SOURCES/tpop3d-cvs20050822.patch:1.1 --- /dev/null Mon Aug 22 22:03:42 2005 +++ SOURCES/tpop3d-cvs20050822.patch Mon Aug 22 22:03:37 2005 @@ -0,0 +1,2080 @@ +Index: tpop3d/CHANGES +Index: tpop3d/INSTALL +diff -u tpop3d/INSTALL:1.22 tpop3d/INSTALL:1.24 +--- tpop3d/INSTALL:1.22 Thu Jan 9 23:25:59 2003 ++++ tpop3d/INSTALL Sun May 22 11:54:12 2005 +@@ -1,5 +1,5 @@ + Installation instructions for tpop3d +-$Id$ ++$Id$ + + Thanks to the efforts of Mark Longair, tpop3d can now be configured and built + using the standard GNU autoconf approach. For most users, it should be +@@ -19,7 +19,7 @@ + also review the contents of README.darwin. + + NB that tpop3d now obeys the --sysconfdir of configure, so you will need to +-set --sysconfidr=/etc if you already have a /etc/tpop3d.conf and do not wish to ++set --sysconfdir=/etc if you already have a /etc/tpop3d.conf and do not wish to + move it. + + * Authentication +@@ -56,6 +56,7 @@ + {plaintext}... plain text password used for APOP + {mysql}... password hashed using MySQL's PASSWORD() + {md5}... straight MD5 hash ++ {sha1}... straight SHA1 hash + + Note that to use APOP, the plaintext password type must be specified for + a user, but this does not stop them logging in via any other method with +Index: tpop3d/Makefile.am +diff -u tpop3d/Makefile.am:1.41 tpop3d/Makefile.am:1.42 +--- tpop3d/Makefile.am:1.41 Mon Nov 24 19:58:28 2003 ++++ tpop3d/Makefile.am Fri Aug 5 14:48:22 2005 +@@ -4,12 +4,12 @@ + # + # Copyright (c) 2001 Chris Lightfoot, Mark Longair. All rights reserved. + # +-# $Id$ ++# $Id$ + # + + sbin_PROGRAMS = tpop3d + +-tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c \ ++tpop3d_SOURCES = auth_mysql.c auth_pgsql.c auth_ldap.c auth_other.c auth_gdbm.c \ + auth_perl.c auth_pam.c auth_passwd.c auth_flatfile.c \ + authcache.c authswitch.c buffer.c cfgdirectives.c config.c \ + connection.c ioabs_tcp.c ioabs_tls.c listener.c locks.c \ +@@ -21,7 +21,7 @@ + auth_passwd.h auth_flatfile.h auth_pgsql.h authswitch.h \ + buffer.h config.h connection.h listener.h locks.h mailbox.h \ + md5.h password.h pidfile.h signals.h stringmap.h tls.h \ +- tokenise.h vector.h util.h ++ tokenise.h vector.h util.h auth_gdbm.h + + CFLAGS += -Wall -g -O2 -DCONFIG_DIR='"@sysconfdir@"' # -Wstrict-prototypes + +Index: tpop3d/README +diff -u tpop3d/README:1.22 tpop3d/README:1.23 +--- tpop3d/README:1.22 Mon Nov 24 19:59:13 2003 ++++ tpop3d/README Tue Feb 3 19:52:02 2004 +@@ -1,7 +1,7 @@ + tpop3d, copyright (c) 2000-2003 Chris Lightfoot + http://www.ex-parrot.com/~chris/tpop3d/ + +-$Id$ ++$Id$ + + 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 +@@ -23,6 +23,7 @@ + auth-mysql a vmail-sql style MySQL database; see + http://www.ex-parrot.com/~chris/vmail-sql/ + or another database with user-specified SQL queries ++ auth-pgsql a PostgreSQL database + auth-ldap an LDAP directory + auth-flatfile /etc/passwd-style flat files + auth-other an external program +Index: tpop3d/README.auth_mysql +diff -u tpop3d/README.auth_mysql:1.7 tpop3d/README.auth_mysql:1.8 +--- tpop3d/README.auth_mysql:1.7 Wed Nov 7 00:50:41 2001 ++++ tpop3d/README.auth_mysql Wed Sep 29 20:57:59 2004 +@@ -1,5 +1,5 @@ + README for MySQL authentication in tpop3d +-$Id$ ++$Id$ + + The auth-mysql authentication driver was developed for use with the vmail-sql + database schema for virtual domains, though it is easy to adjust for a +@@ -80,6 +80,7 @@ + {crypt_md5}... crypt_md5 hash + {plaintext}... plaintext password + {mysql}... password hashed using MySQL's PASSWORD() ++ {sha1} simple SHA1 password + {md5} or no prefix old-style simple MD5 password + + {crypt} is the format of the system crypt(3) function-- two salt characters +@@ -89,10 +90,11 @@ + in crypt(3), but for portability it is included as a separate case. + {plaintext} is a password saved in plain text; this format is useful if you + want to support authentication by the APOP shared-secret mechanism. {mysql} +- is the format produced by the PASSWORD() function in MySQL. {md5} is a +- simple MD5 hash of the password, without salt, saved as a 32-character hex +- string. This is the historical format for vmail-sql, and so is the default +- if no prefix is used. This may go away at some point. ++ is the format produced by the PASSWORD() function in MySQL. {sha1} is a ++ simple 20-character hex SHA1 hash of the password. {md5} is a simple MD5 ++ hash of the password, without salt, saved as a 32-character hex string or a ++ 24-character base64 one. This is the historical format for vmail-sql, and so ++ is the default if no prefix is used. This may go away at some point. + + Now, we compare the user's password against the stored hash or password, + and decide whether to authenticate the user or not. If this does not +Index: tpop3d/TODO +diff -u tpop3d/TODO:1.46 tpop3d/TODO:1.48 +--- tpop3d/TODO:1.46 Mon Nov 24 19:58:28 2003 ++++ tpop3d/TODO Sun Jun 20 00:06:30 2004 +@@ -1,5 +1,5 @@ + Things To Do +-$Id$ ++$Id$ + + * A proper code audit + +@@ -96,3 +96,18 @@ + + * Latency vs. throughput tradeoff under high load? + ++* Deferred writes in connection_sendmessage -- that should bring the cost of ++ sending messages down to the cost of substituting \r\n for \n, etc. ++ ++* Configurable (or adaptive?) SO_SNDBUF ++ We probably don't have enough information to measure the necessary ++ parameters (though in principle we could measure the delay between sending ++ +OK... and receiving a new command), so just make this a config file option. ++ ++* NTLM authentication ++ ++* STLS+APOP issue (email of 20040306) ++ ++* Repeated messages (email of 20040325) ++ ++* Maildir semantics (email of 20040331) +Index: tpop3d/auth_flatfile.c +diff -u tpop3d/auth_flatfile.c:1.2 tpop3d/auth_flatfile.c:1.3 +--- tpop3d/auth_flatfile.c:1.2 Mon Feb 17 23:18:32 2003 ++++ tpop3d/auth_flatfile.c Sun Jun 20 00:06:30 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_FLATFILE +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include + +@@ -86,7 +86,7 @@ + * second field to the password hash. Any subsequent fields are ignored. */ + static char *read_user_passwd(const char *local_part, const char *domain) { + FILE *fp = NULL; +- char *filename = NULL; ++ char *filename = NULL, *result = NULL; + struct sverr err; + static char *buf, *pwhash; + static size_t buflen; +@@ -149,6 +149,8 @@ + if ((end = strchr(pwhash, ':'))) + *end = 0; + ++ result = pwhash; ++ + break; + } + +@@ -159,7 +161,7 @@ + if (filename) + xfree(filename); + +- return pwhash; ++ return result; + } + + /* auth_flatfile_new_user_pass: +Index: tpop3d/auth_gdbm.c +diff -u /dev/null tpop3d/auth_gdbm.c:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.c Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,196 @@ ++/* ++ * auth_gdbm.c: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include ++ ++#ifdef HAVE_CRYPT_H /* XXX */ ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "auth_gdbm.h" ++#include "authswitch.h" ++#include "password.h" ++#include "config.h" ++#include "util.h" ++ ++static gid_t virtual_gid; ++static uid_t virtual_uid; ++static char *user_passwd_file; ++GDBM_FILE dbf; ++int persistent; ++ ++/* auth_gdbm_init: ++ * Initialise the driver. Reads the config directives. */ ++int auth_gdbm_init() { ++ char *s; ++ ++ /* Obtain uid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-user"))) { ++ if (!parse_uid(s, &virtual_uid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-user directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-user directive in config")); ++ return 0; ++ } ++ ++ /* Obtain gid to use */ ++ if ((s = config_get_string("auth-gdbm-mail-group"))) { ++ if (!parse_gid(s, &virtual_gid)) { ++ log_print(LOG_ERR, _("auth_gdbm_init: auth-gdbm-mail-group directive `%s' does not make sense"), s); ++ return 0; ++ } ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-mail-group directive in config")); ++ return 0; ++ } ++ ++ /* Obtain path to passwd file */ ++ if ((s = config_get_string("auth-gdbm-passwd-file"))) { ++ user_passwd_file = s; ++ } else { ++ log_print(LOG_ERR, _("auth_gdbm_init: no auth-gdbm-passwd-file directive in config")); ++ return 0; ++ } ++ ++ /* persistent GDBM filehandle? */ ++ if (config_get_bool("auth-gdbm-persistent")) { ++ persistent = 1; ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ } else { ++ persistent = 0; ++ } ++ ++ return 1; ++} ++ ++/* auth_gdbm_new_user_pass: ++ * Attempt to authenticate user and pass using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password(who, value.dptr, pass, "{crypt}")) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_user_pass: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++/* auth_gdbm_new_apop: ++ * Attempt to authenticate user via APOP using a GNU dbm file, ++ * as configured at compile-time. ++ * This is a virtual-domains authenticator. */ ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost /* unused */, const char *serverhost /* unused */) { ++ authcontext a = NULL; ++ char *who, *address; ++ datum key, value; ++ ++ if (!local_part) return NULL; ++ ++ who = username_string(user, local_part, domain); ++ ++ address = xmalloc(strlen(local_part) + strlen(domain) +2); ++ sprintf(address, "%s@%s", local_part, domain); ++ key.dptr = address; ++ key.dsize = strlen(address); ++ ++ if (persistent) { ++ value = gdbm_fetch(dbf,key); ++ } else { ++ if((dbf=gdbm_open(user_passwd_file, 0, GDBM_READER, 0644, 0)) == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_init: could not open GNU dbm file")); ++ return 0; ++ } ++ value = gdbm_fetch(dbf,key); ++ gdbm_close(dbf); ++ } ++ ++ xfree(address); ++ if(value.dptr == NULL) { ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: could not find user %s"), who); ++ return a; ++ } ++ ++ if (check_password_apop(who, value.dptr, timestamp, digest)) ++ a = authcontext_new(virtual_uid, virtual_gid, NULL, NULL, NULL); ++ else ++ log_print(LOG_ERR, _("auth_gdbm_new_apop: failed login for %s"), who); ++ ++ xfree(value.dptr); ++ ++ return a; ++} ++ ++void auth_gdbm_postfork() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++void auth_gdbm_close() { ++ if (persistent) ++ gdbm_close(dbf); ++} ++ ++#endif /* AUTH_GDBM */ +Index: tpop3d/auth_gdbm.h +diff -u /dev/null tpop3d/auth_gdbm.h:1.1 +--- /dev/null Mon Aug 22 19:57:08 2005 ++++ tpop3d/auth_gdbm.h Fri Aug 5 14:48:22 2005 +@@ -0,0 +1,35 @@ ++/* ++ * auth_gdbm.h: ++ * Authenticate users using a GNU dbm file ++ * ++ * Based on auth_flatfile.h by Angel Marin, designed for tpop3d by ++ * Daniel Tiefnig at Inode, Austria. ++ * ++ * Copyright (c) 2004 Daniel Tiefnig. All rights reserved. This ++ * software is free software, you can modify and/or redistribute ++ * it as tpop3d itself. See the file COPYING in the base directory ++ * of your tpop3d distribution. ++ */ ++ ++#ifndef __AUTH_GDBM_H_ /* include guard */ ++#define __AUTH_GDBM_H_ ++ ++#ifdef HAVE_CONFIG_H ++#include "configuration.h" ++#endif /* HAVE_CONFIG_H */ ++ ++#ifdef AUTH_GDBM ++ ++#include "authswitch.h" ++ ++/* auth_gdbm.c */ ++int auth_gdbm_init(void); ++authcontext auth_gdbm_new_user_pass(const char *user, const char *local_part, const char *domain, const char *pass, const char *clienthost, const char *serverhost); ++authcontext auth_gdbm_new_apop(const char *user, const char *local_part, const char *domain, const char *timestamp, const unsigned char *digest, const char *clienthost, const char *serverhost); ++void auth_gdbm_postfork(void); ++void auth_gdbm_close(void); ++ ++ ++#endif /* AUTH_GDBM */ ++ ++#endif /* __AUTH_GDBM_H_ */ +Index: tpop3d/auth_mysql.c +diff -u tpop3d/auth_mysql.c:1.54 tpop3d/auth_mysql.c:1.56 +--- tpop3d/auth_mysql.c:1.54 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_mysql.c Thu Aug 19 23:57:05 2004 +@@ -11,7 +11,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_MYSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -44,7 +44,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -52,7 +52,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -60,20 +60,20 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + + /* + * Connection to the MySQL server. + */ +-MYSQL *mysql = NULL; +-tokens mysql_servers; +-char mysql_driver_active = 0; ++static MYSQL *mysql = NULL; ++static tokens mysql_servers; ++static char mysql_driver_active = 0; + + /* get_mysql_server: + * If we are not currently connected to a MySQL server, or if the current MySQL +@@ -267,7 +267,7 @@ + + /* User was not lying (about her password) */ + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_apop: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +@@ -367,7 +367,7 @@ + } + + if (!parse_uid((const char*)row[2], &uid)) { +- log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[3], who); ++ log_print(LOG_ERR, _("auth_mysql_new_user_pass: unix user `%s' for %s does not make sense"), row[2], who); + break; + } + +Index: tpop3d/auth_pgsql.c +diff -u tpop3d/auth_pgsql.c:1.1 tpop3d/auth_pgsql.c:1.2 +--- tpop3d/auth_pgsql.c:1.1 Mon Jul 14 23:31:20 2003 ++++ tpop3d/auth_pgsql.c Thu Aug 19 23:57:05 2004 +@@ -13,7 +13,7 @@ + #endif /* HAVE_CONFIG_H */ + + #ifdef AUTH_PGSQL +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #include /* BSD needs this here, apparently. */ + +@@ -105,7 +105,7 @@ + * [2] unix user + * [3] mailbox type + */ +-char *user_pass_query_template = ++static char *user_pass_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -113,7 +113,7 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *apop_query_template = ++static char *apop_query_template = + "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, " + "domain.unix_user, 'bsd' " + "FROM popbox, domain " +@@ -121,11 +121,11 @@ + "AND popbox.domain_name = '$(domain)' " + "AND popbox.domain_name = domain.domain_name"; + +-char *onlogin_query_template = NULL; ++static char *onlogin_query_template = NULL; + + /* GID used to access mail spool (if any). */ +-int use_gid; +-gid_t mail_gid; ++static int use_gid; ++static gid_t mail_gid; + + static char *substitute_query_params(const char *temp, const char *user, const char *local_part, const char *domain, const char *clienthost, const char *serverhost); + +@@ -148,7 +148,7 @@ + * Initialise the database connection driver. Clears the config directives + * associated with the database so that a user cannot recover them with a + * debugger. */ +-PGconn *pg_conn; ++static PGconn *pg_conn; + + int auth_pgsql_init(void) { + char *username = NULL, *password = NULL, *hostname = NULL, *database = NULL, *localhost = "localhost", *s; +Index: tpop3d/authswitch.c +diff -u tpop3d/authswitch.c:1.42 tpop3d/authswitch.c:1.45 +--- tpop3d/authswitch.c:1.42 Mon Nov 24 19:58:28 2003 ++++ tpop3d/authswitch.c Fri Aug 5 14:48:22 2005 +@@ -6,7 +6,7 @@ + * + */ + +-static const char rcsid[] = "$Id$"; ++static const char rcsid[] = "$Id$"; + + #ifdef HAVE_CONFIG_H + #include "configuration.h" +@@ -52,6 +52,10 @@ + #include "auth_passwd.h" + #endif /* AUTH_PASSWD */ + ++#ifdef AUTH_GDBM ++#include "auth_gdbm.h" ++#endif /* AUTH_GDBM */ ++ + #ifdef USE_WHOSON + #include + #endif +@@ -122,6 +126,13 @@ + "flatfile", + _X("Uses /etc/passwd-style flat files")}, + #endif /* AUTH_FLATFILE */ ++ ++#ifdef AUTH_GDBM ++ /* Authenticate against GNU dbm files. */ ++ {auth_gdbm_init, auth_gdbm_new_apop, auth_gdbm_new_user_pass, NULL, auth_gdbm_postfork, auth_gdbm_close, ++ "gdbm", ++ _X("Uses GNU dbm files")}, ++#endif /* AUTH_GDBM */ + }; <> From paladine at pld-linux.org Mon Aug 22 22:17:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-panel.spec - updated to 2.11.92 - removed not... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 20:17:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - removed notification_area_applet patch ---- Files affected: SPECS: gnome-panel.spec (1.166.4.12 -> 1.166.4.13) ---- Diffs: ================================================================ Index: SPECS/gnome-panel.spec diff -u SPECS/gnome-panel.spec:1.166.4.12 SPECS/gnome-panel.spec:1.166.4.13 --- SPECS/gnome-panel.spec:1.166.4.12 Wed Aug 17 23:51:38 2005 +++ SPECS/gnome-panel.spec Mon Aug 22 22:17:30 2005 @@ -2,16 +2,15 @@ Summary: The core programs for the GNOME GUI desktop environment Summary(pl): Podstawowe programy ?rodowiska graficznego GNOME Name: gnome-panel -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 6b44787f4970f10c42e031176aa65da7 +# Source0-md5: 595c10d159deb0ff3126e8b9793d7013 Patch0: %{name}-finalize-memleak.patch -Patch1: %{name}-notification_area_applet.patch -Patch2: %{name}-no_mixer_applet.patch -Patch3: %{name}-no_launchers_on_panel.patch +Patch1: %{name}-no_mixer_applet.patch +Patch2: %{name}-no_launchers_on_panel.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -111,7 +110,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build gnome-doc-prepare --copy --force @@ -244,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.166.4.13 2005/08/22 20:17:30 paladine +- updated to 2.11.92 +- removed notification_area_applet patch + Revision 1.166.4.12 2005/08/17 21:51:38 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.166.4.12&r2=1.166.4.13&f=u From paladine at pld-linux.org Mon Aug 22 22:17:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-panel-2.11.92.tar.bz2 Message-ID: <21172.1124741863@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-2.11.92.tar.bz2 595c10d159deb0ff3126e8b9793d7013 gnome-panel-2.11.92.tar.bz2 Size: 2411526 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:22:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): file-roller.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:22:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: file-roller.spec (1.69.2.5 -> 1.69.2.6) ---- Diffs: ================================================================ Index: SPECS/file-roller.spec diff -u SPECS/file-roller.spec:1.69.2.5 SPECS/file-roller.spec:1.69.2.6 --- SPECS/file-roller.spec:1.69.2.5 Thu Aug 18 11:35:22 2005 +++ SPECS/file-roller.spec Mon Aug 22 22:21:59 2005 @@ -3,12 +3,12 @@ Summary(pl): Zarz?dca archiw?w dla GNOME Summary(pt_BR): Gerenciador de arquivos compactados para o GNOME Name: file-roller -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 17a7d83aad34f02bd0528c620b22f633 +# Source0-md5: 7fa299e6c4d4498cc3d00ba76bd17f8b Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.69.2.6 2005/08/22 20:21:59 aflinta +- 2.11.92 + Revision 1.69.2.5 2005/08/18 09:35:22 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file-roller.spec?r1=1.69.2.5&r2=1.69.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:22:12 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: file-roller-2.11.92.tar.bz2 Message-ID: <26498.1124742132@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/file-roller/2.11/file-roller-2.11.92.tar.bz2 7fa299e6c4d4498cc3d00ba76bd17f8b file-roller-2.11.92.tar.bz2 Size: 1219994 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Mon Aug 22 22:22:25 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: rlocate.spec - fixed md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:22:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: rlocate.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.28 SPECS/rlocate.spec:1.29 --- SPECS/rlocate.spec:1.28 Mon Aug 22 16:50:29 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:22:20 2005 @@ -25,7 +25,7 @@ License: GPL Group: Base Source0: http://dl.sourceforge.net/rlocate/%{name}-%{version}.tar.gz -# Source0-md5: d65e350fe83480cc1db40912a0dfa87b +# Source0-md5: e3c8371a6659bf1e0d9d1fe02c0efe6d Patch0: %{name}-build.patch URL: http://rlocate.sourceforge.net/ BuildRequires: autoconf @@ -255,6 +255,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/22 20:22:20 paszczus +- fixed md5 + Revision 1.28 2005/08/22 14:50:29 paszczus - added init script (temporary from redhat) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.28&r2=1.29&f=u From paszczus at pld-linux.org Mon Aug 22 22:22:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <26917.1124742146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz Size: 191217 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:27:23 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gtkhtml.spec - version 3.7.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:27:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 3.7.7 ---- Files affected: SPECS: gtkhtml.spec (1.130.2.5 -> 1.130.2.6) ---- Diffs: ================================================================ Index: SPECS/gtkhtml.spec diff -u SPECS/gtkhtml.spec:1.130.2.5 SPECS/gtkhtml.spec:1.130.2.6 --- SPECS/gtkhtml.spec:1.130.2.5 Sun Aug 21 10:50:25 2005 +++ SPECS/gtkhtml.spec Mon Aug 22 22:27:18 2005 @@ -6,12 +6,12 @@ Summary(uk): GtkHTML - ?? ?????????? ??????????/??????????? HTML Summary(zh_CN): gtkhtml ?? Name: gtkhtml -Version: 3.7.6 -Release: 2 +Version: 3.7.7 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/%{name}-%{version}.tar.bz2 -# Source0-md5: fd9b3d048a5c94a1af0de78fe0bf7d77 +# Source0-md5: acfa34618f43b425b6208c09dffd2386 Patch0: %{name}-pixmap.patch Patch1: %{name}-link.patch Patch2: %{name}-crash.patch @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.130.2.6 2005/08/22 20:27:18 aflinta +- version 3.7.7 + Revision 1.130.2.5 2005/08/21 08:50:25 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtkhtml.spec?r1=1.130.2.5&r2=1.130.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:27:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gtkhtml-3.7.7.tar.bz2 Message-ID: <30410.1124742445@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.7/gtkhtml-3.7.7.tar.bz2 acfa34618f43b425b6208c09dffd2386 gtkhtml-3.7.7.tar.bz2 Size: 1518722 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:31 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: libsoup-2.2.6.tar.bz2 Message-ID: <32053.1124742571@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.tar.bz2 2b16657c52e690933ddb250d351fba3c libsoup-2.2.6.tar.bz2 Size: 430471 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:29:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: libsoup.spec - version 2.2.6 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:29:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - version 2.2.6 ---- Files affected: SPECS: libsoup.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.43 SPECS/libsoup.spec:1.44 --- SPECS/libsoup.spec:1.43 Thu Aug 4 16:41:42 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:29:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.5 +Version: 2.2.6 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 50ba7189fe1f645b48f4ddc509d4dec4 +# Source0-md5: 2b16657c52e690933ddb250d351fba3c URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/22 20:29:27 aflinta +- version 2.2.6 + Revision 1.43 2005/08/04 14:41:42 aflinta - up to version 2.2.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.43&r2=1.44&f=u From paszczus at pld-linux.org Mon Aug 22 22:30:00 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: rlocate.spec - fixed %post and %postun section - build fail... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:30:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ---- Files affected: SPECS: rlocate.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.29 SPECS/rlocate.spec:1.30 --- SPECS/rlocate.spec:1.29 Mon Aug 22 22:22:20 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:29:54 2005 @@ -194,17 +194,13 @@ if [ ! -f /var/lib/rlocate/rlocate.db ]; then echo 'Run "%{_bindir}/updatedb" if you want to make rlocate database immediately.' fi +/sbin/chkconfig --add %{name} +%service %{name} restart %postun if [ "$1" = "0" ]; then %groupremove rlocate -fi - -%post init -/sbin/chkconfig --add %{name} -%service %{name} restart - -%preun init +else if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} @@ -255,6 +251,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/22 20:29:54 paszczus +- fixed %post and %postun section +- build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d + Revision 1.29 2005/08/22 20:22:20 paszczus - fixed md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.29&r2=1.30&f=u From baggins at pld-linux.org Mon Aug 22 22:32:44 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: pam-pld-0.80.1.tar.gz Message-ID: <1625.1124742764@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/software/pam/pam-pld-0.80.1.tar.gz df374f625e7178f43a263a32e376dd46 pam-pld-0.80.1.tar.gz Size: 1311375 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-icon-theme-2.11.92.tar.bz2 Message-ID: <2102.1124742794@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/gnome-icon-theme-2.11.92.tar.bz2 a47b8debffc6c8228954fd100e7dc02f gnome-icon-theme-2.11.92.tar.bz2 Size: 3038101 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:33:13 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-icon-theme.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:33:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-icon-theme.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-icon-theme.spec diff -u SPECS/gnome-icon-theme.spec:1.36.2.4 SPECS/gnome-icon-theme.spec:1.36.2.5 --- SPECS/gnome-icon-theme.spec:1.36.2.4 Tue Aug 9 13:38:03 2005 +++ SPECS/gnome-icon-theme.spec Mon Aug 22 22:33:08 2005 @@ -2,12 +2,12 @@ Summary: Default icon themes for GNOME2 enviroment Summary(pl): Domy?lne motywy ikon dla ?rodowiska GNOME2 Name: gnome-icon-theme -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: GPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 4c54d897f6eba91b9b9e12633ff50637 +# Source0-md5: a47b8debffc6c8228954fd100e7dc02f URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/22 20:33:08 aflinta +- 2.11.92 + Revision 1.36.2.4 2005/08/09 11:38:03 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icon-theme.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:26 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gcalctool.spec - 5.6.28 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:35:26 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 5.6.28 ---- Files affected: SPECS: gcalctool.spec (1.45.2.3 -> 1.45.2.4) ---- Diffs: ================================================================ Index: SPECS/gcalctool.spec diff -u SPECS/gcalctool.spec:1.45.2.3 SPECS/gcalctool.spec:1.45.2.4 --- SPECS/gcalctool.spec:1.45.2.3 Thu Aug 18 11:39:35 2005 +++ SPECS/gcalctool.spec Mon Aug 22 22:35:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME calculator Summary(pl): Kalkulator dla GNOME Name: gcalctool -Version: 5.6.26 +Version: 5.6.28 Release: 2 License: GPL v2 Group: Applications/Math Source0: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/%{name}-%{version}.tar.bz2 -# Source0-md5: a60f02819f9840e3b0097d3f69f6f4d2 +# Source0-md5: 2e6dfe43c8455fd4aac5976f4e7badfc Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -84,6 +84,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45.2.4 2005/08/22 20:35:21 aflinta +- 5.6.28 + Revision 1.45.2.3 2005/08/18 09:39:35 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcalctool.spec?r1=1.45.2.3&r2=1.45.2.4&f=u From aflinta at pld-linux.org Mon Aug 22 22:35:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gcalctool-5.6.28.tar.bz2 Message-ID: <4734.1124742925@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gcalctool/5.6/gcalctool-5.6.28.tar.bz2 2e6dfe43c8455fd4aac5976f4e7badfc gcalctool-5.6.28.tar.bz2 Size: 1107054 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:37:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): eog.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:37:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eog.spec (1.73.2.4 -> 1.73.2.5) ---- Diffs: ================================================================ Index: SPECS/eog.spec diff -u SPECS/eog.spec:1.73.2.4 SPECS/eog.spec:1.73.2.5 --- SPECS/eog.spec:1.73.2.4 Thu Aug 18 11:26:37 2005 +++ SPECS/eog.spec Mon Aug 22 22:37:49 2005 @@ -3,12 +3,12 @@ Summary(pl): Oko GNOME - przegl?darka obrazk?w Summary(pt_BR): Visualizador de imagem Eye of GNOME Name: eog -Version: 2.11.90 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9438a070620fcc0dc17956edc933597d +# Source0-md5: 9992e70d6b59120474ad775e11b60f94 Patch0: %{name}-libtool.patch Patch1: %{name}-desktop.patch URL: http://www.gnome.org/ @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.73.2.5 2005/08/22 20:37:49 aflinta +- 2.11.92 + Revision 1.73.2.4 2005/08/18 09:26:37 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eog.spec?r1=1.73.2.4&r2=1.73.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:37:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: eog-2.11.92.tar.bz2 Message-ID: <5941.1124743076@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eog/2.11/eog-2.11.92.tar.bz2 9992e70d6b59120474ad775e11b60f94 eog-2.11.92.tar.bz2 Size: 988587 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: libsoup-2.2.6.1.tar.bz2 Message-ID: <7551.1124743234@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-2.2.6.1.tar.bz2 e31e178a685aa64dc60f98a89d3d0141 libsoup-2.2.6.1.tar.bz2 Size: 430461 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:40:33 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: libsoup.spec - 2.2.6.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:40:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.2.6.1 ---- Files affected: SPECS: libsoup.spec (1.44 -> 1.45) ---- Diffs: ================================================================ Index: SPECS/libsoup.spec diff -u SPECS/libsoup.spec:1.44 SPECS/libsoup.spec:1.45 --- SPECS/libsoup.spec:1.44 Mon Aug 22 22:29:27 2005 +++ SPECS/libsoup.spec Mon Aug 22 22:40:27 2005 @@ -2,12 +2,12 @@ Summary: SOAP (Simple Object Access Protocol) implementation in C Summary(pl): Implementacja w C SOAP (Simple Object Access Protocol) Name: libsoup -Version: 2.2.6 +Version: 2.2.6.1 Release: 1 License: LGPL v2 Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b16657c52e690933ddb250d351fba3c +# Source0-md5: e31e178a685aa64dc60f98a89d3d0141 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.45 2005/08/22 20:40:27 aflinta +- 2.2.6.1 + Revision 1.44 2005/08/22 20:29:27 aflinta - version 2.2.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsoup.spec?r1=1.44&r2=1.45&f=u From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: libgtop-2.11.92.tar.bz2 Message-ID: <11169.1124743566@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/libgtop-2.11.92.tar.bz2 e367a89414910bbc66fae20b312aaf58 libgtop-2.11.92.tar.bz2 Size: 745655 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:46:06 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): libgtop.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:46:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: libgtop.spec (1.107.2.5 -> 1.107.2.6) ---- Diffs: ================================================================ Index: SPECS/libgtop.spec diff -u SPECS/libgtop.spec:1.107.2.5 SPECS/libgtop.spec:1.107.2.6 --- SPECS/libgtop.spec:1.107.2.5 Mon Aug 8 15:44:19 2005 +++ SPECS/libgtop.spec Mon Aug 22 22:46:01 2005 @@ -7,13 +7,13 @@ Summary(ru): ?????????? LibGTop Summary(uk): ?????????? LibGTop Name: libgtop -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgtop/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: e135594822c0952bb0eb7f496bfb8b40 +# Source0-md5: e367a89414910bbc66fae20b312aaf58 Patch0: %{name}-configure.patch URL: http://www.home-of-linux.org/gnome/libgtop/ BuildRequires: autoconf @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.107.2.6 2005/08/22 20:46:01 aflinta +- 2.11.92 + Revision 1.107.2.5 2005/08/08 13:44:19 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgtop.spec?r1=1.107.2.5&r2=1.107.2.6&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-system-monitor.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:50:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-system-monitor.spec (1.27.2.6 -> 1.27.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-system-monitor.spec diff -u SPECS/gnome-system-monitor.spec:1.27.2.6 SPECS/gnome-system-monitor.spec:1.27.2.7 --- SPECS/gnome-system-monitor.spec:1.27.2.6 Thu Aug 18 13:00:03 2005 +++ SPECS/gnome-system-monitor.spec Mon Aug 22 22:50:52 2005 @@ -2,12 +2,12 @@ Summary: Simple process monitor Summary(pl): Prosty monitor proces?w Name: gnome-system-monitor -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a28849a5934d95b7d8370ddd0d1c92f7 +# Source0-md5: 6bb8f6b50f4edfb57dc2d58a26b3fe2c Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 @@ -87,6 +87,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27.2.7 2005/08/22 20:50:52 aflinta +- 2.11.92 + Revision 1.27.2.6 2005/08/18 11:00:03 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-monitor.spec?r1=1.27.2.6&r2=1.27.2.7&f=u From aflinta at pld-linux.org Mon Aug 22 22:50:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-system-monitor-2.11.92.tar.bz2 Message-ID: <14032.1124743858@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-monitor/2.11/gnome-system-monitor-2.11.92.tar.bz2 6bb8f6b50f4edfb57dc2d58a26b3fe2c gnome-system-monitor-2.11.92.tar.bz2 Size: 779754 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: metacity-2.11.3.tar.bz2 Message-ID: <16315.1124744107@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/metacity-2.11.3.tar.bz2 703f5a27deb9052eaba98ae6ada588c6 metacity-2.11.3.tar.bz2 Size: 1700272 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Mon Aug 22 22:55:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): metacity.spec - 2.11.3 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:55:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.3 ---- Files affected: SPECS: metacity.spec (1.96.2.4 -> 1.96.2.5) ---- Diffs: ================================================================ Index: SPECS/metacity.spec diff -u SPECS/metacity.spec:1.96.2.4 SPECS/metacity.spec:1.96.2.5 --- SPECS/metacity.spec:1.96.2.4 Wed Aug 17 22:40:53 2005 +++ SPECS/metacity.spec Mon Aug 22 22:54:57 2005 @@ -9,13 +9,13 @@ Summary: Metacity window manager Summary(pl): Zarz?dca okien Metacity Name: metacity -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 Epoch: 2 License: GPL v2+ Group: X11/Window Managers Source0: http://ftp.gnome.org/pub/gnome/sources/metacity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 8cd042855bec2df5e4592d0aabbd5b6d +# Source0-md5: 703f5a27deb9052eaba98ae6ada588c6 Patch0: %{name}-libtool.patch Patch1: %{name}-swap-resize-button.patch BuildRequires: GConf2-devel >= 2.10.0 @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96.2.5 2005/08/22 20:54:57 aflinta +- 2.11.3 + Revision 1.96.2.4 2005/08/17 20:40:53 aflinta - rebuild with new cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/metacity.spec?r1=1.96.2.4&r2=1.96.2.5&f=u From paszczus at pld-linux.org Mon Aug 22 22:56:56 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: rlocate.spec - fixed %files, cron and init In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 20:56:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %files, cron and init ---- Files affected: SPECS: rlocate.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.30 SPECS/rlocate.spec:1.31 --- SPECS/rlocate.spec:1.30 Mon Aug 22 22:29:54 2005 +++ SPECS/rlocate.spec Mon Aug 22 22:56:51 2005 @@ -160,7 +160,10 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d +install -d $RPM_BUILD_ROOT/etc/cron.daily install contrib/rlocate.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +install rlocate.cron $RPM_BUILD_ROOT/etc/cron.daily/rlocate %if %{with userspace} %{__make} install \ @@ -220,9 +223,6 @@ %endif %endif -%attr(754,root,root) /etc/rc.d/init.d/%{name} -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} - %if %{with userspace} %files %defattr(644,root,root,755) @@ -245,12 +245,17 @@ %dir %attr(750,root,rlocate) /var/lib/rlocate %endif +%attr(754,root,root) /etc/rc.d/init.d/%{name} + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/22 20:56:51 paszczus +- fixed %files, cron and init + Revision 1.30 2005/08/22 20:29:54 paszczus - fixed %post and %postun section - build failed cause: cc1: Permission denied: opening dependency file scripts/basic/.fixdep.d ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.30&r2=1.31&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:00 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): gnome-utils.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Mon Aug 22 20:57:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-utils.spec (1.124.2.4 -> 1.124.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-utils.spec diff -u SPECS/gnome-utils.spec:1.124.2.4 SPECS/gnome-utils.spec:1.124.2.5 --- SPECS/gnome-utils.spec:1.124.2.4 Mon Aug 8 17:38:34 2005 +++ SPECS/gnome-utils.spec Mon Aug 22 22:57:54 2005 @@ -6,13 +6,13 @@ Summary(uk): ??????? GNOME, ???? ?? ????? ?????? ?? ??????????? Summary(zh_CN): GNOME?????????? Name: gnome-utils -Version: 2.11.91 +Version: 2.11.92 Release: 1 Epoch: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 5a148b44cc9acb0c92f0d8eaae26eb46 +# Source0-md5: c1fe1083a946da6ee6a10798021400e7 Patch0: %{name}-desktop.patch Patch1: %{name}-omf.patch Icon: gnome-utils.xpm @@ -323,6 +323,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124.2.5 2005/08/22 20:57:54 aflinta +- 2.11.92 + Revision 1.124.2.4 2005/08/08 15:38:34 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-utils.spec?r1=1.124.2.4&r2=1.124.2.5&f=u From aflinta at pld-linux.org Mon Aug 22 22:58:05 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: gnome-utils-2.11.92.tar.bz2 Message-ID: <18422.1124744285@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/gnome-utils-2.11.92.tar.bz2 c1fe1083a946da6ee6a10798021400e7 gnome-utils-2.11.92.tar.bz2 Size: 1716708 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Mon Aug 22 22:58:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: horde-passwd.spec - fix partially configured hook In-Reply-To: References: Message-ID: Author: glen Date: Mon Aug 22 20:58:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix partially configured hook ---- Files affected: SPECS: horde-passwd.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.15 SPECS/horde-passwd.spec:1.16 --- SPECS/horde-passwd.spec:1.15 Mon Aug 22 21:41:41 2005 +++ SPECS/horde-passwd.spec Mon Aug 22 22:58:46 2005 @@ -6,13 +6,14 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.10 +Release: 0.12 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz # Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,6 +47,7 @@ %prep %setup -q -n passwd-h3-%{version}-beta +%patch0 -p1 # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -136,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/22 20:58:46 glen +- fix partially configured hook + Revision 1.15 2005/08/22 19:41:41 glen - set default list of usernames where password set is refused based on target machine system users ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.15&r2=1.16&f=u From darekr at pld-linux.org Mon Aug 22 23:03:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: dumb-0.9.3.tar.gz Message-ID: <21957.1124744587@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dumb/dumb-0.9.3.tar.gz f48da5b990aa8aa822d3b6a951baf5c2 dumb-0.9.3.tar.gz Size: 167379 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Mon Aug 22 23:03:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: dumb.spec - updated to 0.9.3 - added -devel, -static packag... In-Reply-To: References: Message-ID: Author: darekr Date: Mon Aug 22 21:03:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3 - added -devel, -static packages - cosmetics ---- Files affected: SPECS: dumb.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/dumb.spec diff -u SPECS/dumb.spec:1.7 SPECS/dumb.spec:1.8 --- SPECS/dumb.spec:1.7 Sun Jun 20 23:36:37 2004 +++ SPECS/dumb.spec Mon Aug 22 23:02:57 2005 @@ -2,12 +2,12 @@ Summary: DUMB - Dedicated Universal Music Bastardisation Summary(pl): DUMB - Dedicated Universal Music Bastardisation Name: dumb -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 0.1 License: GPL-like Group: Development/Libraries Source0: http://dl.sourceforge.net/dumb/%{name}-%{version}.tar.gz -# Source0-md5: 0ce45f64934e6d5d7b82a55108596680 +# Source0-md5: f48da5b990aa8aa822d3b6a951baf5c2 URL: http://dumb.sourceforge.net/ BuildRequires: allegro-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -20,8 +20,32 @@ %description -l pl Biblioteka DUMB - Dedicated Universal Music Bastardisation. +%package devel +Summary: Header files for dumb +Summary(pl): Pliki nag??wkowe dla dumb +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +dumb header files. + +%description devel -l pl +Pliki nag??wkowe dla dumb. + +%package static +Summary: Static libraries for dumb +Summary(pl): Statyczne biblioteki dla dumb +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +dumb static libraries. + +%description static -l pl +Biblioteki statyczne dla dumb. + %prep -%setup -q -n %{name} +%setup -q %build cat < make/config.txt @@ -31,14 +55,18 @@ PREFIX := /usr EOF -%{__make} all CC="%{__cc}" OFLAGS="%{rpmcflags}" +%{__make} all \ + CC="%{__cc}" \ + OFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} -%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} DEBUGMODE=1 %clean rm -rf $RPM_BUILD_ROOT @@ -46,8 +74,15 @@ %files %defattr(644,root,root,755) %doc *.txt docs/* +%attr(755,root,root) %{_bindir}/dumb* + +%files devel +%defattr(644,root,root,755) %{_includedir}/* -%{_libdir}/* + +%files static +%defattr(644,root,root,755) +%{_libdir}/lib*.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +90,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:02:57 darekr +- updated to 0.9.3 +- added -devel, -static packages +- cosmetics + Revision 1.7 2004/06/20 21:36:37 arekm - fix specflags (quotation here is buggy) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dumb.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Mon Aug 22 23:23:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): control-center.spec - updated to 2.11.92 - updated ... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated pangoxft_fix patch ---- Files affected: SPECS: control-center.spec (1.170.2.10 -> 1.170.2.11) ---- Diffs: ================================================================ Index: SPECS/control-center.spec diff -u SPECS/control-center.spec:1.170.2.10 SPECS/control-center.spec:1.170.2.11 --- SPECS/control-center.spec:1.170.2.10 Sun Aug 14 23:32:32 2005 +++ SPECS/control-center.spec Mon Aug 22 23:23:23 2005 @@ -6,13 +6,13 @@ Summary(uk): ????? ????????? GNOME Summary(ru): ????? ?????????? GNOME Name: control-center -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a429f605878160e2660725bad2ee1e17 +# Source0-md5: 9572d1033c1103c2ed57e802c24b5a5c Patch0: %{name}-randr.patch Patch1: %{name}-wm_properties-dir.patch Patch2: %{name}-additional-metacity-keybinding.patch @@ -48,6 +48,7 @@ BuildRequires: libtool BuildRequires: metacity-devel >= 2:2.10.0 BuildRequires: nautilus-devel >= 2.11.0 +BuildRequires: pango-devel >= 1:1.9.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper BuildRequires: xft-devel >= 2.1.1 @@ -241,6 +242,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.170.2.11 2005/08/22 21:23:23 paladine +- updated to 2.11.92 +- updated pangoxft_fix patch + Revision 1.170.2.10 2005/08/14 21:32:32 freetz - pangoxft fix added, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/control-center.spec?r1=1.170.2.10&r2=1.170.2.11&f=u From paladine at pld-linux.org Mon Aug 22 23:23:18 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES (DEVEL): control-center-pangoxft_fix.patch - updated for 2... In-Reply-To: References: Message-ID: Author: paladine Date: Mon Aug 22 21:23:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: control-center-pangoxft_fix.patch (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: SOURCES/control-center-pangoxft_fix.patch diff -u SOURCES/control-center-pangoxft_fix.patch:1.1 SOURCES/control-center-pangoxft_fix.patch:1.1.2.1 --- SOURCES/control-center-pangoxft_fix.patch:1.1 Sun Aug 14 23:33:05 2005 +++ SOURCES/control-center-pangoxft_fix.patch Mon Aug 22 23:23:11 2005 @@ -1,15 +1,7 @@ -diff -aurN control-center-2.11.91.orig/capplets/keyboard/Makefile.am control-center-2.11.91/capplets/keyboard/Makefile.am ---- control-center-2.11.91.orig/capplets/keyboard/Makefile.am 2004-11-28 09:14:04.000000000 +0100 -+++ control-center-2.11.91/capplets/keyboard/Makefile.am 2005-08-14 23:24:03.000000000 +0200 -@@ -10,6 +10,7 @@ - gnome_keyboard_properties_LDADD = \ - ../accessibility/keyboard/libaccessibility-keyboard.a \ - $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ -+ $(PANGOXFT_LIBS) \ - ../../libgswitchit/libgswitchit.a \ - ../../libkbdraw/libkbdraw.a - -@@ -29,6 +30,6 @@ +diff -urN control-center-2.11.92.orig/capplets/keyboard/Makefile.am control-center-2.11.92/capplets/keyboard/Makefile.am +--- control-center-2.11.92.orig/capplets/keyboard/Makefile.am 2005-08-22 22:44:26.558451264 +0200 ++++ control-center-2.11.92/capplets/keyboard/Makefile.am 2005-08-22 22:46:46.310205768 +0200 +@@ -29,6 +29,6 @@ Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) @@ -17,18 +9,17 @@ +INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) $(PANGOXFT_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) -diff -aurN control-center-2.11.91.orig/configure.in control-center-2.11.91/configure.in ---- control-center-2.11.91.orig/configure.in 2005-08-10 11:45:08.000000000 +0200 -+++ control-center-2.11.91/configure.in 2005-08-14 23:18:51.000000000 +0200 -@@ -97,6 +97,11 @@ - libbonobo-2.0 dnl - libbonoboui-2.0 dnl - gnome-desktop-2.0 >= 2.2.0" -+ +diff -urN control-center-2.11.92.orig/configure.in control-center-2.11.92/configure.in +--- control-center-2.11.92.orig/configure.in 2005-08-22 22:44:27.329334072 +0200 ++++ control-center-2.11.92/configure.in 2005-08-22 22:47:35.247766128 +0200 +@@ -126,7 +126,9 @@ + + PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES) + +-PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.8) +PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.9.1) +AC_SUBST(PANGOXFT_CFLAGS) +AC_SUBST(PANGOXFT_LIBS) -+ - PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) - PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1) - PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, + + dnl + dnl Check for XRandR, needed for display capplet ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/control-center-pangoxft_fix.patch?r1=1.1&r2=1.1.2.1&f=u From paladine at pld-linux.org Mon Aug 22 23:23:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: control-center-2.11.92.tar.bz2 Message-ID: <1258.1124745813@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/control-center/2.11/control-center-2.11.92.tar.bz2 9572d1033c1103c2ed57e802c24b5a5c control-center-2.11.92.tar.bz2 Size: 1906135 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Mon Aug 22 23:34:02 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: luma.spec - fixed my previous commit message in changelog In-Reply-To: References: Message-ID: Author: twittner Date: Mon Aug 22 21:34:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed my previous commit message in changelog ---- Files affected: SPECS: luma.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.7 SPECS/luma.spec:1.8 --- SPECS/luma.spec:1.7 Mon Aug 22 18:32:07 2005 +++ SPECS/luma.spec Mon Aug 22 23:33:56 2005 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/22 21:33:56 twittner +- fixed my previous commit message in changelog + Revision 1.7 2005/08/22 16:32:07 twittner $ luma QPainter::begin: Cannot paint null pixmap @@ -72,7 +75,8 @@ $ cat /usr/bin/luma #!/usr/bin/python /usr/lib/luma/luma.pyc $ -- unbreak what saq broke: python luma.pyc -> luma.pyc, don't rm *.py +- to avoid this call luma.py not luma.pyc +- don't rm *.py - luma doesn't work without *.py files Revision 1.6 2005/08/18 10:14:37 glen - what for the echo -e? ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.7&r2=1.8&f=u From paszczus at pld-linux.org Mon Aug 22 23:50:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: test: paszczus (NEW) - test In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:50:09 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: paszczus (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: test/paszczus diff -u /dev/null test/paszczus:1.1 --- /dev/null Mon Aug 22 23:50:09 2005 +++ test/paszczus Mon Aug 22 23:50:04 2005 @@ -0,0 +1 @@ +test ================================================================ From paszczus at pld-linux.org Mon Aug 22 23:51:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: test (DEVEL): paszczus test2 In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:51:48 2005 GMT Module: test Tag: DEVEL ---- Log message: test2 ---- Files affected: test: paszczus (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1 test/paszczus:1.1.2.1 --- test/paszczus:1.1 Mon Aug 22 23:50:04 2005 +++ test/paszczus Mon Aug 22 23:51:43 2005 @@ -1 +1,2 @@ test +test2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1&r2=1.1.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:07 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): digikam.spec - updated to 0.8.0 (snap 2005-08-22) -... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 21:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ---- Files affected: SPECS: digikam.spec (1.42 -> 1.42.2.1) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42 SPECS/digikam.spec:1.42.2.1 --- SPECS/digikam.spec:1.42 Mon Aug 22 21:01:58 2005 +++ SPECS/digikam.spec Mon Aug 22 23:56:01 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 3df53700ff78caca60cab4ea4116c7c5 +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 56c8e01718ffc64a0c2a2d412b00986c URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -22,6 +23,7 @@ BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 +BuildRequires: sqlite3-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,7 +49,7 @@ Interfejs KDE do gphoto2 - pliki nag??wkowe. %prep -%setup -q +%setup -q -n digikam %build @@ -89,7 +91,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README +%doc digikam/AUTHORS digikam/ChangeLog digikam/README %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/*.so.*.*.* %attr(755,root,root) %{_libdir}/kde3/*.so @@ -97,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -%{_datadir}/apps/showfoto +#%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -106,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -%{_includedir}/digikam +#%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -114,6 +116,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.1 2005/08/22 21:56:01 paszczus +- updated to 0.8.0 (snap 2005-08-22) +- added BR: sqlite3-devel + Revision 1.42 2005/08/22 19:01:58 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42&r2=1.42.2.1&f=u From paszczus at pld-linux.org Mon Aug 22 23:56:10 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: digikam-0.8.0-20050822.tar.bz2 Message-ID: <19554.1124747770@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikam-0.8.0-20050822.tar.bz2 56c8e01718ffc64a0c2a2d412b00986c digikam-0.8.0-20050822.tar.bz2 Size: 2415489 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: digikamimageplugins-0.8.0-20050822.tar.bz2 Message-ID: <23032.1124748211@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://digikamimageplugins-0.8.0-20050822.tar.bz2 9e9f6e8a930fe2a88665a05065163f9f digikamimageplugins-0.8.0-20050822.tar.bz2 Size: 3149640 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 00:03:31 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): digikamimageplugins.spec - updated to 0.8.0 (snap 2... In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:03:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.8.0 (snap 2005-08-22) ---- Files affected: SPECS: digikamimageplugins.spec (1.6 -> 1.6.2.1) ---- Diffs: ================================================================ Index: SPECS/digikamimageplugins.spec diff -u SPECS/digikamimageplugins.spec:1.6 SPECS/digikamimageplugins.spec:1.6.2.1 --- SPECS/digikamimageplugins.spec:1.6 Mon Aug 22 21:13:06 2005 +++ SPECS/digikamimageplugins.spec Tue Aug 23 00:03:25 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ +%define _snap 20050822 Summary: Digikam plugins Summary(pl): Wtyczki dla Digikama Name: digikamimageplugins -Version: 0.7.4 -Release: 1 +Version: 0.8.0 +Release: 0.%{_snap}.1 License: GPL Group: X11/Applications -Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 5ea3c0dd6e6f1eb99211e75d0bf17d3d +Source0: %{name}-%{version}-%{_snap}.tar.bz2 +# Source0-md5: 9e9f6e8a930fe2a88665a05065163f9f URL: http://digikam.sourceforge.net/ BuildRequires: digikam-devel = %{version} BuildRequires: rpmbuild(macros) >= 1.129 @@ -48,9 +49,13 @@ - adjustcurves %prep -%setup -q +%setup -q -n %{name} %build + +cp -f /usr/share/automake/config.sub admin +%{__make} -f admin/Makefile.common cvs + %configure \ --with-qt-libraries=%{_libdir} %{__make} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.2.1 2005/08/22 22:03:25 paszczus +- updated to 0.8.0 (snap 2005-08-22) + Revision 1.6 2005/08/22 19:13:06 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikamimageplugins.spec?r1=1.6&r2=1.6.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 00:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): digikam.spec - commented files are back In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:04:46 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commented files are back ---- Files affected: SPECS: digikam.spec (1.42.2.1 -> 1.42.2.2) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.42.2.1 SPECS/digikam.spec:1.42.2.2 --- SPECS/digikam.spec:1.42.2.1 Mon Aug 22 23:56:01 2005 +++ SPECS/digikam.spec Tue Aug 23 00:04:41 2005 @@ -99,7 +99,7 @@ %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/apps/digikam -#%{_datadir}/apps/showfoto +%{_datadir}/apps/showfoto %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* @@ -108,7 +108,7 @@ %attr(755,root,root) %{_libdir}/*.so %{_libdir}/*.la %{_includedir}/*.h -#%{_includedir}/digikam +%{_includedir}/digikam %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -116,6 +116,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42.2.2 2005/08/22 22:04:41 paszczus +- commented files are back + Revision 1.42.2.1 2005/08/22 21:56:01 paszczus - updated to 0.8.0 (snap 2005-08-22) - added BR: sqlite3-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.42.2.1&r2=1.42.2.2&f=u From paszczus at pld-linux.org Tue Aug 23 00:07:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: test (DEVEL): paszczus - dziala In-Reply-To: References: Message-ID: Author: paszczus Date: Mon Aug 22 22:07:51 2005 GMT Module: test Tag: DEVEL ---- Log message: - dziala ---- Files affected: test: paszczus (1.1.2.1 -> 1.1.2.2) ---- Diffs: ================================================================ Index: test/paszczus diff -u test/paszczus:1.1.2.1 test/paszczus:1.1.2.2 --- test/paszczus:1.1.2.1 Mon Aug 22 23:51:43 2005 +++ test/paszczus Tue Aug 23 00:07:46 2005 @@ -1,2 +1,3 @@ -test -test2 +cvs tag -b DEVEL +cvs tag -F -b DEVEL +cvs ci -r DEVEL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/paszczus?r1=1.1.2.1&r2=1.1.2.2&f=u From charles at pld-linux.org Tue Aug 23 03:36:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES: qemu-nosdlgui.patch - updated to 0.7.1 In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 01:36:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.7.1 ---- Files affected: SOURCES: qemu-nosdlgui.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/qemu-nosdlgui.patch diff -u SOURCES/qemu-nosdlgui.patch:1.1 SOURCES/qemu-nosdlgui.patch:1.2 --- SOURCES/qemu-nosdlgui.patch:1.1 Thu Jul 7 02:37:20 2005 +++ SOURCES/qemu-nosdlgui.patch Tue Aug 23 03:36:40 2005 @@ -10,10 +10,9 @@ cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< -diff -Nur qemu-0.7.0.orig/sdl.c qemu-0.7.0.chng/sdl.c ---- qemu-0.7.0.orig/sdl.c 2005-04-27 20:52:05.000000000 +0000 -+++ qemu-0.7.0.chng/sdl.c 2005-07-06 22:28:55.000000000 +0000 -@@ -1,507 +1,614 @@ +--- qemu-0.7.1/sdl.c.orig 2005-07-24 20:52:08.000000000 +0200 ++++ qemu-0.7.1/sdl.c 2005-08-23 01:47:48.000000000 +0200 +@@ -1,506 +1,614 @@ /* - * QEMU SDL display driver - * @@ -25,11 +24,11 @@ - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: -+ * Xlib interface for QEMU System Emulator - * +- * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. -- * ++ * Xlib interface for QEMU System Emulator + * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -39,16 +38,18 @@ - * THE SOFTWARE. - */ -#include "vl.h" -- --#include + * Copyright (c) 2004 Vladimit Oleynik + * Used ideas from Bochs, SDL, PCEmu. +*/ -+ + +-#include +#include +#include +#include -+ + +-#ifndef _WIN32 +-#include +-#endif +/* hack, special for qemu */ +#define X_display_init sdl_display_init + @@ -88,10 +89,7 @@ + 0x24, 0x15, 0x49, 0x49, 0x09, + 0xc8, 0x36, 0x32, 0x49, 0x0e, +}; - --#ifndef _WIN32 --#include --#endif ++ +#include "vl.h" -static SDL_Surface *screen; @@ -104,27 +102,8 @@ -static int gui_fullscreen_initial_grab; -static int gui_grab_code = KMOD_LALT | KMOD_LCTRL; -static uint8_t modifiers_state[256]; -- --static void sdl_update(DisplayState *ds, int x, int y, int w, int h) --{ -- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); -- SDL_UpdateRect(screen, x, y, w, h); --} -- --static void sdl_resize(DisplayState *ds, int w, int h) --{ -- int flags; -- -- // printf("resizing to %d %d\n", w, h); -- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; -- flags |= SDL_RESIZABLE; -- if (gui_fullscreen) -- flags |= SDL_FULLSCREEN; -- screen = SDL_SetVideoMode(w, h, 0, flags); -- if (!screen) { -- fprintf(stderr, "Could not open SDL display\n"); -- exit(1); +-static void sdl_update(DisplayState *ds, int x, int y, int w, int h) +static Display *qx_display; +static int q_x_screen_num; +static Window win; @@ -135,25 +114,37 @@ +static int width, height; + +static void x_update(DisplayState *ds, int x, int y, int w, int h) -+{ + { +- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); +- SDL_UpdateRect(screen, x, y, w, h); + XPutImage(qx_display, win, gc, ximage, x, y, x, y, w, h); + XFlush(qx_display); -+} -+ + } + +-static void sdl_resize(DisplayState *ds, int w, int h) +static int prev_x, prev_y; +static int current_x, current_y; + +/* Move the cursor to a center window place */ +static void qXWarpPointer(void) -+{ + { +- int flags; + int x = width/2; + int y = height/2; -+ + +- // printf("resizing to %d %d\n", w, h); + prev_x = current_x = x; + prev_y = current_y = y; + XWarpPointer(qx_display, None, win, 0, 0, 0, 0, x, y); +} -+ + +- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; +- if (gui_fullscreen) +- flags |= SDL_FULLSCREEN; +- screen = SDL_SetVideoMode(w, h, 0, flags); +- if (!screen) { +- fprintf(stderr, "Could not open SDL display\n"); +- exit(1); +static void x_resize(DisplayState *ds, int w, int h) +{ + XSizeHints hints; @@ -164,7 +155,12 @@ + hints.max_width = hints.min_width = w; + hints.max_height = hints.min_height = h; + XSetWMNormalHints(qx_display, win, &hints); -+ } + } +- ds->data = screen->pixels; +- ds->linesize = screen->pitch; +- ds->depth = screen->format->BitsPerPixel; +- ds->width = w; +- ds->height = h; + if(ximage) { + XDestroyImage(ximage); +// free(ds->data); @@ -194,15 +190,19 @@ + ximage->data = ds->data; + qXWarpPointer(); + XFlush(qx_display); -+} -+ + } + +-/* generic keyboard conversion */ +static int gui_grab; -+ + +-#include "sdl_keysym.h" +-#include "keymaps.c" +static void x_SetCaption(void) +{ + char *title, *icon; + XTextProperty titleprop, iconprop; -+ + +-static kbd_layout_t *kbd_layout = NULL; + title = icon = "QEMU"; + if (!vm_running && !gui_grab) + title = "QEMU [Stopped]"; @@ -210,7 +210,15 @@ + title = "QEMU - Press Ctrl-Shift to exit grab"; + if (!vm_running && gui_grab) + title = "QEMU [Stopped] - Press Ctrl-Shift to exit grab"; -+ + +-static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) +-{ +- int keysym; +- /* workaround for X11+SDL bug with AltGR */ +- keysym = ev->keysym.sym; +- if (keysym == 0 && ev->keysym.scancode == 113) +- keysym = SDLK_MODE; +- return keysym2scancode(kbd_layout, keysym); + XStringListToTextProperty(&title, 1, &titleprop); + XSetWMName(qx_display, win, &titleprop); + XFree(titleprop.value); @@ -219,8 +227,9 @@ + XSetWMIconName(qx_display, win, &iconprop); + XFree(iconprop.value); + XSync(qx_display, /* no discard */ 0); -+} -+ + } + +-/* specific keyboard conversions from scan codes */ +static void trigger_mouse_grab(void) +{ + gui_grab ^= 1; @@ -228,126 +237,26 @@ + /* disable cursor */ + static Cursor cursor; + static int cursor_created; -+ + +-#if defined(_WIN32) +#define shape_width 16 +#define shape_height 16 +#define mask_width 16 +#define mask_height 16 -+ + +-static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) +-{ +- return ev->keysym.scancode; +-} + static unsigned int shape_bits[(16*16)/32]; + static unsigned int mask_bits[(16*16)/32]; -+ + +-#else + if (!cursor_created) { + Pixmap shape, mask; + XColor white, black; + Colormap default_cmap; -+ -+ default_cmap = DefaultColormap(qx_display, q_x_screen_num); -+ -+ shape = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)shape_bits, -+ shape_width, shape_height, -+ 1, 0, 1); -+ mask = XCreatePixmapFromBitmapData(qx_display, -+ RootWindow(qx_display,q_x_screen_num), -+ (char*)mask_bits, -+ mask_width, mask_height, -+ 1, 0, 1); -+ XParseColor(qx_display, default_cmap, "black", &black); -+ XParseColor(qx_display, default_cmap, "white", &white); -+ cursor = XCreatePixmapCursor(qx_display, shape, mask, -+ &white, &black, 1, 1); -+ cursor_created = 1; -+ } -+ XDefineCursor(qx_display, win, cursor); -+ -+ /* grab pointer and keyboard */ -+ -+// if ( flags & FULLSCREEN ) { -+// /* Unbind the mouse from the fullscreen window */ -+// XUngrabPointer(qx_display, CurrentTime); -+// } -+ /* Try to grab the mouse */ -+ while ( 1 ) { -+ int result = XGrabPointer(qx_display, win, True, 0, -+ GrabModeAsync, GrabModeAsync, -+ win, None, CurrentTime); -+ if (result == GrabSuccess) -+ break; -+ } -+ /* Now grab the keyboard */ -+ XGrabKeyboard(qx_display, win, True, -+ GrabModeAsync, GrabModeAsync, CurrentTime); -+ -+ /* Raise the window if we grab the mouse */ -+// if ( !(flags & FULLSCREEN) ) -+ XRaiseWindow(qx_display, win); -+ qXWarpPointer(); -+ } else { -+ /* enable cursor */ -+ XUndefineCursor(qx_display, win); -+ /* ungrab pointer and keyboard */ -+ XUngrabPointer(qx_display, CurrentTime); -+ XUngrabKeyboard(qx_display, CurrentTime); -+ } -+ x_SetCaption(); -+} -+ -+static unsigned mouse_button_state; -+ -+static void send_keyboard_mouse_status(void) -+{ -+ int dx, dy; -+ -+ dx = current_x - prev_x; -+ dy = -(current_y - prev_y); -+ kbd_mouse_event(dx, -dy, 0, mouse_button_state); -+ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { -+ qXWarpPointer(); -+ } else { -+ prev_x = current_x; -+ prev_y = current_y; - } -- ds->data = screen->pixels; -- ds->linesize = screen->pitch; -- ds->depth = screen->format->BitsPerPixel; -- ds->width = w; -- ds->height = h; - } --/* generic keyboard conversion */ -- --#include "sdl_keysym.h" --#include "keymaps.c" -- --static kbd_layout_t *kbd_layout = NULL; -- --static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev) -+static const unsigned char scan_table1[] = - { -- int keysym; -- /* workaround for X11+SDL bug with AltGR */ -- keysym = ev->keysym.sym; -- if (keysym == 0 && ev->keysym.scancode == 113) -- keysym = SDLK_MODE; -- return keysym2scancode(kbd_layout, keysym); --} -- --/* specific keyboard conversions from scan codes */ -- --#if defined(_WIN32) -- --static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) --{ -- return ev->keysym.scancode; --} -- -+ 0x39, 0x02, -+#ifdef KBUK /* double quotes, hash symbol */ -+ 0x03, 0x2b, - #else -- -static const uint8_t x_keycode_to_pc_keycode[61] = { - 0xc7, /* 97 Home */ - 0xc8, /* 98 Up */ @@ -411,13 +320,32 @@ - 0x52, /* 156 KP_Ins */ - 0x53, /* 157 KP_Del */ -}; -- ++ default_cmap = DefaultColormap(qx_display, q_x_screen_num); + -static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev) -{ - int keycode; -- ++ shape = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)shape_bits, ++ shape_width, shape_height, ++ 1, 0, 1); ++ mask = XCreatePixmapFromBitmapData(qx_display, ++ RootWindow(qx_display,q_x_screen_num), ++ (char*)mask_bits, ++ mask_width, mask_height, ++ 1, 0, 1); ++ XParseColor(qx_display, default_cmap, "black", &black); ++ XParseColor(qx_display, default_cmap, "white", &white); ++ cursor = XCreatePixmapCursor(qx_display, shape, mask, ++ &white, &black, 1, 1); ++ cursor_created = 1; ++ } ++ XDefineCursor(qx_display, win, cursor); + - keycode = ev->keysym.scancode; -- ++ /* grab pointer and keyboard */ + - if (keycode < 9) { - keycode = 0; - } else if (keycode < 97) { @@ -429,8 +357,71 @@ - keycode = 0; - } - return keycode; --} -- ++// if ( flags & FULLSCREEN ) { ++// /* Unbind the mouse from the fullscreen window */ ++// XUngrabPointer(qx_display, CurrentTime); ++// } ++ /* Try to grab the mouse */ ++ while ( 1 ) { ++ int result = XGrabPointer(qx_display, win, True, 0, ++ GrabModeAsync, GrabModeAsync, ++ win, None, CurrentTime); ++ if (result == GrabSuccess) ++ break; ++ } ++ /* Now grab the keyboard */ ++ XGrabKeyboard(qx_display, win, True, ++ GrabModeAsync, GrabModeAsync, CurrentTime); ++ ++ /* Raise the window if we grab the mouse */ ++// if ( !(flags & FULLSCREEN) ) ++ XRaiseWindow(qx_display, win); ++ qXWarpPointer(); ++ } else { ++ /* enable cursor */ ++ XUndefineCursor(qx_display, win); ++ /* ungrab pointer and keyboard */ ++ XUngrabPointer(qx_display, CurrentTime); ++ XUngrabKeyboard(qx_display, CurrentTime); ++ } ++ x_SetCaption(); + } + +-#endif ++static unsigned mouse_button_state; + +-static void reset_keys(void) ++static void send_keyboard_mouse_status(void) + { +- int i; +- for(i = 0; i < 256; i++) { +- if (modifiers_state[i]) { +- if (i & 0x80) +- kbd_put_keycode(0xe0); +- kbd_put_keycode(i | 0x80); +- modifiers_state[i] = 0; +- } ++ int dx, dy; ++ ++ dx = current_x - prev_x; ++ dy = -(current_y - prev_y); ++ kbd_mouse_event(dx, -dy, 0, mouse_button_state); ++ if(current_x <= 1 || current_x >= (width-1) || current_y <= 1 || current_y >= (height-1)) { ++ qXWarpPointer(); ++ } else { ++ prev_x = current_x; ++ prev_y = current_y; + } + } + +-static void sdl_process_key(SDL_KeyboardEvent *ev) ++static const unsigned char scan_table1[] = + { +- int keycode, v; ++ 0x39, 0x02, ++#ifdef KBUK /* double quotes, hash symbol */ ++ 0x03, 0x2b, ++#else + 0x28, 0x04, +#endif + 0x05, 0x06, 0x08, 0x28, @@ -460,25 +451,8 @@ + 0x56, +#else + 0x2b, - #endif ++#endif --static void reset_keys(void) --{ -- int i; -- for(i = 0; i < 256; i++) { -- if (modifiers_state[i]) { -- if (i & 0x80) -- kbd_put_keycode(0xe0); -- kbd_put_keycode(i | 0x80); -- modifiers_state[i] = 0; -- } -- } --} -- --static void sdl_process_key(SDL_KeyboardEvent *ev) --{ -- int keycode, v; -- - if (ev->keysym.sym == SDLK_PAUSE) { - /* specific case */ - v = 0; @@ -489,13 +463,20 @@ - kbd_put_keycode(0x45 | v); - return; - } -- ++ 0x1b, + - if (kbd_layout) { - keycode = sdl_keyevent_to_keycode_generic(ev); - } else { - keycode = sdl_keyevent_to_keycode(ev); - } -- ++#ifdef KBUK /* tilde */ ++ 0x2b, ++#else ++ 0x29, ++#endif ++}; + - switch(keycode) { - case 0x00: - /* sent when leaving window: reset the modifiers state */ @@ -519,7 +500,7 @@ - kbd_put_keycode(keycode | 0x80); - return; - } -- + - /* now send the key code */ - if (keycode & 0x80) - kbd_put_keycode(0xe0); @@ -528,7 +509,16 @@ - else - kbd_put_keycode(keycode & 0x7f); -} -- ++static const struct { ++ KeySym key; ++ unsigned scan_code; ++} scan_table2[] = { ++ { XK_BackSpace, 0x0e }, ++ { XK_Tab, 0x0f }, ++ { XK_Return, 0x1c }, ++ { XK_Escape, 0x01 }, ++ { XK_Delete, 0x53e0 }, + -static void sdl_update_caption(void) -{ - char buf[1024]; @@ -541,7 +531,17 @@ - } - SDL_WM_SetCaption(buf, "QEMU"); -} -- ++ { XK_Home, 0x47e0 }, ++ { XK_Left, 0x4be0 }, ++ { XK_Up, 0x48e0 }, ++ { XK_Right, 0x4de0 }, ++ { XK_Down, 0x50e0 }, ++ { XK_Prior, 0x49e0 }, ++ { XK_Next, 0x51e0 }, ++ { XK_End, 0x4fe0 }, ++ { XK_Insert, 0x52e0 }, ++ { XK_Num_Lock, 0x45 }, + -static void sdl_grab_start(void) -{ - SDL_ShowCursor(0); @@ -551,7 +551,8 @@ - gui_grab = 1; - sdl_update_caption(); -} -- ++/* This block of codes is for Sun Type 4 keyboards... */ + -static void sdl_grab_end(void) -{ - SDL_WM_GrabInput(SDL_GRAB_OFF); @@ -559,7 +560,11 @@ - gui_grab = 0; - sdl_update_caption(); -} -- ++ { XK_F27, 0x47e0 }, /* Home/R7/F27 */ ++ { XK_F29, 0x49e0 }, /* Prior/R9/F29 */ ++ { XK_F35, 0x51e0 }, /* Next/R15/F35 */ ++ { XK_F33, 0x4fe0 }, /* End/R13/F33 */ + -static void sdl_send_mouse_event(int dz) -{ - int dx, dy, state, buttons; @@ -573,7 +578,9 @@ - buttons |= MOUSE_EVENT_MBUTTON; - kbd_mouse_event(dx, dy, dz, buttons); -} -- ++ { XK_F25, 0x36e0 }, /* Keypad divide/R5/F25 */ ++ { XK_F26, 0x37 }, /* Keypad multiply/R6/F26 */ + -static void toggle_full_screen(DisplayState *ds) -{ - gui_fullscreen = !gui_fullscreen; @@ -588,10 +595,64 @@ - vga_invalidate_display(); - vga_update_display(); -} -+ 0x1b, ++ { XK_F23, 0x46 }, /* Scroll lock/R3/F23 */ -static void sdl_refresh(DisplayState *ds) --{ ++ { XK_F31, 0x4c }, /* Keypad 5/R11/F31 */ ++ ++/* End of Sun type 4 codes */ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/qemu-nosdlgui.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 08:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: nautilus-cd-burner-2.11.7.tar.bz2 Message-ID: <31858.1124776859@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/nautilus-cd-burner-2.11.7.tar.bz2 3874a54b177cea400bb6c8a089c71e31 nautilus-cd-burner-2.11.7.tar.bz2 Size: 607499 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:00:58 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): nautilus-cd-burner.spec - version 2.11.7 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:00:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - version 2.11.7 ---- Files affected: SPECS: nautilus-cd-burner.spec (1.48.2.4 -> 1.48.2.5) ---- Diffs: ================================================================ Index: SPECS/nautilus-cd-burner.spec diff -u SPECS/nautilus-cd-burner.spec:1.48.2.4 SPECS/nautilus-cd-burner.spec:1.48.2.5 --- SPECS/nautilus-cd-burner.spec:1.48.2.4 Thu Aug 18 13:36:10 2005 +++ SPECS/nautilus-cd-burner.spec Tue Aug 23 08:00:52 2005 @@ -2,12 +2,12 @@ Summary: Extension for Nautilus to write CD Summary(pl): Rozszerzenie Nautilusa do zapisu p?yt CD Name: nautilus-cd-burner -Version: 2.11.6 -Release: 2 +Version: 2.11.7 +Release: 1 License: LGPL v2+/GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: ad4c124980d740c709acf631007c01e9 +# Source0-md5: 3874a54b177cea400bb6c8a089c71e31 URL: http://www.gnome.org/ Buildrequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf >= 2.52 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.5 2005/08/23 06:00:52 aflinta +- version 2.11.7 + Revision 1.48.2.4 2005/08/18 11:36:10 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus-cd-burner.spec?r1=1.48.2.4&r2=1.48.2.5&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: dasher.spec - 3.2.16 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:12:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.2.16 ---- Files affected: SPECS: dasher.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/dasher.spec diff -u SPECS/dasher.spec:1.18 SPECS/dasher.spec:1.19 --- SPECS/dasher.spec:1.18 Fri Apr 8 11:45:54 2005 +++ SPECS/dasher.spec Tue Aug 23 08:12:21 2005 @@ -2,14 +2,13 @@ Summary: Predictive text entry application Summary(pl): Przewiduj?ca aplikacja do wprowadzania tekstu Name: dasher -Version: 3.2.15 -Release: 2 +Version: 3.2.16 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/%{name}-%{version}.tar.bz2 -# Source0-md5: a3fa85e32c94c69476e12ecba7d257e7 -Patch0: %{name}-locale-names.patch -Patch1: %{name}-desktop.patch +# Source0-md5: 8e0a06db2a4452ec43c696f85bb9e1dc +Patch0: %{name}-desktop.patch URL: http://www.inference.phy.cam.ac.uk/dasher/ BuildRequires: GConf2-devel BuildRequires: ORBit2-devel @@ -57,9 +56,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 - -rm -f po/no.po %build %{__libtoolize} @@ -78,6 +74,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} --with-gnome --all-name %clean @@ -105,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 06:12:21 aflinta +- 3.2.16 + Revision 1.18 2005/04/08 09:45:54 paladine - new style macros - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dasher.spec?r1=1.18&r2=1.19&f=u From aflinta at pld-linux.org Tue Aug 23 08:12:38 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: dasher-3.2.16.tar.bz2 Message-ID: <4571.1124777558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/dasher/3.2/dasher-3.2.16.tar.bz2 8e0a06db2a4452ec43c696f85bb9e1dc dasher-3.2.16.tar.bz2 Size: 4595501 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 08:18:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): eel.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 06:18:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: eel.spec (1.72.2.5 -> 1.72.2.6) ---- Diffs: ================================================================ Index: SPECS/eel.spec diff -u SPECS/eel.spec:1.72.2.5 SPECS/eel.spec:1.72.2.6 --- SPECS/eel.spec:1.72.2.5 Sun Aug 21 10:36:13 2005 +++ SPECS/eel.spec Tue Aug 23 08:17:57 2005 @@ -3,12 +3,12 @@ Summary(pl): Biblioteka rozszerze? Eazel Summary(ko): Eazel ???? ?????????? Name: eel -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: d3d850c7148ebd6f0fe538faf03f996d +# Source0-md5: 58aec74f3ea93c43fcc69ae67bd1679d URL: http://nautilus.eazel.com/ BuildRequires: autoconf BuildRequires: automake @@ -126,6 +126,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72.2.6 2005/08/23 06:17:57 aflinta +- 2.11.92 + Revision 1.72.2.5 2005/08/21 08:36:13 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eel.spec?r1=1.72.2.5&r2=1.72.2.6&f=u From aflinta at pld-linux.org Tue Aug 23 08:18:39 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: eel-2.11.92.tar.bz2 Message-ID: <7758.1124777919@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/eel/2.11/eel-2.11.92.tar.bz2 58aec74f3ea93c43fcc69ae67bd1679d eel-2.11.92.tar.bz2 Size: 634956 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 08:51:08 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: tomboy.spec - fixed path to *.service, desktop - cosmetics In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:51:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed path to *.service, desktop - cosmetics ---- Files affected: SPECS: tomboy.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.9 SPECS/tomboy.spec:1.10 --- SPECS/tomboy.spec:1.9 Mon Aug 22 16:51:48 2005 +++ SPECS/tomboy.spec Tue Aug 23 08:51:02 2005 @@ -8,8 +8,7 @@ Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b -Source1: %{name}.desktop -#Patch0: %{name}-desktop.patch +Patch0: %{name}-desktop.patch URL: http://www.beatniksoftware.com/tomboy/ BuildRequires: GConf2-devel BuildRequires: atk-devel >= 1.2.4 @@ -45,7 +44,7 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build %{__libtoolize} @@ -59,12 +58,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_desktopdir} +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp data/tomboy.desktop $RPM_BUILD_ROOT%{_desktopdir} +mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ + $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ %find_lang %{name} @@ -81,16 +82,16 @@ %attr(755,root,root) %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas %dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.exe %{_libdir}/%{name}/*.config +%{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la %dir %{_libdir}/%{name}/Plugins -%{_libdir}/dbus-1.0/services/*.service -%{_libdir}/%{name}/Plugins/*.dll -%{_libdir}/bonobo/servers/* +%{_datadir}/dbus-1/services/*.service %{_datadir}/gnome-2.0/ui/* %{_desktopdir}/*.desktop +%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc @@ -101,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 06:51:02 pawcioos +- fixed path to *.service, desktop +- cosmetics + Revision 1.9 2005/08/22 14:51:48 pawcioos - updated to 0.3.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.9&r2=1.10&f=u From pawcioos at pld-linux.org Tue Aug 23 08:52:16 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES: tomboy-desktop.patch - path for desktop 0.3.3 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 06:52:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - path for desktop 0.3.3 ---- Files affected: SOURCES: tomboy-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.1 SOURCES/tomboy-desktop.patch:1.2 --- SOURCES/tomboy-desktop.patch:1.1 Mon Nov 1 17:40:48 2004 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 08:52:11 2005 @@ -1,11 +1,10 @@ -diff -urN aa/tomboy-0.2.2/configure.in tomboy-0.2.2/configure.in ---- aa/tomboy-0.2.2/configure.in 2004-10-15 00:13:31.000000000 +0200 -+++ tomboy-0.2.2/configure.in 2004-11-01 18:26:22.895964176 +0100 -@@ -87,6 +87,7 @@ - AC_OUTPUT([ - Makefile - tomboy.spec -+tomboy.desktop - Tomboy/Makefile - TrayIcon/Makefile - TrayIcon/libtrayicon/Makefile +--- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +@@ -1,6 +1,5 @@ +- + [Desktop Entry] +-Version=@VERSION@ ++Version=0.3.3 + Encoding=UTF-8 + _Name=Tomboy Notes + _Comment=Quick and handy note-taker ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.1&r2=1.2&f=u From aflinta at pld-linux.org Tue Aug 23 09:33:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES: dasher-locale-names.patch (REMOVED) - obsoleted In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:33:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsoleted ---- Files affected: SOURCES: dasher-locale-names.patch (1.6 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aflinta at pld-linux.org Tue Aug 23 09:34:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): nautilus.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 07:34:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: nautilus.spec (1.156.2.7 -> 1.156.2.8) ---- Diffs: ================================================================ Index: SPECS/nautilus.spec diff -u SPECS/nautilus.spec:1.156.2.7 SPECS/nautilus.spec:1.156.2.8 --- SPECS/nautilus.spec:1.156.2.7 Wed Aug 17 23:02:14 2005 +++ SPECS/nautilus.spec Tue Aug 23 09:33:58 2005 @@ -3,12 +3,12 @@ Summary(pl): Nautilus - pow?oka GNOME i zarz?dca plik?w Summary(pt_BR): Nautilus ? um gerenciador de arquivos para o GNOME Name: nautilus -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b3d9551afc4f40fd5c90d2fc4dfd35 +# Source0-md5: 8ee9569339fa79ffa4f61f294d124201 Source1: %{name}.PLD.readme Patch0: %{name}-includes.patch Patch1: %{name}-desktop.patch @@ -20,11 +20,11 @@ BuildRequires: automake BuildRequires: cdparanoia-III-devel BuildRequires: docbook-utils >= 0.6.10 -BuildRequires: eel-devel >= 2.11.91 +BuildRequires: eel-devel >= 2.11.92 BuildRequires: esound-devel >= 1:0.2.30 BuildRequires: freetype-devel >= 2.1.4 BuildRequires: gettext-devel -BuildRequires: gnome-desktop-devel >= 2.11.90-2 +BuildRequires: gnome-desktop-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.11.1 BuildRequires: intltool >= 0.33 BuildRequires: libart_lgpl-devel >= 2.3.17 @@ -187,6 +187,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.156.2.8 2005/08/23 07:33:58 aflinta +- 2.11.92 + Revision 1.156.2.7 2005/08/17 21:02:14 aflinta - rebuild with new cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nautilus.spec?r1=1.156.2.7&r2=1.156.2.8&f=u From aflinta at pld-linux.org Tue Aug 23 09:34:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: nautilus-2.11.92.tar.bz2 Message-ID: <16538.1124782454@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/nautilus-2.11.92.tar.bz2 8ee9569339fa79ffa4f61f294d124201 nautilus-2.11.92.tar.bz2 Size: 3994853 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:45:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS (DEVEL): glib2.spec - updated to 2.8.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:45:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.8.1 ---- Files affected: SPECS: glib2.spec (1.108.2.9 -> 1.108.2.10) ---- Diffs: ================================================================ Index: SPECS/glib2.spec diff -u SPECS/glib2.spec:1.108.2.9 SPECS/glib2.spec:1.108.2.10 --- SPECS/glib2.spec:1.108.2.9 Sun Aug 14 02:04:25 2005 +++ SPECS/glib2.spec Tue Aug 23 09:45:11 2005 @@ -16,13 +16,13 @@ Summary(tr): Yararl? ufak yordamlar kitapl??? Summary(zh_CN): ?????????????? Name: glib2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 1 License: LGPL Group: Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-%{version}.tar.bz2 -# Source0-md5: 803305bfd59cf7421d90983bf63e5227 +# Source0-md5: 2229ca9d5490a87d5e027e029520df14 Patch0: %{name}-makefile.patch Patch1: %{name}-SEGV.patch URL: http://www.gtk.org/ @@ -212,6 +212,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108.2.10 2005/08/23 07:45:11 paladine +- updated to 2.8.1 + Revision 1.108.2.9 2005/08/14 00:04:25 freetz - 2.8.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.108.2.9&r2=1.108.2.10&f=u From paladine at pld-linux.org Tue Aug 23 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: glib-2.8.1.tar.bz2 Message-ID: <23192.1124783125@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.1.tar.bz2 2229ca9d5490a87d5e027e029520df14 glib-2.8.1.tar.bz2 Size: 2561938 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 09:46:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SOURCES: tomboy-desktop.patch - fixed Categories - removed OnlySho... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:46:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed Categories - removed OnlyShowIn=KDE ---- Files affected: SOURCES: tomboy-desktop.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/tomboy-desktop.patch diff -u SOURCES/tomboy-desktop.patch:1.2 SOURCES/tomboy-desktop.patch:1.3 --- SOURCES/tomboy-desktop.patch:1.2 Tue Aug 23 08:52:11 2005 +++ SOURCES/tomboy-desktop.patch Tue Aug 23 09:46:45 2005 @@ -1,5 +1,6 @@ ---- tomboy-0.3.3/data/tomboy.desktop.in.orig 2005-03-09 11:21:00.000000000 +0100 -+++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 08:41:48.000000000 +0200 +diff -urN tomboy-0.3.3.orig/data/tomboy.desktop.in tomboy-0.3.3/data/tomboy.desktop.in +--- tomboy-0.3.3.orig/data/tomboy.desktop.in 2005-08-23 09:34:25.546703880 +0200 ++++ tomboy-0.3.3/data/tomboy.desktop.in 2005-08-23 09:36:34.600084784 +0200 @@ -1,6 +1,5 @@ - [Desktop Entry] @@ -8,3 +9,13 @@ Encoding=UTF-8 _Name=Tomboy Notes _Comment=Quick and handy note-taker +@@ -10,8 +9,7 @@ + StartupNotify=false + Terminal=false + Type=Application +-Categories=Application;Utility; +-OnlyShowIn=KDE; ++Categories=GTK;GNOME;Utility; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=tomboy + X-GNOME-Bugzilla-Component=General ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/tomboy-desktop.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Tue Aug 23 09:50:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: tomboy.spec - proper license - sorted BRs/Rs - removed no l... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 07:50:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper license - sorted BRs/Rs - removed no locale - use new GConf schemas macros - removed useless scrollkeeper-update - sorted/fixed %%files - fixed desktop patch - rel. 2 ---- Files affected: SPECS: tomboy.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/tomboy.spec diff -u SPECS/tomboy.spec:1.10 SPECS/tomboy.spec:1.11 --- SPECS/tomboy.spec:1.10 Tue Aug 23 08:51:02 2005 +++ SPECS/tomboy.spec Tue Aug 23 09:49:57 2005 @@ -3,8 +3,8 @@ Summary(pl): Tomboy - aplikacja do notatek na pulpicie Name: tomboy Version: 0.3.3 -Release: 1 -License: GPL +Release: 2 +License: LGPL v2.1 Group: X11/Applications Source0: http://www.beatniksoftware.com/tomboy/releases/%{name}-%{version}.tar.gz # Source0-md5: 7ad987216b484f747f53aa7f9055a46b @@ -17,17 +17,18 @@ BuildRequires: dotnet-dbus-sharp-devel BuildRequires: dotnet-gtk-sharp-devel BuildRequires: dotnet-gtk-sharp-gnome-devel -BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: gnome-panel-devel +BuildRequires: gtkspell-devel >= 2.0.5 BuildRequires: intltool >= 0.25 BuildRequires: libtool BuildRequires: mono-csharp BuildRequires: pkgconfig -Requires(post): GConf2 +BuildRequires: rpmbuild(macros) >= 1.197 +Requires(post,preun): GConf2 Requires: mono +Requires: dotnet-dbus-sharp Requires: dotnet-gtk-sharp Requires: dotnet-gtk-sharp-gnome -Requires: dotnet-dbus-sharp Requires: gnome-panel ExclusiveArch: %{ix86} %{x8664} alpha arm hppa ppc s390 sparc sparcv9 sparc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -53,11 +54,11 @@ %{__automake} %configure \ --disable-schemas-install - %{__make} %install rm -rf $RPM_BUILD_ROOT + install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/dbus-1/services} %{__make} install \ @@ -67,34 +68,37 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/dbus-1.0/services/*.service \ $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/ +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install -/usr/bin/scrollkeeper-update +%gconf_schema_install tomboy.schemas + +%preun +%gconf_schema_uninstall tomboy.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/dbus-1/services/*.service +%{_datadir}/gnome-2.0/ui/* +%{_desktopdir}/*.desktop %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.config -%{_libdir}/%{name}/*.exe +%attr(755,root,root) %{_libdir}/%{name}/*.exe %attr(755,root,root) %{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.la -%dir %{_libdir}/%{name}/Plugins -%{_datadir}/dbus-1/services/*.service -%{_datadir}/gnome-2.0/ui/* -%{_desktopdir}/*.desktop -%{_libdir}/%{name}/Plugins/*.dll +%{_libdir}/%{name}/Plugins %{_libdir}/bonobo/servers/* %{_mandir}/man1/tomboy.1* %{_pixmapsdir}/*.png %{_pkgconfigdir}/tomboy-plugins.pc +%{_sysconfdir}/gconf/schemas/tomboy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +106,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 07:49:57 paladine +- proper license +- sorted BRs/Rs +- removed no locale +- use new GConf schemas macros +- removed useless scrollkeeper-update +- sorted/fixed %%files +- fixed desktop patch +- rel. 2 + Revision 1.10 2005/08/23 06:51:02 pawcioos - fixed path to *.service, desktop - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tomboy.spec?r1=1.10&r2=1.11&f=u From paszczus at pld-linux.org Tue Aug 23 10:00:54 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:30 2005 Subject: SPECS: horde-passwd.spec - little clean In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 08:00:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - little clean ---- Files affected: SPECS: horde-passwd.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.16 SPECS/horde-passwd.spec:1.17 --- SPECS/horde-passwd.spec:1.16 Mon Aug 22 22:58:46 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 10:00:47 2005 @@ -31,7 +31,7 @@ %define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org +%define _sysconfdir /etc/horde.org %define _appdir %{hordedir}/%{_hordeapp} %description @@ -138,6 +138,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 08:00:47 paszczus +- little clean + Revision 1.16 2005/08/22 20:58:46 glen - fix partially configured hook ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.16&r2=1.17&f=u From paladine at pld-linux.org Tue Aug 23 10:09:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:30 2005 Subject: DISTFILES: openldev-0.4.2.tar.gz Message-ID: <5464.1124784596@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/openldev/openldev-0.4.2.tar.gz 9883643f1939f00f7c54318030d7b460 openldev-0.4.2.tar.gz Size: 418917 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 10:09:57 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: openldev.spec - updated to 0.4.2 - moved from gtkmm to gtk+... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 08:09:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 - moved from gtkmm to gtk+2 - updated descriptions ---- Files affected: SPECS: openldev.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/openldev.spec diff -u SPECS/openldev.spec:1.10 SPECS/openldev.spec:1.11 --- SPECS/openldev.spec:1.10 Fri Jul 22 23:42:31 2005 +++ SPECS/openldev.spec Tue Aug 23 10:09:51 2005 @@ -2,33 +2,32 @@ Summary: Graphical front-end to gcc/g++ Summary(pl): Graficzna nak?adka na gcc/g++ Name: openldev -Version: 0.4.1 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://dl.sourceforge.net/openldev/%{name}-%{version}.tar.gz -# Source0-md5: d22a497e87a6aafdfe663b3cffb1670d +# Source0-md5: 9883643f1939f00f7c54318030d7b460 Patch0: %{name}-desktop.patch Patch1: %{name}-makefile.patch URL: http://www.openldev.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: gnome-vfsmm-devel -BuildRequires: gtkmm-devel >= 2.6.0 +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk+2-devel >= 2.6.0 BuildRequires: gtksourceview-devel >= 1.2.0 -BuildRequires: libglademm-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: vte-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Open Linux Developer is a environment based on the Gtkmm libraries +Open Linux Developer is a environment based on the GTK+2 libraries that provides a graphical front-end to gcc/g++. It includes the basic essentials needed by a C/C++ programmer. %description -l pl -Open Linux Developer jest ?rodowiskiem opartym o bibliotek? Gtkmm, +Open Linux Developer jest ?rodowiskiem opartym o bibliotek? GTK+2, b?d?cym graficzn? nak?adk? na gcc/g++. Zawiera podstawowe sk?adniki porzebne dla programisty C/C++. @@ -75,6 +74,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/23 08:09:51 paladine +- updated to 0.4.2 +- moved from gtkmm to gtk+2 +- updated descriptions + Revision 1.10 2005/07/22 21:42:31 freetz - 0.4.1, missing libglademm-devel BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldev.spec?r1=1.10&r2=1.11&f=u From paladine at pld-linux.org Tue Aug 23 11:08:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): sound-juicer.spec - updated to 2.11.92 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 09:08:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files ---- Files affected: SPECS: sound-juicer.spec (1.36.2.7 -> 1.36.2.8) ---- Diffs: ================================================================ Index: SPECS/sound-juicer.spec diff -u SPECS/sound-juicer.spec:1.36.2.7 SPECS/sound-juicer.spec:1.36.2.8 --- SPECS/sound-juicer.spec:1.36.2.7 Thu Aug 18 13:50:47 2005 +++ SPECS/sound-juicer.spec Tue Aug 23 11:08:02 2005 @@ -2,17 +2,17 @@ Summary: CD ripper Summary(pl): Ripper p?yt CD Name: sound-juicer -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 226e799fea83a5522ea6d5babefd261e +# Source0-md5: b3e5f8e2dd1c3cf1246ed797903228d7 Patch0: %{name}-desktop.patch URL: http://www.burtonini.com/blog/computers/sound-juicer/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 -BuildRequires: automake >= 1.6 +BuildRequires: automake >= 1.9 BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-media-devel >= 2.11.91 BuildRequires: gnome-vfs2-devel >= 2.10.0-2 @@ -90,11 +90,11 @@ %defattr(644,root,root,755) %doc AUTHORS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* %{_omf_dest_dir}/%{name} +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/sound-juicer.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -102,6 +102,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.8 2005/08/23 09:08:02 paladine +- updated to 2.11.92 +- sorted %%files + Revision 1.36.2.7 2005/08/18 11:50:47 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sound-juicer.spec?r1=1.36.2.7&r2=1.36.2.8&f=u From paladine at pld-linux.org Tue Aug 23 11:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: sound-juicer-2.11.92.tar.bz2 Message-ID: <10686.1124788089@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.11/sound-juicer-2.11.92.tar.bz2 b3e5f8e2dd1c3cf1246ed797903228d7 sound-juicer-2.11.92.tar.bz2 Size: 550890 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 11:15:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: ApacheJServ-jre-env.patch (NEW) - set default LANG, jre b... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:15:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - set default LANG, jre behaves strange if it's unset ---- Files affected: SOURCES: ApacheJServ-jre-env.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ApacheJServ-jre-env.patch diff -u /dev/null SOURCES/ApacheJServ-jre-env.patch:1.1 --- /dev/null Tue Aug 23 11:15:37 2005 +++ SOURCES/ApacheJServ-jre-env.patch Tue Aug 23 11:15:31 2005 @@ -0,0 +1,10 @@ +--- ./conf/jserv.properties.in~ 2005-08-22 15:57:00.000000000 +0300 ++++ ./conf/jserv.properties.in 2005-08-23 12:14:27.000000000 +0300 +@@ -60,6 +60,7 @@ + # Syntax: wrapper.env=[name]=[value] (String) + # Default: NONE on Unix Systems + # SystemDrive and SystemRoot with appropriate values on Win32 systems ++wrapper.env=LANG=en_US + + # An environment name with value copied from caller to Java Virtual Machine + # Syntax: wrapper.env.copy=[name] (String) ================================================================ From aflinta at pld-linux.org Tue Aug 23 11:23:24 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: evolution-data-server-1.3.8.tar.bz2 Message-ID: <20109.1124789004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/evolution-data-server-1.3.8.tar.bz2 c6b2992c9a8f758a4a77511a4c2d5cfd evolution-data-server-1.3.8.tar.bz2 Size: 15019129 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 11:22:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): evolution-data-server.spec - 1.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:22:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.8 ---- Files affected: SPECS: evolution-data-server.spec (1.50.2.11 -> 1.50.2.12) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.50.2.11 SPECS/evolution-data-server.spec:1.50.2.12 --- SPECS/evolution-data-server.spec:1.50.2.11 Sun Aug 21 11:04:10 2005 +++ SPECS/evolution-data-server.spec Tue Aug 23 11:22:49 2005 @@ -12,12 +12,12 @@ Summary: Evolution data server Summary(pl): Serwer danych Evolution Name: evolution-data-server -Version: 1.3.7 -Release: 3 +Version: 1.3.8 +Release: 1 License: GPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: e05fe0e8607ed4403b19a9d3f407e8f9 +# Source0-md5: c6b2992c9a8f758a4a77511a4c2d5cfd Patch0: %{name}-system_db.patch Patch1: %{name}-GG-IM.patch Patch2: %{name}-workaround-cal-backend-leak.patch @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50.2.12 2005/08/23 09:22:49 aflinta +- 1.3.8 + Revision 1.50.2.11 2005/08/21 09:04:10 wiget - rebuild with new cairo, rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.50.2.11&r2=1.50.2.12&f=u From aflinta at pld-linux.org Tue Aug 23 11:26:03 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES (DEVEL): evolution-data-server-system_db.patch - up for ve... In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 09:26:03 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for version 1.3.8 ---- Files affected: SOURCES: evolution-data-server-system_db.patch (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ Index: SOURCES/evolution-data-server-system_db.patch diff -u SOURCES/evolution-data-server-system_db.patch:1.7.2.3 SOURCES/evolution-data-server-system_db.patch:1.7.2.4 --- SOURCES/evolution-data-server-system_db.patch:1.7.2.3 Sun Jul 3 18:28:46 2005 +++ SOURCES/evolution-data-server-system_db.patch Tue Aug 23 11:25:58 2005 @@ -1,6 +1,6 @@ -diff -aurN evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am ---- evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am 2005-06-25 12:17:17.000000000 +0200 -+++ evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am 2005-07-03 18:26:24.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am +--- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am 2005-08-23 11:04:40.302083616 +0200 ++++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am 2005-08-23 11:05:46.385037480 +0200 @@ -4,7 +4,6 @@ -I$(top_builddir) \ -I$(top_srcdir)/addressbook \ @@ -20,10 +20,10 @@ libebookbackendfile_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -diff -aurN evolution-data-server-1.3.4.orig/configure.in evolution-data-server-1.3.4/configure.in ---- evolution-data-server-1.3.4.orig/configure.in 2005-07-02 12:09:23.000000000 +0200 -+++ evolution-data-server-1.3.4/configure.in 2005-07-03 18:13:40.000000000 +0200 -@@ -1213,7 +1213,6 @@ +diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in +--- evolution-data-server-1.3.8.orig/configure.in 2005-08-23 11:04:38.291389288 +0200 ++++ evolution-data-server-1.3.8/configure.in 2005-08-23 11:05:46.387037176 +0200 +@@ -1253,7 +1253,6 @@ export privincludedir export privdatadir AC_CONFIG_SUBDIRS(calendar/libical) @@ -31,7 +31,7 @@ AC_OUTPUT([ Makefile -@@ -1268,7 +1267,6 @@ +@@ -1308,7 +1307,6 @@ camel/tests/stream/Makefile camel/camel.pc camel/camel-provider.pc @@ -39,9 +39,9 @@ libedataserver/Makefile libedataserver/libedataserver.pc libedataserverui/Makefile -diff -aurN evolution-data-server-1.3.4.orig/libedataserver/Makefile.am evolution-data-server-1.3.4/libedataserver/Makefile.am ---- evolution-data-server-1.3.4.orig/libedataserver/Makefile.am 2005-04-11 14:21:32.000000000 +0200 -+++ evolution-data-server-1.3.4/libedataserver/Makefile.am 2005-07-03 18:14:15.000000000 +0200 +diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am +--- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am 2005-08-23 11:04:40.526049568 +0200 ++++ evolution-data-server-1.3.8/libedataserver/Makefile.am 2005-08-23 11:06:56.983304912 +0200 @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ @@ -50,20 +50,18 @@ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \ $(E_DATA_SERVER_CFLAGS) -@@ -44,8 +43,8 @@ +@@ -44,7 +43,7 @@ libedataserver_1_2_la_LIBADD = \ $(E_DATA_SERVER_LIBS) \ $(ICONV_LIBS) \ -- $(top_builddir)/libdb/dist/libdb-4.1.la -- -+ -ldb -+ - libedataserver_1_2_la_LDFLAGS = \ - -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) +- $(top_builddir)/libdb/dist/libdb-4.1.la \ ++ -ldb \ + $(SOCKET_LIBS) -diff -aurN evolution-data-server-1.3.4.orig/Makefile.am evolution-data-server-1.3.4/Makefile.am ---- evolution-data-server-1.3.4.orig/Makefile.am 2005-04-11 14:21:26.000000000 +0200 -+++ evolution-data-server-1.3.4/Makefile.am 2005-07-03 18:18:54.000000000 +0200 + libedataserver_1_2_la_LDFLAGS = \ +diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am +--- evolution-data-server-1.3.8.orig/Makefile.am 2005-08-23 11:04:40.203098664 +0200 ++++ evolution-data-server-1.3.8/Makefile.am 2005-08-23 11:05:46.390036720 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/evolution-data-server-system_db.patch?r1=1.7.2.3&r2=1.7.2.4&f=u From glen at pld-linux.org Tue Aug 23 11:28:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: ApacheJServ.spec - user/groupadd to init package - secret.k... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 09:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - user/groupadd to init package - secret.key fill simplified - cleanups ---- Files affected: SPECS: ApacheJServ.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.38 SPECS/ApacheJServ.spec:1.39 --- SPECS/ApacheJServ.spec:1.38 Fri Aug 19 19:47:15 2005 +++ SPECS/ApacheJServ.spec Tue Aug 23 11:28:28 2005 @@ -1,14 +1,17 @@ # $Revision$, $Date$ +# TODO +# - separate package for jsdk? +# # Conditional build: %bcond_with gcj # use javac instead of GCJ - +# %define apxs /usr/sbin/apxs1 %define jsdkversion 20000924 Summary: Servlet engine with support for the leading web server Summary(pl): Silnik serwlet?w ze wsparciem dla wiod?cego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 0.19 +Release: 0.27 License: freely distributable & usable (JServ), LGPL (JSDK) Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -19,6 +22,7 @@ Source3: %{name}.init Patch0: %{name}-enable-secret.patch Patch1: %{name}-ac.patch +Patch2: %{name}-jre-env.patch URL: http://java.apache.org/ BuildRequires: apache1-devel >= 1.3.9-8 BuildRequires: rpmbuild(macros) >= 1.228 @@ -37,10 +41,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) -%define x_sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define httpdconf %(%{apxs} -q SYSCONFDIR 2>/dev/null) %define _sysconfdir /etc/jserv -%define x_sysconfdir %{httpdconf}/jserv %define logdir /var/log/jserv %define servletdir %{_datadir}/jserv/servlets %define _noautocompressdoc package-list @@ -68,6 +70,11 @@ Summary: ApacheJServ initscript Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} +BuildRequires: rpmbuild(macros) >= 1.202 +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd %description init JServ initscript for standalone mode. @@ -83,6 +90,7 @@ %setup -q -a1 %patch0 -p0 %patch1 -p0 +%patch2 -p1 sed -i -e ' s|@JSDK_CLASSES@|%{_javadir}/servlet-2.0.jar|g @@ -127,7 +135,7 @@ --with-logdir=%{logdir} \ --with-servlets=%{servletdir} \ %{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=`pwd` JAVAC_OPT="-source 1.4"} \ - %{!?with_gcj:--with-javac=%{_bindir}/javac --with-jdk-home=%{_libdir}/java} \ + %{!?with_gcj:--with-javac=%{_bindir}/javac --with-java=%{_bindir}/java --with-jdk-home=%{_libdir}/java} \ %{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \ --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar @@ -165,14 +173,15 @@ find jsdk-doc -name 'Makefile*' | xargs rm -f rm -rf jsdk-doc/{COPYING.LIB,CVS} jsdk-doc/apidoc/CVS +# duplicate +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/jserv.conf + %clean rm -rf $RPM_BUILD_ROOT %post if [ "$1" = 1 ]; then - # use fortune + install-date + process-list to create pseudo-random, hardly - # guessable secret key. Use md5sum to create a hash from this, if available: - (fortune 2>/dev/null; date; ps -eal 2>/dev/null) \ + dd if=/dev/urandom bs=1 count=42 2>/dev/null \ | (md5sum 2>/dev/null || cat) > %{_sysconfdir}/jserv.secret.key fi %service apache restart @@ -182,6 +191,11 @@ %service -q apache restart fi + +%pre init +%groupadd -P %{name}-init -g 154 jserv +%useradd -P %{name}-init -u 154 -g jserv -d /etc/jserv -c "JServ User" jserv + %post init /sbin/chkconfig --add jserv @@ -193,6 +207,12 @@ /sbin/chkconfig --del jserv fi +%postun init +if [ "$1" = "0" ]; then + %userremove jserv + %groupremove jserv +fi + %files %defattr(644,root,root,755) %doc LICENSE README @@ -200,7 +220,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/*_mod_jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.conf %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key #%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/jserv #%config /etc/profile.d/jserv.sh @@ -235,6 +254,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/23 09:28:28 glen +- user/groupadd to init package +- secret.key fill simplified +- cleanups + Revision 1.38 2005/08/19 17:47:15 glen - created -init subpackage for standalone mode - cruft removed from %post (we are rpm!) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Tue Aug 23 12:01:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: eventum.spec - add missing smarty modifier, rel 2, STBR In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:01:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add missing smarty modifier, rel 2, STBR ---- Files affected: SPECS: eventum.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.112 SPECS/eventum.spec:1.113 --- SPECS/eventum.spec:1.112 Sat Aug 20 13:39:59 2005 +++ SPECS/eventum.spec Tue Aug 23 12:01:01 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 1 +%define _rel 2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -537,7 +537,9 @@ rm -rf $RPM_BUILD_ROOT%{_appdir}/include/Smarty install -d $RPM_BUILD_ROOT%{_smartyplugindir} # These plugins are not in Smarty package (Smarty-2.6.2-3) -cp -a include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ +cp -a \ + include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \ + include/Smarty/plugins/modifier.highlight_quoted.php \ $RPM_BUILD_ROOT%{_smartyplugindir} # qmail router @@ -853,6 +855,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/23 10:01:01 glen +- add missing smarty modifier, rel 2, STBR + Revision 1.112 2005/08/20 11:39:59 glen - 1.6.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.112&r2=1.113&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:40 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): evolution.spec - 2.3.8 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 10:27:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.3.8 ---- Files affected: SPECS: evolution.spec (1.171.2.10 -> 1.171.2.11) ---- Diffs: ================================================================ Index: SPECS/evolution.spec diff -u SPECS/evolution.spec:1.171.2.10 SPECS/evolution.spec:1.171.2.11 --- SPECS/evolution.spec:1.171.2.10 Thu Aug 18 17:37:59 2005 +++ SPECS/evolution.spec Tue Aug 23 12:27:35 2005 @@ -16,12 +16,12 @@ Summary(pt_BR): Cliente de email integrado com calend?rio e cat?logo de endere?os Summary(zh_CN): Evolution - GNOME2????????????????????????(??????????????????????????) Name: evolution -Version: 2.3.7 -Release: 3 +Version: 2.3.8 +Release: 1 License: GPL v2 Group: Applications/Mail Source0: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 12d29f28f8ecf302547c63ad137e0b4b +# Source0-md5: d5972fbb96b36cd3420bf1390d63c551 Source1: %{name}-gg16.png Source2: %{name}-gg48.png Patch0: %{name}-nolibs.patch @@ -373,7 +373,7 @@ %{_datadir}/evolution/*/weather %{_datadir}/idl/evolution-*/Evolution-Component.idl %{_datadir}/idl/evolution-*/Evolution-ConfigControl.idl -%{_datadir}/idl/evolution-*/Evolution-Offline.idl +#%{_datadir}/idl/evolution-*/Evolution-Offline.idl %{_datadir}/idl/evolution-*/Evolution-Shell.idl %{_datadir}/idl/evolution-*/Evolution.idl %{_desktopdir}/* @@ -449,6 +449,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171.2.11 2005/08/23 10:27:35 aflinta +- 2.3.8 + Revision 1.171.2.10 2005/08/18 15:37:59 wiget - BR libgnomeui builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.171.2.10&r2=1.171.2.11&f=u From aflinta at pld-linux.org Tue Aug 23 12:27:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: evolution-2.3.8.tar.bz2 Message-ID: <24010.1124792873@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evolution/2.3/evolution-2.3.8.tar.bz2 d5972fbb96b36cd3420bf1390d63c551 evolution-2.3.8.tar.bz2 Size: 11434516 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:28:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: vte-atktextselection.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: vte-atktextselection.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: vte.spec - updated to 0.11.15 - removed atktextselection patch In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:28:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.11.15 - removed atktextselection patch ---- Files affected: SPECS: vte.spec (1.78 -> 1.79) ---- Diffs: ================================================================ Index: SPECS/vte.spec diff -u SPECS/vte.spec:1.78 SPECS/vte.spec:1.79 --- SPECS/vte.spec:1.78 Wed Aug 3 18:24:21 2005 +++ SPECS/vte.spec Tue Aug 23 12:28:32 2005 @@ -6,15 +6,14 @@ Summary: VTE terminal widget library Summary(pl): Biblioteka z kontrolk? terminala VTE Name: vte -Version: 0.11.14 +Version: 0.11.15 Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9676e430d951d617aff4672ed1b52fb1 +# Source0-md5: a9dc7b330d52ce384e3e5715d396c72f Patch0: %{name}-keys.patch -Patch1: %{name}-atktextselection.patch -Patch2: %{name}-nozvt.patch +Patch1: %{name}-nozvt.patch %{?with_glx:BuildRequires: OpenGL-devel} BuildRequires: autoconf BuildRequires: automake @@ -97,7 +96,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__glib_gettextize} @@ -165,6 +163,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79 2005/08/23 10:28:32 paladine +- updated to 0.11.15 +- removed atktextselection patch + Revision 1.78 2005/08/03 16:24:21 freetz - back to rel.1 (glib bug http://bugzilla.gnome.org/show_bug.cgi?id=312402) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vte.spec?r1=1.78&r2=1.79&f=u From paladine at pld-linux.org Tue Aug 23 12:28:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: vte-0.11.15.tar.bz2 Message-ID: <24519.1124792917@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/vte/0.11/vte-0.11.15.tar.bz2 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 Size: 959449 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 12:30:42 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: php.spec - revert invalid last commit In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:30:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - revert invalid last commit ---- Files affected: SPECS: php.spec (1.465 -> 1.466) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.465 SPECS/php.spec:1.466 --- SPECS/php.spec:1.465 Mon Aug 22 14:11:35 2005 +++ SPECS/php.spec Tue Aug 23 12:30:30 2005 @@ -77,14 +77,13 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.1.0 -%define _version %{version}RC1 -Release: 0.1%{?with_hardening:hardened} +Version: 5.0.4 +Release: 9.28%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{_version}.tar.bz2 -# Source0-md5: c7aebeb915e6f898559365cf82493ad0 +Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 +# Source0-md5: fb1aac107870f897d26563a9cc5053c0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -1431,7 +1430,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q -n %{name}-%{_version} +%setup -q # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1442,23 +1441,23 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -#%patch9 -p1 +%patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 %patch12 -p1 -#%patch13 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -#%patch20 -p1 -#%patch21 -p1 -#%patch28 -p1 +%patch20 -p1 +%patch21 -p1 +%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1466,8 +1465,8 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -#%patch27 -p1 -#%patch29 -p1 +%patch27 -p1 +%patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -2911,8 +2910,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.465 2005/08/22 12:11:35 adamg -*** empty log message *** +Revision 1.466 2005/08/23 10:30:30 glen +- revert invalid last commit Revision 1.464 2005/08/16 09:38:28 glen - sed >= 4.0 for updated php-module-install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.465&r2=1.466&f=u From glen at pld-linux.org Tue Aug 23 12:31:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: php.spec - rel 10 for finished conf.d support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:31:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 10 for finished conf.d support ---- Files affected: SPECS: php.spec (1.466 -> 1.467) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.466 SPECS/php.spec:1.467 --- SPECS/php.spec:1.466 Tue Aug 23 12:30:30 2005 +++ SPECS/php.spec Tue Aug 23 12:31:11 2005 @@ -78,7 +78,7 @@ Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php Version: 5.0.4 -Release: 9.28%{?with_hardening:hardened} +Release: 10%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -2910,6 +2910,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467 2005/08/23 10:31:11 glen +- rel 10 for finished conf.d support + Revision 1.466 2005/08/23 10:30:30 glen - revert invalid last commit ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.466&r2=1.467&f=u From pluto at pld-linux.org Tue Aug 23 12:33:15 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: qt4.spec - build/install fixes, release 1. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:33:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - build/install fixes, release 1. ---- Files affected: SPECS: qt4.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.36 SPECS/qt4.spec:1.37 --- SPECS/qt4.spec:1.36 Mon Aug 22 15:01:45 2005 +++ SPECS/qt4.spec Tue Aug 23 12:33:10 2005 @@ -35,7 +35,7 @@ Name: qt4 Version: 4.0.1 #Release: 1.%{_snap}.0.1 -Release: 0.1 +Release: 1 License: GPL/QPL Group: X11/Libraries Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz @@ -752,19 +752,12 @@ sub-demos-all-ordered \ sub-examples-all-ordered -# -# TODO: -# Check for "with" conditions befor build -# OR -# Find out why and fix the reason of building only mysql sqldriver -# (it is not installed either) -# -for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2} -do - cd $dir - %{__make} - cd - -done +%{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} +#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} +%{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} +%{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} +%{?with_sqlite3: %{__make} -C src/plugins/sqldrivers/sqlite} %if %{with dont_enable} %if %{with designer} @@ -783,6 +776,7 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} QTDIR=`/bin/pwd` export QTDIR @@ -855,6 +849,7 @@ ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h cd - +mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir} for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do HAVEDEBUG=`echo $f | grep _debug | wc -l` MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1` @@ -1135,6 +1130,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/23 10:33:10 pluto +- build/install fixes, release 1. + Revision 1.36 2005/08/22 13:01:45 pluto - updated to 4.0.1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.36&r2=1.37&f=u From glen at pld-linux.org Tue Aug 23 12:33:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: php4.spec - organization In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 10:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - organization ---- Files affected: SPECS: php4.spec (1.471 -> 1.472) ---- Diffs: ================================================================ Index: SPECS/php4.spec diff -u SPECS/php4.spec:1.471 SPECS/php4.spec:1.472 --- SPECS/php4.spec:1.471 Tue Aug 16 01:31:40 2005 +++ SPECS/php4.spec Tue Aug 23 12:33:21 2005 @@ -1876,16 +1876,21 @@ install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini -install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini +install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} +install %{SOURCE1} . -install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons +%if %{with apache1} install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons -install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE4} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php4.conf +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini +%endif + +%if %{with apache2} +install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons install %{SOURCE4} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php4.conf -install %{SOURCE1} . +install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini +%endif cp -f Zend/LICENSE{,.Zend} @@ -3090,6 +3095,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.472 2005/08/23 10:33:21 glen +- organization + Revision 1.471 2005/08/15 23:31:40 glen - BR: rpm-build >= 4.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.471&r2=1.472&f=u From pluto at pld-linux.org Tue Aug 23 12:46:51 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: qt4.spec - missed %dir %{_libdir}/qt4 added. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 10:46:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missed %dir %{_libdir}/qt4 added. ---- Files affected: SPECS: qt4.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.37 SPECS/qt4.spec:1.38 --- SPECS/qt4.spec:1.37 Tue Aug 23 12:33:10 2005 +++ SPECS/qt4.spec Tue Aug 23 12:46:45 2005 @@ -972,6 +972,7 @@ %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_libdir}/libQtCore*.so.* +%dir %{_libdir}/qt4 %dir %{_libdir}/qt4/plugins %dir %{_libdir}/qt4/plugins/codecs %dir %{_libdir}/qt4/plugins/crypto @@ -1130,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/23 10:46:45 pluto +- missed %dir %{_libdir}/qt4 added. + Revision 1.37 2005/08/23 10:33:10 pluto - build/install fixes, release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.37&r2=1.38&f=u From paladine at pld-linux.org Tue Aug 23 12:55:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): gnome-terminal.spec - updated to 2.11.3 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:55:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 ---- Files affected: SPECS: gnome-terminal.spec (1.71.2.4 -> 1.71.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-terminal.spec diff -u SPECS/gnome-terminal.spec:1.71.2.4 SPECS/gnome-terminal.spec:1.71.2.5 --- SPECS/gnome-terminal.spec:1.71.2.4 Thu Aug 18 13:07:00 2005 +++ SPECS/gnome-terminal.spec Tue Aug 23 12:55:34 2005 @@ -8,12 +8,12 @@ Summary: GNOME Terminal Summary(pl): Terminal dla GNOME Name: gnome-terminal -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 61cb4c49ea465584e0fd35a7209a37f2 +# Source0-md5: 334eb33c416c39f14b390f91d44ccb98 Patch0: %{name}-TERM.patch Patch1: %{name}-disable-prev_next-tab-sensitivity-changes.patch Patch2: %{name}-desktop.patch @@ -107,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71.2.5 2005/08/23 10:55:34 paladine +- updated to 2.11.3 + Revision 1.71.2.4 2005/08/18 11:07:00 aflinta - rebuild with cairo rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-terminal.spec?r1=1.71.2.4&r2=1.71.2.5&f=u From paladine at pld-linux.org Tue Aug 23 12:55:43 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: gnome-terminal-2.11.3.tar.bz2 Message-ID: <9593.1124794543@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.11/gnome-terminal-2.11.3.tar.bz2 334eb33c416c39f14b390f91d44ccb98 gnome-terminal-2.11.3.tar.bz2 Size: 1682922 bytes -- Virtually Yours: distfiles. From spider at pld-linux.org Tue Aug 23 12:57:25 2005 From: spider at pld-linux.org (spider) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: esmtp.spec - missing br's In-Reply-To: References: Message-ID: Author: spider Date: Tue Aug 23 10:57:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing br's ---- Files affected: SPECS: esmtp.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmtp.spec diff -u SPECS/esmtp.spec:1.4 SPECS/esmtp.spec:1.5 --- SPECS/esmtp.spec:1.4 Tue Jul 5 15:18:45 2005 +++ SPECS/esmtp.spec Tue Aug 23 12:57:20 2005 @@ -3,7 +3,7 @@ Summary(pl): esmtp - MTA obs?uguj?cy tylko przekazywanie poczty do serwera (E)SMTP Name: esmtp Version: 0.5.1 -Release: 0.2 +Release: 0.3 Epoch: 0 License: GPL v2 Group: Applications @@ -11,6 +11,7 @@ # Source0-md5: 9f0b809e891a548910f099efc4315b02 URL: http://esmtp.sourceforge.net/ BuildRequires: libesmtp-devel +Requires: libesmtp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 10:57:20 spider +- missing br's + Revision 1.4 2005/07/05 13:18:45 darekr - cosmetics, added %doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmtp.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Tue Aug 23 12:57:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: libgnome-2.11.3.tar.bz2 Message-ID: <10798.1124794656@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/libgnome-2.11.3.tar.bz2 26f795d586082417cb5cdcaf7e80563e libgnome-2.11.3.tar.bz2 Size: 946132 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 12:57:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): libgnome.spec - updated to 2.11.3 - itemize schemas... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 10:57:37 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - itemize schemas - sorted %%files ---- Files affected: SPECS: libgnome.spec (1.86.2.2 -> 1.86.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.2 SPECS/libgnome.spec:1.86.2.3 --- SPECS/libgnome.spec:1.86.2.2 Fri Aug 5 09:41:56 2005 +++ SPECS/libgnome.spec Tue Aug 23 12:57:31 2005 @@ -2,12 +2,12 @@ Summary: GNOME base library Summary(pl): Podstawowa biblioteka GNOME Name: libgnome -Version: 2.11.2 +Version: 2.11.3 Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 9d8c2c3937516d6e6945da884f4b7f39 +# Source0-md5: 26f795d586082417cb5cdcaf7e80563e URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90 BuildRequires: audiofile-devel >= 1:0.2.3 @@ -154,20 +154,34 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%{_sysconfdir}/gconf/schemas/* -%{_sysconfdir}/sound %attr(755,root,root) %{_bindir}/gnome-open %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_help_viewer.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_terminal.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_applications_window_manager.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_background.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_file_views.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_interface.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_lockdown.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_mouse.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_sound.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas +%{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas +%{_sysconfdir}/sound %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnome-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnome-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -179,6 +193,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.3 2005/08/23 10:57:31 paladine +- updated to 2.11.3 +- itemize schemas +- sorted %%files + Revision 1.86.2.2 2005/08/05 07:41:56 aflinta - up to version 2.11.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.2&r2=1.86.2.3&f=u From kosmo at pld-linux.org Tue Aug 23 13:19:11 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: pam_mysql-0.6.0.tar.gz Message-ID: <25122.1124795951@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pam-mysql/pam_mysql-0.6.0.tar.gz b7f59c5450d89126b7f25fa2645b1b71 pam_mysql-0.6.0.tar.gz Size: 312187 bytes -- Virtually Yours: distfiles. From kosmo at pld-linux.org Tue Aug 23 13:19:07 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: pam-pam_mysql.spec - updated to 0.6.0 In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 11:19:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.6.0 ---- Files affected: SPECS: pam-pam_mysql.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/pam-pam_mysql.spec diff -u SPECS/pam-pam_mysql.spec:1.9 SPECS/pam-pam_mysql.spec:1.10 --- SPECS/pam-pam_mysql.spec:1.9 Sat Feb 19 09:07:11 2005 +++ SPECS/pam-pam_mysql.spec Tue Aug 23 13:19:01 2005 @@ -3,16 +3,19 @@ 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-%{modulename} -Version: 0.5 -Release: 4 +Version: 0.6.0 +Release: 1 Epoch: 0 License: GPL Group: Base -# Source0-md5: 8cf002392292ae2a5774545324739a94 -Source0: http://dl.sourceforge.net/pam-mysql/pam_mysql-%{version}.tar.gz +Source0: http://dl.sourceforge.net/pam-mysql/%{modulename}-%{version}.tar.gz +# Source0-md5: b7f59c5450d89126b7f25fa2645b1b71 URL: http://sourceforge.net/projects/pam-mysql/ +BuildRequires: autoconf +BuildRequires: automake BuildRequires: mysql-devel BuildRequires: pam-devel +BuildRequires: pkgconfig Obsoletes: pam_mysql BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -25,25 +28,29 @@ baz? danych MySQL. %prep -%setup -q -n %{modulename} +%setup -q -n %{modulename}-%{version} +sed -i 's/sinclude(.*)//' configure.in %build -%{__make} \ - CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -DLINUX_PAM -ansi -pedantic -D_POSIX_SOURCE -Wall -fPIC" \ - LD_D="%{__cc} -shared -Xlinker -x" +%{__aclocal} +%{__autoconf} +%{__automake} +%configure +%{__make} %install rm -rf $RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so +# install -D pam_mysql.so $RPM_BUILD_ROOT/%{_lib}/security/pam_mysql.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc Readme Changelog +%doc CREDITS ChangeLog INSTALL NEWS README %attr(755,root,root) /%{_lib}/security/pam_mysql.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -52,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 11:19:01 kosmo +- updated to 0.6.0 + Revision 1.9 2005/02/19 08:07:11 ankry - rel. 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pam-pam_mysql.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Tue Aug 23 13:26:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): libgnomeui.spec - updated to 2.11.3 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:26:58 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.3 - sorted %%files ---- Files affected: SPECS: libgnomeui.spec (1.79.2.6 -> 1.79.2.7) ---- Diffs: ================================================================ Index: SPECS/libgnomeui.spec diff -u SPECS/libgnomeui.spec:1.79.2.6 SPECS/libgnomeui.spec:1.79.2.7 --- SPECS/libgnomeui.spec:1.79.2.6 Thu Aug 18 17:44:40 2005 +++ SPECS/libgnomeui.spec Tue Aug 23 13:26:52 2005 @@ -2,12 +2,12 @@ Summary: GNOME base GUI library Summary(pl): Podstawowa biblioteka GUI GNOME Name: libgnomeui -Version: 2.11.2 -Release: 2 +Version: 2.11.3 +Release: 1 License: LGPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 029928502654b82aca140a608422ffed +# Source0-md5: aa772258869f8a5010cbf5e9bdb075fe Patch0: %{name}-threads.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -129,23 +129,23 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/gnome_segv2 -%attr(755,root,root) %{_libdir}/lib*.so.*.* -%attr(755,root,root) %{_libdir}/libglade/2.0/*.so -%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so -%{_pixmapsdir}/* # it seems that every package that uses %{_datadir}/gnome tree requires # libgnomeui - so added these directories to this package %dir %{_datadir}/gnome %dir %{_datadir}/gnome/help +%attr(755,root,root) %{_libdir}/gnome_segv2 +%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/filesystems/libgnome-vfs.so +%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/libglade/2.0/*.so +%{_pixmapsdir}/* %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/%{name} +%{_includedir}/libgnomeui-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomeui-2.0 -%{_gtkdocdir}/%{name} %files static %defattr(644,root,root,755) @@ -157,6 +157,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.79.2.7 2005/08/23 11:26:52 paladine +- updated to 2.11.3 +- sorted %%files + Revision 1.79.2.6 2005/08/18 15:44:40 wiget - BR libgnomecanvas builded with new cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomeui.spec?r1=1.79.2.6&r2=1.79.2.7&f=u From paladine at pld-linux.org Tue Aug 23 13:27:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: libgnomeui-2.11.3.tar.bz2 Message-ID: <30210.1124796421@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.11/libgnomeui-2.11.3.tar.bz2 aa772258869f8a5010cbf5e9bdb075fe libgnomeui-2.11.3.tar.bz2 Size: 1822781 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 13:33:01 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): libgnome.spec - added missing manpage In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 11:33:01 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing manpage ---- Files affected: SPECS: libgnome.spec (1.86.2.3 -> 1.86.2.4) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.3 SPECS/libgnome.spec:1.86.2.4 --- SPECS/libgnome.spec:1.86.2.3 Tue Aug 23 12:57:31 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:32:55 2005 @@ -174,6 +174,7 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound +%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.4 2005/08/23 11:32:55 aflinta +- added missing manpage + Revision 1.86.2.3 2005/08/23 10:57:31 paladine - updated to 2.11.3 - itemize schemas ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.3&r2=1.86.2.4&f=u From paladine at pld-linux.org Tue Aug 23 13:43:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): libgnome.spec - sorted %%files again In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:43:28 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - sorted %%files again ---- Files affected: SPECS: libgnome.spec (1.86.2.4 -> 1.86.2.5) ---- Diffs: ================================================================ Index: SPECS/libgnome.spec diff -u SPECS/libgnome.spec:1.86.2.4 SPECS/libgnome.spec:1.86.2.5 --- SPECS/libgnome.spec:1.86.2.4 Tue Aug 23 13:32:55 2005 +++ SPECS/libgnome.spec Tue Aug 23 13:43:23 2005 @@ -158,6 +158,7 @@ %attr(755,root,root) %{_libdir}/lib*.so.*.* %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* +%{_mandir}/man7/gnome-options* %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_accessibility_startup.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_applications_browser.schemas @@ -174,7 +175,6 @@ %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas %{_sysconfdir}/sound -%{_mandir}/man7/gnome-options* %files devel %defattr(644,root,root,755) @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86.2.5 2005/08/23 11:43:23 paladine +- sorted %%files again + Revision 1.86.2.4 2005/08/23 11:32:55 aflinta - added missing manpage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnome.spec?r1=1.86.2.4&r2=1.86.2.5&f=u From paladine at pld-linux.org Tue Aug 23 13:45:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: libgnomecanvas-2.11.2.tar.bz2 Message-ID: <16091.1124797558@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/libgnomecanvas-2.11.2.tar.bz2 bd58220b0e5b3e71c46f36da72978064 libgnomecanvas-2.11.2.tar.bz2 Size: 588292 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 13:46:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): libgnomecanvas.spec - updated to 2.11.2 - sorted %%... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 11:45:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.2 - sorted %%files ---- Files affected: SPECS: libgnomecanvas.spec (1.66.2.2 -> 1.66.2.3) ---- Diffs: ================================================================ Index: SPECS/libgnomecanvas.spec diff -u SPECS/libgnomecanvas.spec:1.66.2.2 SPECS/libgnomecanvas.spec:1.66.2.3 --- SPECS/libgnomecanvas.spec:1.66.2.2 Thu Aug 18 17:43:41 2005 +++ SPECS/libgnomecanvas.spec Tue Aug 23 13:45:54 2005 @@ -2,12 +2,12 @@ Summary: GnomeCanvas widget Summary(pl): Widget GnomeCanvas Name: libgnomecanvas -Version: 2.11.1 -Release: 2 +Version: 2.11.2 +Release: 1 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 06d900efedb6f3ea011b43053dab3c0b +# Source0-md5: bd58220b0e5b3e71c46f36da72978064 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -101,11 +101,11 @@ %files devel %defattr(644,root,root,755) +%{_gtkdocdir}/* +%{_includedir}/libgnomecanvas-2.0 %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_pkgconfigdir}/*.pc -%{_includedir}/libgnomecanvas-2.0 -%{_gtkdocdir}/* %files static %defattr(644,root,root,755) @@ -117,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.3 2005/08/23 11:45:54 paladine +- updated to 2.11.2 +- sorted %%files + Revision 1.66.2.2 2005/08/18 15:43:41 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgnomecanvas.spec?r1=1.66.2.2&r2=1.66.2.3&f=u From aflinta at pld-linux.org Tue Aug 23 14:00:59 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: gedit-2.11.92.tar.bz2 Message-ID: <25517.1124798459@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-2.11.92.tar.bz2 f8cb7042d7d60694cc64553675ff8874 gedit-2.11.92.tar.bz2 Size: 2103799 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 14:00:54 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): gedit2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 12:00:54 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gedit2.spec (1.81.2.2 -> 1.81.2.3) ---- Diffs: ================================================================ Index: SPECS/gedit2.spec diff -u SPECS/gedit2.spec:1.81.2.2 SPECS/gedit2.spec:1.81.2.3 --- SPECS/gedit2.spec:1.81.2.2 Thu Aug 18 23:12:39 2005 +++ SPECS/gedit2.spec Tue Aug 23 14:00:48 2005 @@ -2,12 +2,12 @@ Summary: gEdit - small but powerful text editor for X Window Summary(pl): gEdit - ma?y ale pot??ny edytor tekstu dla X Window Name: gedit2 -Version: 2.11.91 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications/Editors Source0: http://ftp.gnome.org/pub/gnome/sources/gedit/2.11/gedit-%{version}.tar.bz2 -# Source0-md5: 1401595bdfe004fee3f3a567b6c356e0 +# Source0-md5: f8cb7042d7d60694cc64553675ff8874 Patch0: %{name}-use_default_font.patch Patch1: %{name}-desktop.patch URL: http://gedit.sourceforge.net/ @@ -148,6 +148,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81.2.3 2005/08/23 12:00:48 aflinta +- 2.11.92 + Revision 1.81.2.2 2005/08/18 21:12:39 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.81.2.2&r2=1.81.2.3&f=u From baggins at pld-linux.org Tue Aug 23 14:01:32 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: grub.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 12:01:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: grub.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/grub.spec diff -u SPECS/grub.spec:1.101 SPECS/grub.spec:1.102 --- SPECS/grub.spec:1.101 Sun Jul 31 22:37:17 2005 +++ SPECS/grub.spec Tue Aug 23 14:01:26 2005 @@ -18,7 +18,7 @@ Summary(de): GRUB - ein Bootloader f?r x86 Name: grub Version: 0.97 -Release: 0.4 +Release: 1 License: GPL Group: Base Source0: ftp://alpha.gnu.org/gnu/grub/%{name}-%{version}.tar.gz @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/23 12:01:26 baggins +- release 1 + Revision 1.101 2005/07/31 20:37:17 saq - rmf unpackaged file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grub.spec?r1=1.101&r2=1.102&f=u From paladine at pld-linux.org Tue Aug 23 14:04:15 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: gnome-applets-2.11.92.tar.bz2 Message-ID: <468.1124798655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.tar.bz2 2b78a6c5d59aa889979dbb54a301bf4e gnome-applets-2.11.92.tar.bz2 Size: 3786655 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 14:04:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92 - updated %... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 12:04:13 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - updated %%files ---- Files affected: SPECS: gnome-applets.spec (1.152.2.6 -> 1.152.2.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.6 SPECS/gnome-applets.spec:1.152.2.7 --- SPECS/gnome-applets.spec:1.152.2.6 Sun Aug 14 23:31:38 2005 +++ SPECS/gnome-applets.spec Tue Aug 23 14:04:08 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.91 -Release: 3 +Version: 2.11.92 +Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 011374d970db4018e1237d395ef45241 +# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -556,6 +556,7 @@ %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas %{_omf_dest_dir}/char-palette/char-palette-C.omf +%lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf %files cpufreq -f cpufreq-applet.lang @@ -570,6 +571,7 @@ %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf +%lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf %files drivemount -f drivemount.lang %defattr(644,root,root,755) @@ -579,6 +581,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas %{_omf_dest_dir}/drivemount/drivemount-C.omf +%lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf %files geyes -f geyes.lang %defattr(644,root,root,755) @@ -590,6 +593,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas %{_omf_dest_dir}/geyes/geyes-C.omf +%lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf %files gtik -f gtik2_applet2.lang %defattr(644,root,root,755) @@ -600,6 +604,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf +%lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf %files gweather -f gweather.lang %defattr(644,root,root,755) @@ -669,6 +674,7 @@ %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas %{_omf_dest_dir}/gswitchit/gswitchit-C.omf +%lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf %files minicommander -f command-line.lang %defattr(644,root,root,755) @@ -682,6 +688,7 @@ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas %{_omf_dest_dir}/command-line/command-line-C.omf +%lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf %files mixer %defattr(644,root,root,755) @@ -691,6 +698,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf +%lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf %files modemlights %defattr(644,root,root,755) @@ -709,6 +717,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas %{_omf_dest_dir}/multiload/multiload-C.omf +%lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf %files stickynotes -f stickynotes_applet.lang %defattr(644,root,root,755) @@ -720,6 +729,7 @@ %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf +%lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf %files trash -f trashapplet.lang %defattr(644,root,root,755) @@ -729,6 +739,8 @@ %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml %{_omf_dest_dir}/trashapplet/trashapplet-C.omf +%lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf +%lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -736,6 +748,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.7 2005/08/23 12:04:08 paladine +- updated to 2.11.92 +- updated %%files + Revision 1.152.2.6 2005/08/14 21:31:38 freetz - calling BR gtk+2-devel >= 2:2.8.0 instead of pango-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.6&r2=1.152.2.7&f=u From glen at pld-linux.org Tue Aug 23 14:23:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: libmemcache.spec - updated to 1.4.0, API is preserved but a... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling ---- Files affected: SPECS: libmemcache.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/libmemcache.spec diff -u SPECS/libmemcache.spec:1.4 SPECS/libmemcache.spec:1.5 --- SPECS/libmemcache.spec:1.4 Sat Jun 25 23:59:31 2005 +++ SPECS/libmemcache.spec Tue Aug 23 14:23:30 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define _beta 9 Summary: libmemcache - the C API for memcached Summary(pl): libmemcache - API C do memcached Name: libmemcache -Version: 1.3.0 +Version: 1.4.0 +%define _beta 4 Release: 0.beta%{_beta}.1 Epoch: 0 License: MIT Group: Libraries -Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.beta%{_beta}.tar.bz2 -# Source0-md5: 7b2579095cd758e575f0e4ce5f686305 +Source0: http://people.freebsd.org/~seanc/libmemcache/%{name}-%{version}.b%{_beta}.tar.bz2 +# Source0-md5: 74b6c17686a852a3f20d8e621fd0ab69 Patch0: %{name}-make.patch URL: http://people.freebsd.org/~seanc/libmemcache/ BuildRequires: autoconf @@ -74,7 +74,7 @@ Statyczna biblioteka libmemcache. %prep -%setup -q -n %{name}-%{version}.beta%{_beta} +%setup -q -n %{name}-%{version}.b%{_beta} %patch0 -p1 cp -a test tests rm -f tests{,/*}/Makefile* @@ -110,6 +110,8 @@ %attr(755,root,root) %{_libdir}/libmemcache.so %{_libdir}/libmemcache.la %{_includedir}/memcache.h +%{_includedir}/buffer.h +%{_includedir}/_buffer.h %files static %defattr(644,root,root,755) @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 12:23:30 glen +- updated to 1.4.0, API is preserved but anything linking against 1.4 needs recompiling + Revision 1.4 2005/06/25 21:59:31 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libmemcache.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 14:23:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: libmemcache-1.4.0.b4.tar.bz2 Message-ID: <12899.1124799820@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.b4.tar.bz2 74b6c17686a852a3f20d8e621fd0ab69 libmemcache-1.4.0.b4.tar.bz2 Size: 267487 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: php-mcache-ext-1.2.0-beta7.tar.gz Message-ID: <27277.1124800953@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-1.2.0-beta7.tar.gz bbe636154f8dc8ab3889054cf4ace2bd php-mcache-ext-1.2.0-beta7.tar.gz Size: 15415 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 14:42:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: php4-mcache.spec - up to 1.2.0-beta7 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 12:42:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.0-beta7 ---- Files affected: SPECS: php4-mcache.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.6 SPECS/php4-mcache.spec:1.7 --- SPECS/php4-mcache.spec:1.6 Mon Jul 18 16:26:39 2005 +++ SPECS/php4-mcache.spec Tue Aug 23 14:42:29 2005 @@ -6,13 +6,13 @@ Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 -%define _beta 6 -Release: 0.beta%{_beta}.2 +%define _beta 7 +Release: 0.beta%{_beta}.1 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://www.klir.com/~johnm/php-mcache/php-mcache-ext-%{version}-beta%{_beta}.tar.gz -# Source0-md5: 914b0272fe68d808ffa11edd741f2eae +# Source0-md5: bbe636154f8dc8ab3889054cf4ace2bd URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 12:42:29 glen +- up to 1.2.0-beta7 + Revision 1.6 2005/07/18 14:26:39 glen - fix epoch for php-common ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.6&r2=1.7&f=u From troll at pld-linux.org Tue Aug 23 14:42:52 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: bochs.spec - don't put VGABIOS-lgpl image to docs, but to %... In-Reply-To: References: Message-ID: Author: troll Date: Tue Aug 23 12:42:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs ---- Files affected: SPECS: bochs.spec (1.50 -> 1.51) ---- Diffs: ================================================================ Index: SPECS/bochs.spec diff -u SPECS/bochs.spec:1.50 SPECS/bochs.spec:1.51 --- SPECS/bochs.spec:1.50 Sun Jul 10 15:39:10 2005 +++ SPECS/bochs.spec Tue Aug 23 14:42:47 2005 @@ -112,7 +112,7 @@ DESTDIR=$RPM_BUILD_ROOT \ docdir=%{_docdir}/%{name}-%{version} -mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README,latest} \ +mv -f $RPM_BUILD_ROOT%{_datadir}/bochs/VGABIOS*{LICENSE,README} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -f TESTFORM.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51 2005/08/23 12:42:47 troll +- don't put VGABIOS-lgpl image to docs, but to %%{_datadir}/bochs + Revision 1.50 2005/07/10 13:39:10 saq - patch0 made its way to the sources ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bochs.spec?r1=1.50&r2=1.51&f=u From baggins at pld-linux.org Tue Aug 23 15:06:42 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (LINUX_2_6): kernel.spec - added bind mount extensions for v... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:06:42 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ---- Files affected: SPECS: kernel.spec (1.441.2.1160 -> 1.441.2.1161) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1160 SPECS/kernel.spec:1.441.2.1161 --- SPECS/kernel.spec:1.441.2.1160 Mon Aug 22 18:21:58 2005 +++ SPECS/kernel.spec Tue Aug 23 15:06:36 2005 @@ -262,8 +262,6 @@ # http://openmosix.snarc.org/files/releases/2.6/ # derived from openMosix-r570.patch Patch201: linux-2.6-omosix.patch -# vserver-2.0-pre4 -Patch202: linux-2.6-vs2.patch # xen http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html Patch203: linux-xen-2.0.6.patch Patch204: linux-2.6.12-smp-alts.patch @@ -271,6 +269,17 @@ Patch206: linux-2.6.12.3-xenbus.patch Patch207: linux-2.6.12.3-xen-fixes.patch +# vserver-2.0 +Patch300: linux-2.6-vs2.patch +# Bind Mount Extensions +Patch301: linux-2.6-vs2-BME.patch +# http://vserver.13thfloor.at/Experimental/FOR-2.0.1/ +Patch310: delta-vroot-fix01.diff +Patch311: delta-dlimit-feat01.diff +Patch312: delta-dlimit-fix01.diff +Patch313: delta-loopback-fix01.diff +Patch314: delta-dlimit-fix02.diff + Patch400: kernel-gcc4.patch Patch401: kernel-hotfixes.patch Patch402: linux-em8300-2.6.11.2.patch @@ -694,7 +703,13 @@ %{__patch} -p1 -F3 < %{PATCH201} %endif %if %{with vserver} -%patch202 -p1 +%patch300 -p1 +%patch301 -p1 +%patch310 -p1 +%patch311 -p1 +%patch312 -p1 +%patch313 -p1 +%patch314 -p1 %endif %if %{with xen} %if %{with xendev} @@ -1466,6 +1481,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1161 2005/08/23 13:06:36 baggins +- added bind mount extensions for vservers +- added fixes for vserver 2.0.1 + Revision 1.441.2.1160 2005/08/22 16:21:58 pluto - fbsplash dropped, bootsplash-3.1.6 added, release 0.3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1160&r2=1.441.2.1161&f=u From pluto at pld-linux.org Tue Aug 23 15:22:08 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: gcc.spec - updated to 4.1.0-20050823T1409UTC. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 13:22:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.0-20050823T1409UTC. ---- Files affected: SPECS: gcc.spec (1.357 -> 1.358) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.357 SPECS/gcc.spec:1.358 --- SPECS/gcc.spec:1.357 Fri Aug 19 01:15:01 2005 +++ SPECS/gcc.spec Tue Aug 23 15:21:59 2005 @@ -40,7 +40,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.1.0 -%define _snap 20050818T2314UTC +%define _snap 20050823T1409UTC Release: 0.%{_snap}.1 Epoch: 5 License: GPL v2+ @@ -48,7 +48,7 @@ #Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 #Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-%{_snap}/gcc-4.1-%{_snap}.tar.bz2 Source0: gcc-4.1-%{_snap}.tar.bz2 -# Source0-md5: 6579390fb1ef8b02e9667c7db1c52327 +# Source0-md5: f268cc87697cacde32240036d54cf209 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -1280,6 +1280,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.358 2005/08/23 13:21:59 pluto +- updated to 4.1.0-20050823T1409UTC. + Revision 1.357 2005/08/18 23:15:01 pluto - x87/mmx patchest. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.357&r2=1.358&f=u From pluto at pld-linux.org Tue Aug 23 15:22:16 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: gcc-4.1-20050823T1409UTC.tar.bz2 Message-ID: <20414.1124803336@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gcc-4.1-20050823T1409UTC.tar.bz2 f268cc87697cacde32240036d54cf209 gcc-4.1-20050823T1409UTC.tar.bz2 Size: 33406105 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 15:33:29 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: delta-dlimit-feat01.diff (NEW), delta-dlimit-fix01.diff (... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:33:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes for vserver 2.0.1 ---- Files affected: SOURCES: delta-dlimit-feat01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix01.diff (NONE -> 1.1) (NEW), delta-dlimit-fix02.diff (NONE -> 1.1) (NEW), delta-loopback-fix01.diff (NONE -> 1.1) (NEW), delta-vroot-fix01.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/delta-dlimit-feat01.diff diff -u /dev/null SOURCES/delta-dlimit-feat01.diff:1.1 --- /dev/null Tue Aug 23 15:33:29 2005 +++ SOURCES/delta-dlimit-feat01.diff Tue Aug 23 15:33:23 2005 @@ -0,0 +1,880 @@ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/balloc.c 2005-08-17 23:13:13 +0200 +@@ -261,7 +261,7 @@ do_more: + } + error_return: + brelse(bitmap_bh); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, freed); ++ DLIMIT_FREE_BLOCK(inode, freed); + release_blocks(sb, freed); + DQUOT_FREE_BLOCK(inode, freed); + } +@@ -365,7 +365,7 @@ int ext2_new_block(struct inode *inode, + *err = -ENOSPC; + goto out_dquot; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, es_alloc)) { ++ if (DLIMIT_ALLOC_BLOCK(inode, es_alloc)) { + *err = -ENOSPC; + goto out_dlimit; + } +@@ -516,7 +516,7 @@ got_block: + *err = 0; + out_release: + group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, es_alloc); ++ DLIMIT_FREE_BLOCK(inode, es_alloc); + out_dlimit: + release_blocks(sb, es_alloc); + out_dquot: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext2/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/ialloc.c 2005-08-17 23:29:16 +0200 +@@ -126,7 +126,7 @@ void ext2_free_inode (struct inode * ino + if (!is_bad_inode(inode)) { + /* Quota is already initialized in iput() */ + ext2_xattr_delete_inode(inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + } +@@ -469,7 +469,7 @@ struct inode *ext2_new_inode(struct inod + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto fail_dlim; + } +@@ -615,28 +615,29 @@ got: + + if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); +- err = -ENOSPC; ++ err = -EDQUOT; + goto fail2; + } + err = ext2_init_acl(inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; ++ + mark_inode_dirty(inode); + ext2_debug("allocating inode %lu\n", inode->i_ino); + ext2_preread_inode(inode); + return inode; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); + return ERR_PTR(err); + + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + fail_dlim: + make_bad_inode(inode); + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext2/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext2/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext2/xattr.c 2005-08-17 23:21:26 +0200 +@@ -651,11 +651,11 @@ ext2_xattr_set2(struct inode *inode, str + ea_bdebug(new_bh, "reusing block"); + + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + error = -EDQUOT; + if (DQUOT_ALLOC_BLOCK(inode, 1)) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + unlock_buffer(new_bh); + goto cleanup; + } +@@ -749,7 +749,7 @@ ext2_xattr_set2(struct inode *inode, str + le32_to_cpu(HDR(old_bh)->h_refcount) - 1); + if (ce) + mb_cache_entry_release(ce); +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + mark_buffer_dirty(old_bh); + ea_bdebug(old_bh, "refcount now=%d", +@@ -810,7 +810,7 @@ ext2_xattr_delete_inode(struct inode *in + mark_buffer_dirty(bh); + if (IS_SYNC(inode)) + sync_dirty_buffer(bh); +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + } + ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1); +Files linux-2.6.12.3-vs2.0/fs/ext3/.ialloc.c.swp and linux-2.6.12.3-vs2.0.0.1/fs/ext3/.ialloc.c.swp differ +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/balloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/balloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/balloc.c 2005-08-17 23:22:11 +0200 +@@ -505,7 +505,7 @@ void ext3_free_blocks(handle_t *handle, + } + ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks); + if (dquot_freed_blocks) { +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, dquot_freed_blocks); ++ DLIMIT_FREE_BLOCK(inode, dquot_freed_blocks); + DQUOT_FREE_BLOCK(inode, dquot_freed_blocks); + } + return; +@@ -1218,7 +1218,7 @@ int ext3_new_block(handle_t *handle, str + *errp = -EDQUOT; + return 0; + } +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto out_dlimit; + + sbi = EXT3_SB(sb); +@@ -1421,7 +1421,7 @@ io_error: + *errp = -EIO; + out: + if (!performed_allocation) +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + out_dlimit: + if (fatal) { + *errp = fatal; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c +--- linux-2.6.12.3-vs2.0/fs/ext3/ialloc.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/ialloc.c 2005-08-17 23:26:01 +0200 +@@ -127,7 +127,7 @@ void ext3_free_inode (handle_t *handle, + */ + DQUOT_INIT(inode); + ext3_xattr_delete_inode(handle, inode); +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + DQUOT_FREE_INODE(inode); + DQUOT_DROP(inode); + +@@ -448,7 +448,7 @@ struct inode *ext3_new_inode(handle_t *h + return ERR_PTR(-ENOMEM); + + inode->i_xid = vx_current_fsxid(sb); +- if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) { ++ if (DLIMIT_ALLOC_INODE(inode)) { + err = -ENOSPC; + goto out; + } +@@ -606,27 +606,24 @@ got: + sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0; + + ret = inode; +- if(DQUOT_ALLOC_INODE(inode)) { ++ if (DQUOT_ALLOC_INODE(inode)) { + DQUOT_DROP(inode); + err = -EDQUOT; + goto fail2; + } + err = ext3_init_acl(handle, inode, dir); +- if (err) { +- DQUOT_FREE_INODE(inode); +- goto fail2; +- } ++ if (err) ++ goto fail2_free; + err = ext3_mark_inode_dirty(handle, inode); + if (err) { + ext3_std_error(sb, err); +- DQUOT_FREE_INODE(inode); +- goto fail2; ++ goto fail2_free; + } + + ext3_debug("allocating inode %lu\n", inode->i_ino); + goto really_out; + fail: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + ext3_std_error(sb, err); + out: + iput(inode); +@@ -635,8 +632,10 @@ really_out: + brelse(bitmap_bh); + return ret; + ++fail2_free: ++ DQUOT_FREE_INODE(inode); + fail2: +- DLIMIT_FREE_INODE(sb, inode->i_xid); ++ DLIMIT_FREE_INODE(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; + iput(inode); +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/ext3/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c +--- linux-2.6.12.3-vs2.0/fs/ext3/xattr.c 2005-08-01 10:32:46 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/ext3/xattr.c 2005-08-17 23:30:04 +0200 +@@ -496,7 +496,7 @@ ext3_xattr_release_block(handle_t *handl + ext3_journal_dirty_metadata(handle, bh); + if (IS_SYNC(inode)) + handle->h_sync = 1; +- DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + DQUOT_FREE_BLOCK(inode, 1); + unlock_buffer(bh); + ea_bdebug(bh, "refcount now=%d; releasing", +@@ -766,7 +766,7 @@ inserted: + ea_bdebug(new_bh, "keeping"); + else { + error = -ENOSPC; +- if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1)) ++ if (DLIMIT_ALLOC_BLOCK(inode, 1)) + goto cleanup; + /* The old block is released after updating + the inode. */ +@@ -849,7 +849,7 @@ cleanup: + cleanup_dquot: + DQUOT_FREE_BLOCK(inode, 1); + cleanup_dlimit: +- DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1); ++ DLIMIT_FREE_BLOCK(inode, 1); + goto cleanup; + + bad_block: +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_dtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_dtree.c 2005-08-17 23:45:37 +0200 +@@ -102,6 +102,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_filsys.h" +@@ -381,9 +382,11 @@ static u32 add_index(tid_t tid, struct i + * It's time to move the inline table to an external + * page and begin to build the xtree + */ +- if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage) || ++ if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage)) ++ goto clean_up; ++ if (DLIMIT_ALLOC_BLOCK(ip, sbi->nbperpage) || + dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) +- goto clean_up; /* No space */ ++ goto clean_up_dlim; /* No space */ + + /* + * Save the table, we're going to overwrite it with the +@@ -474,6 +477,9 @@ static u32 add_index(tid_t tid, struct i + + return index; + ++ clean_up_dlim: ++ DQUOT_FREE_BLOCK(ip, sbi->nbperpage); ++ + clean_up: + + jfs_ip->next_index--; +@@ -925,7 +931,8 @@ int dtInsert(tid_t tid, struct inode *ip + static int dtSplitUp(tid_t tid, + struct inode *ip, struct dtsplit * split, struct btstack * btstack) + { +- struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); ++ struct super_block *sb = ip->i_sb; ++ struct jfs_sb_info *sbi = JFS_SBI(sb); + int rc = 0; + struct metapage *smp; + dtpage_t *sp; /* split page */ +@@ -947,6 +954,7 @@ static int dtSplitUp(tid_t tid, + struct tlock *tlck; + struct lv *lv; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + /* get split page */ + smp = split->mp; +@@ -1028,6 +1036,12 @@ static int dtSplitUp(tid_t tid, + } + quota_allocation += n; + ++ if (DLIMIT_ALLOC_BLOCK(ip, n)) { ++ rc = -ENOSPC; ++ goto extendOut; ++ } ++ dlimit_allocation += n; ++ + if ((rc = dbReAlloc(sbi->ipbmap, xaddr, (s64) xlen, + (s64) n, &nxaddr))) + goto extendOut; +@@ -1296,6 +1310,9 @@ static int dtSplitUp(tid_t tid, + freeKeyName: + kfree(key.name); + ++ /* Rollback dlimit allocation */ ++ if (rc && dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation */ + if (rc && quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1363,6 +1380,12 @@ static int dtSplitPage(tid_t tid, struct + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp); + +@@ -1913,6 +1936,12 @@ static int dtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + BT_MARK_DIRTY(rmp, ip); + /* +@@ -2279,6 +2308,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&fp->header.self); + ++ /* Free dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation. */ + DQUOT_FREE_BLOCK(ip, xlen); + +@@ -2355,6 +2386,8 @@ static int dtDeleteUp(tid_t tid, struct + + xlen = lengthPXD(&p->header.self); + ++ /* Free dlimit allocation */ ++ DLIMIT_FREE_BLOCK(ip, xlen); + /* Free quota allocation */ + DQUOT_FREE_BLOCK(ip, xlen); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_extent.c 2004-10-23 05:06:16 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_extent.c 2005-08-17 23:46:44 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -151,6 +152,13 @@ extAlloc(struct inode *ip, s64 xlen, s64 + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + /* determine the value of the extent flag */ + xflag = (abnr == TRUE) ? XAD_NOTRECORDED : 0; +@@ -169,6 +177,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 + */ + if (rc) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + up(&JFS_IP(ip)->commit_sem); + return (rc); +@@ -266,6 +275,13 @@ int extRealloc(struct inode *ip, s64 nxl + up(&JFS_IP(ip)->commit_sem); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nxlen)) { ++ DQUOT_FREE_BLOCK(ip, nxlen); ++ dbFree(ip, nxaddr, (s64) nxlen); ++ up(&JFS_IP(ip)->commit_sem); ++ return -ENOSPC; ++ } + + delta = nxlen - xlen; + +@@ -302,6 +318,7 @@ int extRealloc(struct inode *ip, s64 nxl + /* extend the extent */ + if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) { + dbFree(ip, xaddr + xlen, delta); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +@@ -313,6 +330,7 @@ int extRealloc(struct inode *ip, s64 nxl + */ + if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) { + dbFree(ip, nxaddr, nxlen); ++ DLIMIT_FREE_BLOCK(ip, nxlen); + DQUOT_FREE_BLOCK(ip, nxlen); + goto exit; + } +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_inode.c 2005-08-01 10:32:42 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_inode.c 2005-08-17 23:46:24 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include "jfs_incore.h" + #include "jfs_filsys.h" +@@ -61,12 +62,18 @@ struct inode *ialloc(struct inode *paren + mode |= S_ISGID; + } else + inode->i_gid = current->fsgid; ++ + inode->i_xid = vx_current_fsxid(sb); ++ if (DLIMIT_ALLOC_INODE(inode)) { ++ iput(inode); ++ return NULL; ++ } + + /* + * Allocate inode to quota. + */ + if (DQUOT_ALLOC_INODE(inode)) { ++ DLIMIT_FREE_INODE(inode); + DQUOT_DROP(inode); + inode->i_flags |= S_NOQUOTA; + inode->i_nlink = 0; +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c +--- linux-2.6.12.3-vs2.0/fs/jfs/jfs_xtree.c 2005-06-22 02:38:36 +0200 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/jfs_xtree.c 2005-08-17 23:45:13 +0200 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_filsys.h" + #include "jfs_metapage.h" +@@ -849,7 +850,12 @@ int xtInsert(tid_t tid, /* transaction + hint = 0; + if ((rc = DQUOT_ALLOC_BLOCK(ip, xlen))) + goto out; ++ if ((rc = DLIMIT_ALLOC_BLOCK(ip, xlen))) { ++ DQUOT_FREE_BLOCK(ip, xlen); ++ goto out; ++ } + if ((rc = dbAlloc(ip, hint, (s64) xlen, &xaddr))) { ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + goto out; + } +@@ -879,6 +885,7 @@ int xtInsert(tid_t tid, /* transaction + /* undo data extent allocation */ + if (*xaddrp == 0) { + dbFree(ip, xaddr, (s64) xlen); ++ DLIMIT_FREE_BLOCK(ip, xlen); + DQUOT_FREE_BLOCK(ip, xlen); + } + return rc; +@@ -927,7 +934,6 @@ int xtInsert(tid_t tid, /* transaction + out: + /* unpin the leaf page */ + XT_PUTPAGE(mp); +- + return rc; + } + +@@ -1239,6 +1245,7 @@ xtSplitPage(tid_t tid, struct inode *ip, + struct tlock *tlck; + struct xtlock *sxtlck = NULL, *rxtlck = NULL; + int quota_allocation = 0; ++ int dlimit_allocation = 0; + + smp = split->mp; + sp = XT_PAGE(ip, smp); +@@ -1251,13 +1258,19 @@ xtSplitPage(tid_t tid, struct inode *ip, + rbn = addressPXD(pxd); + + /* Allocate blocks to quota. */ +- if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { + rc = -EDQUOT; + goto clean_up; + } +- + quota_allocation += lengthPXD(pxd); + ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ rc = -ENOSPC; ++ goto clean_up; ++ } ++ dlimit_allocation += lengthPXD(pxd); ++ + /* + * allocate the new right page for the split + */ +@@ -1459,6 +1472,9 @@ xtSplitPage(tid_t tid, struct inode *ip, + + clean_up: + ++ /* Rollback dlimit allocation. */ ++ if (dlimit_allocation) ++ DLIMIT_FREE_BLOCK(ip, dlimit_allocation); + /* Rollback quota allocation. */ + if (quota_allocation) + DQUOT_FREE_BLOCK(ip, quota_allocation); +@@ -1523,6 +1539,12 @@ xtSplitRoot(tid_t tid, + release_metapage(rmp); + return -EDQUOT; + } ++ /* Allocate blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { ++ DQUOT_FREE_BLOCK(ip, lengthPXD(pxd)); ++ release_metapage(rmp); ++ return -ENOSPC; ++ } + + jfs_info("xtSplitRoot: ip:0x%p rmp:0x%p", ip, rmp); + +@@ -3949,6 +3971,8 @@ s64 xtTruncate(tid_t tid, struct inode * + else + ip->i_size = newsize; + ++ /* update dlimit allocation to reflect freed blocks */ ++ DLIMIT_FREE_BLOCK(ip, nfreed); + /* update quota allocation to reflect freed blocks */ + DQUOT_FREE_BLOCK(ip, nfreed); + +diff -NurpP --minimal linux-2.6.12.3-vs2.0/fs/jfs/xattr.c linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c +--- linux-2.6.12.3-vs2.0/fs/jfs/xattr.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.12.3-vs2.0.0.1/fs/jfs/xattr.c 2005-08-17 23:47:01 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "jfs_incore.h" + #include "jfs_superblock.h" + #include "jfs_dmap.h" +@@ -275,9 +276,16 @@ static int ea_write(struct inode *ip, st + if (DQUOT_ALLOC_BLOCK(ip, nblocks)) { + return -EDQUOT; + } ++ /* Allocate new blocks to dlimit. */ ++ if (DLIMIT_ALLOC_BLOCK(ip, nblocks)) { ++ DQUOT_FREE_BLOCK(ip, nblocks); ++ return -ENOSPC; ++ } + + rc = dbAlloc(ip, INOHINT(ip), nblocks, &blkno); + if (rc) { ++ /*Rollback dlimit allocation. */ ++ DLIMIT_FREE_BLOCK(ip, nblocks); + /*Rollback quota allocation. */ <> From baggins at pld-linux.org Tue Aug 23 15:34:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: linux-2.6-vs2-BME.patch (NEW) - vserver bind mount extens... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:34:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - vserver bind mount extensions ---- Files affected: SOURCES: linux-2.6-vs2-BME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2-BME.patch diff -u /dev/null SOURCES/linux-2.6-vs2-BME.patch:1.1 --- /dev/null Tue Aug 23 15:34:03 2005 +++ SOURCES/linux-2.6-vs2-BME.patch Tue Aug 23 15:33:58 2005 @@ -0,0 +1,911 @@ +; +; http://vserver.13thfloor.at/Experimental/BME/delta-2.6.11.5-vs1.9.5.3-bme0.06.1.diff +; +; Bind Mount Extensions +; +; this patch adds some functionality to the --bind +; type of vfs mounts. +; +; (C) 2003-2004 Herbert P?tzl +; +; Changelog: +; +; 0.01 - readonly bind mounts +; 0.02 - added ro truncate handling +; - added ro (f)chown, (f)chmod handling +; 0.03 - added ro utime(s) handling +; - added ro access and *_ioctl +; 0.04 - added noatime and nodiratime +; - made autofs4 update_atime uncond +; 0.05 - rewrite regarding (a)time +; - adapted to new 2.6 vfs +; 0.05.1 check for *->mnt added +; +; this patch 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 patch 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. + +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c +--- linux-2.6.11.5-vs1.9.5.3/arch/sparc64/solaris/fs.c 2004-12-25 01:54:50 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/arch/sparc64/solaris/fs.c 2005-03-26 00:25:23 +0100 +@@ -362,7 +362,7 @@ static int report_statvfs(struct vfsmoun + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +@@ -398,7 +398,7 @@ static int report_statvfs64(struct vfsmo + int j = strlen (p); + + if (j > 15) j = 15; +- if (IS_RDONLY(inode)) i = 1; ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(mnt)) i = 1; + if (mnt->mnt_flags & MNT_NOSUID) i |= 2; + if (!sysv_valid_dev(inode->i_sb->s_dev)) + return -EOVERFLOW; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext2/ioctl.c 2005-03-23 21:34:31 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext2/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -29,7 +29,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETFLAGS: { + unsigned int oldflags; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -70,7 +71,8 @@ int ext2_ioctl (struct inode * inode, st + case EXT2_IOC_SETVERSION: + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(inode->i_generation, (int __user *) arg)) + return -EFAULT; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/ext3/ioctl.c 2005-03-23 21:34:33 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/ext3/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -36,7 +36,8 @@ int ext3_ioctl (struct inode * inode, st + unsigned int oldflags; + unsigned int jflag; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -114,7 +115,8 @@ flags_err: + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) + return -EPERM; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + if (get_user(generation, (int __user *) arg)) + return -EFAULT; +@@ -165,7 +167,8 @@ flags_err: + if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode)) + return -ENOTTY; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +@@ -186,7 +189,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (get_user(n_blocks_count, (__u32 __user *)arg)) +@@ -207,7 +211,8 @@ flags_err: + if (!capable(CAP_SYS_RESOURCE)) + return -EPERM; + +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg, +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c +--- linux-2.6.11.5-vs1.9.5.3/fs/hfsplus/ioctl.c 2005-03-02 12:38:44 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/hfsplus/ioctl.c 2005-03-26 00:25:23 +0100 +@@ -34,7 +34,8 @@ int hfsplus_ioctl(struct inode *inode, s + flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */ + return put_user(flags, (int __user *)arg); + case HFSPLUS_IOC_EXT2_SETFLAGS: { +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || ++ (filp && MNT_IS_RDONLY(filp->f_vfsmnt))) + return -EROFS; + + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namei.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namei.c 2005-03-25 23:52:18 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namei.c 2005-03-26 00:25:23 +0100 +@@ -242,7 +242,7 @@ int permission(struct inode *inode, int + /* + * Nobody gets write access to a read-only fs. + */ +- if (IS_RDONLY(inode) && ++ if ((IS_RDONLY(inode) || (nd && MNT_IS_RDONLY(nd->mnt))) && + (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) + return -EROFS; + +@@ -1162,7 +1162,8 @@ static inline int check_sticky(struct in + * 10. We don't allow removal of NFS sillyrenamed files; it's handled by + * nfs_async_unlink(). + */ +-static inline int may_delete(struct inode *dir,struct dentry *victim,int isdir) ++static inline int may_delete(struct inode *dir, struct dentry *victim, ++ int isdir, struct nameidata *nd) + { + int error; + +@@ -1171,7 +1172,7 @@ static inline int may_delete(struct inod + + BUG_ON(victim->d_parent->d_inode != dir); + +- error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); ++ error = permission(dir,MAY_WRITE | MAY_EXEC, nd); + if (error) + return error; + if (IS_APPEND(dir)) +@@ -1332,7 +1333,8 @@ int may_open(struct nameidata *nd, int a + return -EACCES; + + flag &= ~O_TRUNC; +- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE)) ++ } else if ((IS_RDONLY(inode) || MNT_IS_RDONLY(nd->mnt)) ++ && (flag & FMODE_WRITE)) + return -EROFS; + /* + * An append-only file must be opened in append mode for writing. +@@ -1580,9 +1582,10 @@ fail: + } + EXPORT_SYMBOL_GPL(lookup_create); + +-int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) ++int vfs_mknod(struct inode *dir, struct dentry *dentry, ++ int mode, dev_t dev, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1624,7 +1627,6 @@ asmlinkage long sys_mknod(const char __u + goto out; + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); +- + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; + if (!IS_ERR(dentry)) { +@@ -1633,11 +1635,12 @@ asmlinkage long sys_mknod(const char __u + error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd); + break; + case S_IFCHR: case S_IFBLK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode, +- new_decode_dev(dev)); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ new_decode_dev(dev), &nd); + break; + case S_IFIFO: case S_IFSOCK: +- error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0); ++ error = vfs_mknod(nd.dentry->d_inode, dentry, mode, ++ 0, &nd); + break; + case S_IFDIR: + error = -EPERM; +@@ -1655,9 +1658,10 @@ out: + return error; + } + +-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ++int vfs_mkdir(struct inode *dir, struct dentry *dentry, ++ int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1698,7 +1702,8 @@ asmlinkage long sys_mkdir(const char __u + if (!IS_ERR(dentry)) { + if (!IS_POSIXACL(nd.dentry->d_inode)) + mode &= ~current->fs->umask; +- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode); ++ error = vfs_mkdir(nd.dentry->d_inode, dentry, ++ mode, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1742,9 +1747,10 @@ void dentry_unhash(struct dentry *dentry + spin_unlock(&dcache_lock); + } + +-int vfs_rmdir(struct inode *dir, struct dentry *dentry) ++int vfs_rmdir(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 1); ++ int error = may_delete(dir, dentry, 1, nd); + + if (error) + return error; +@@ -1806,7 +1812,7 @@ asmlinkage long sys_rmdir(const char __u + dentry = lookup_hash(&nd.last, nd.dentry); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_rmdir(nd.dentry->d_inode, dentry); ++ error = vfs_rmdir(nd.dentry->d_inode, dentry, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1817,9 +1823,10 @@ exit: + return error; + } + +-int vfs_unlink(struct inode *dir, struct dentry *dentry) ++int vfs_unlink(struct inode *dir, struct dentry *dentry, ++ struct nameidata *nd) + { +- int error = may_delete(dir, dentry, 0); ++ int error = may_delete(dir, dentry, 0, nd); + + if (error) + return error; +@@ -1881,7 +1888,7 @@ asmlinkage long sys_unlink(const char __ + inode = dentry->d_inode; + if (inode) + atomic_inc(&inode->i_count); +- error = vfs_unlink(nd.dentry->d_inode, dentry); ++ error = vfs_unlink(nd.dentry->d_inode, dentry, &nd); + exit2: + dput(dentry); + } +@@ -1900,9 +1907,10 @@ slashes: + goto exit2; + } + +-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode) ++int vfs_symlink(struct inode *dir, struct dentry *dentry, ++ const char *oldname, int mode, struct nameidata *nd) + { +- int error = may_create(dir, dentry, NULL); ++ int error = may_create(dir, dentry, nd); + + if (error) + return error; +@@ -1944,7 +1952,8 @@ asmlinkage long sys_symlink(const char _ + dentry = lookup_create(&nd, 0); + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { +- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO); ++ error = vfs_symlink(nd.dentry->d_inode, dentry, ++ from, S_IALLUGO, &nd); + dput(dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -1956,7 +1965,8 @@ out: + return error; + } + +-int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry) ++int vfs_link(struct dentry *old_dentry, struct inode *dir, ++ struct dentry *new_dentry, struct nameidata *nd) + { + struct inode *inode = old_dentry->d_inode; + int error; +@@ -1964,7 +1974,7 @@ int vfs_link(struct dentry *old_dentry, + if (!inode) + return -ENOENT; + +- error = may_create(dir, new_dentry, NULL); ++ error = may_create(dir, new_dentry, nd); + if (error) + return error; + +@@ -2028,7 +2038,8 @@ asmlinkage long sys_link(const char __us + new_dentry = lookup_create(&nd, 0); + error = PTR_ERR(new_dentry); + if (!IS_ERR(new_dentry)) { +- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); ++ error = vfs_link(old_nd.dentry, nd.dentry->d_inode, ++ new_dentry, &nd); + dput(new_dentry); + } + up(&nd.dentry->d_inode->i_sem); +@@ -2158,14 +2169,14 @@ int vfs_rename(struct inode *old_dir, st + if (old_dentry->d_inode == new_dentry->d_inode) + return 0; + +- error = may_delete(old_dir, old_dentry, is_dir); ++ error = may_delete(old_dir, old_dentry, is_dir, NULL); + if (error) + return error; + + if (!new_dentry->d_inode) + error = may_create(new_dir, new_dentry, NULL); + else +- error = may_delete(new_dir, new_dentry, is_dir); ++ error = may_delete(new_dir, new_dentry, is_dir, NULL); + if (error) + return error; + +@@ -2241,6 +2252,9 @@ static inline int do_rename(const char * + error = -EINVAL; + if (old_dentry == trap) + goto exit4; ++ error = -EROFS; ++ if (MNT_IS_RDONLY(newnd.mnt)) ++ goto exit4; + new_dentry = lookup_hash(&newnd.last, new_dir); + error = PTR_ERR(new_dentry); + if (IS_ERR(new_dentry)) +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/namespace.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c +--- linux-2.6.11.5-vs1.9.5.3/fs/namespace.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/namespace.c 2005-03-26 00:20:19 +0100 +@@ -252,24 +252,26 @@ static int show_vfsmnt(struct seq_file * + struct vfsmount *mnt = v; + int err = 0; + static struct proc_fs_info { +- int flag; +- char *str; ++ int s_flag; ++ int mnt_flag; ++ char *set_str; ++ char *unset_str; + } fs_info[] = { +- { MS_SYNCHRONOUS, ",sync" }, +- { MS_DIRSYNC, ",dirsync" }, +- { MS_MANDLOCK, ",mand" }, +- { MS_NOATIME, ",noatime" }, +- { MS_NODIRATIME, ",nodiratime" }, +- { MS_TAGXID, ",tagxid" }, +- { 0, NULL } +- }; +- static struct proc_fs_info mnt_info[] = { +- { MNT_NOSUID, ",nosuid" }, +- { MNT_NODEV, ",nodev" }, +- { MNT_NOEXEC, ",noexec" }, +- { 0, NULL } ++ { MS_RDONLY, MNT_RDONLY, "ro", "rw" }, ++ { MS_SYNCHRONOUS, 0, ",sync", NULL }, ++ { MS_DIRSYNC, 0, ",dirsync", NULL }, ++ { MS_MANDLOCK, 0, ",mand", NULL }, ++ { MS_NOATIME, MNT_NOATIME, ",noatime", NULL }, ++ { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL }, ++ { 0, MNT_NOSUID, ",nosuid", NULL }, ++ { 0, MNT_NODEV, ",nodev", NULL }, ++ { 0, MNT_NOEXEC, ",noexec", NULL }, ++ { MS_TAGXID, 0, ",tagxid", NULL }, ++ { 0, 0, NULL, NULL } + }; +- struct proc_fs_info *fs_infop; ++ struct proc_fs_info *p; ++ unsigned long s_flags = mnt->mnt_sb->s_flags; ++ int mnt_flags = mnt->mnt_flags; + + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return 0; +@@ -285,14 +287,15 @@ static int show_vfsmnt(struct seq_file * + seq_putc(m, ' '); + } + mangle(m, mnt->mnt_sb->s_type->name); +- seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw"); +- for (fs_infop = fs_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_sb->s_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); +- } +- for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) { +- if (mnt->mnt_flags & fs_infop->flag) +- seq_puts(m, fs_infop->str); ++ seq_putc(m, ' '); ++ for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) { ++ if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) { ++ if (p->set_str) ++ seq_puts(m, p->set_str); ++ } else { ++ if (p->unset_str) ++ seq_puts(m, p->unset_str); ++ } + } + if (mnt->mnt_flags & MNT_XID) + seq_printf(m, ",xid=%d", mnt->mnt_xid); +@@ -684,7 +687,8 @@ out_unlock: + /* + * do loopback mount. + */ +-static int do_loopback(struct nameidata *nd, char *old_name, xid_t xid, int flags) ++static int do_loopback(struct nameidata *nd, char *old_name, ++ xid_t xid, int flags, int mnt_flags) + { + struct nameidata old_nd; + struct vfsmount *mnt = NULL; +@@ -725,6 +729,7 @@ static int do_loopback(struct nameidata + spin_unlock(&vfsmount_lock); + } else + mntput(mnt); ++ mnt->mnt_flags = mnt_flags; + } + + up_write(¤t->namespace->sem); +@@ -1112,12 +1117,18 @@ long do_mount(char * dev_name, char * di + } + + /* Separate the per-mountpoint flags */ ++ if (flags & MS_RDONLY) ++ mnt_flags |= MNT_RDONLY; + if (flags & MS_NOSUID) + mnt_flags |= MNT_NOSUID; + if (flags & MS_NODEV) + mnt_flags |= MNT_NODEV; + if (flags & MS_NOEXEC) + mnt_flags |= MNT_NOEXEC; ++ if (flags & MS_NOATIME) ++ mnt_flags |= MNT_NOATIME; ++ if (flags & MS_NODIRATIME) ++ mnt_flags |= MNT_NODIRATIME; + flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE); + + if (vx_ccaps(VXC_SECURE_MOUNT)) +@@ -1136,7 +1147,7 @@ long do_mount(char * dev_name, char * di + retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, + data_page, xid); + else if (flags & MS_BIND) +- retval = do_loopback(&nd, dev_name, xid, flags); ++ retval = do_loopback(&nd, dev_name, xid, flags, mnt_flags); + else if (flags & MS_MOVE) + retval = do_move_mount(&nd, dev_name); + else +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfs/dir.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfs/dir.c 2005-03-26 00:25:23 +0100 +@@ -773,7 +773,8 @@ static int is_atomic_open(struct inode * + if (nd->flags & LOOKUP_DIRECTORY) + return 0; + /* Are we trying to write to a read only partition? */ +- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) ++ if ((IS_RDONLY(dir) || MNT_IS_RDONLY(nd->mnt)) && ++ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE))) + return 0; + return 1; + } +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c +--- linux-2.6.11.5-vs1.9.5.3/fs/nfsd/vfs.c 2005-03-02 12:38:45 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/nfsd/vfs.c 2005-03-26 00:25:23 +0100 +@@ -1115,13 +1115,13 @@ nfsd_create(struct svc_rqst *rqstp, stru + err = vfs_create(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFDIR: +- err = vfs_mkdir(dirp, dchild, iap->ia_mode); ++ err = vfs_mkdir(dirp, dchild, iap->ia_mode, NULL); + break; + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: +- err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); ++ err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev, NULL); + break; + default: + printk("nfsd: bad file type %o in nfsd_create\n", type); +@@ -1397,11 +1397,13 @@ nfsd_symlink(struct svc_rqst *rqstp, str + else { + strncpy(path_alloced, path, plen); + path_alloced[plen] = 0; +- err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path_alloced, mode, NULL); + kfree(path_alloced); + } + } else +- err = vfs_symlink(dentry->d_inode, dnew, path, mode); ++ err = vfs_symlink(dentry->d_inode, dnew, ++ path, mode, NULL); + + if (!err) { + if (EX_ISSYNC(fhp->fh_export)) +@@ -1459,7 +1461,7 @@ nfsd_link(struct svc_rqst *rqstp, struct + dold = tfhp->fh_dentry; + dest = dold->d_inode; + +- err = vfs_link(dold, dirp, dnew); ++ err = vfs_link(dold, dirp, dnew, NULL); + if (!err) { + if (EX_ISSYNC(ffhp->fh_export)) { + nfsd_sync_dir(ddir); +@@ -1620,9 +1622,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru + err = nfserr_perm; + } else + #endif +- err = vfs_unlink(dirp, rdentry); ++ err = vfs_unlink(dirp, rdentry, NULL); + } else { /* It's RMDIR */ +- err = vfs_rmdir(dirp, rdentry); ++ err = vfs_rmdir(dirp, rdentry, NULL); + } + + dput(rdentry); +@@ -1734,7 +1736,8 @@ nfsd_permission(struct svc_export *exp, + */ + if (!(acc & MAY_LOCAL_ACCESS)) + if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) { +- if (EX_RDONLY(exp) || IS_RDONLY(inode)) ++ if (EX_RDONLY(exp) || IS_RDONLY(inode) ++ || MNT_IS_RDONLY(exp->ex_mnt)) + return nfserr_rofs; + if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode)) + return nfserr_perm; +diff -NurpP --minimal linux-2.6.11.5-vs1.9.5.3/fs/open.c linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c +--- linux-2.6.11.5-vs1.9.5.3/fs/open.c 2005-03-23 21:34:32 +0100 ++++ linux-2.6.11.5-vs1.9.5.3-bme0.06.1/fs/open.c 2005-03-26 00:25:24 +0100 +@@ -244,7 +244,7 @@ static inline long do_sys_truncate(const + goto dput_and_out; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + error = -EPERM; +@@ -368,7 +368,7 @@ asmlinkage long sys_utime(char __user * + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + + /* Don't worry, the checks are done in inode_change_ok() */ +@@ -425,7 +425,7 @@ long do_utimes(char __user * filename, s + inode = nd.dentry->d_inode; + + error = -EROFS; +- if (IS_RDONLY(inode)) ++ if (IS_RDONLY(inode) || MNT_IS_RDONLY(nd.mnt)) + goto dput_and_out; + <> From baggins at pld-linux.org Tue Aug 23 15:35:46 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: pam-allow_root_ttyS0.patch (REMOVED), pam-fPIC.patch (REM... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:35:46 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: pam-allow_root_ttyS0.patch (1.1 -> NONE) (REMOVED), pam-fPIC.patch (1.4 -> NONE) (REMOVED), pam-gcc4.patch (1.1 -> NONE) (REMOVED), pam-mail.patch (1.3 -> NONE) (REMOVED), pam-noinstalled.patch (1.1 -> NONE) (REMOVED), pam-selinux-1.patch (1.17 -> NONE) (REMOVED), pam-selinux.patch (1.1 -> NONE) (REMOVED), pam-tcpd-severity.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 15:42:37 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: lvm2.spec - no spaces in bconds In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 13:42:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - no spaces in bconds ---- Files affected: SPECS: lvm2.spec (1.59 -> 1.60) ---- Diffs: ================================================================ Index: SPECS/lvm2.spec diff -u SPECS/lvm2.spec:1.59 SPECS/lvm2.spec:1.60 --- SPECS/lvm2.spec:1.59 Wed Aug 10 00:06:29 2005 +++ SPECS/lvm2.spec Tue Aug 23 15:42:32 2005 @@ -39,7 +39,7 @@ BuildRequires: readline-devel Requires: device-mapper Requires: dlm >= 1.0-0.pre21.2 -%{?with_clvmd: Requires: gulm >= 1.0-0.pre26.2} +%{?with_clvmd:Requires: gulm >= 1.0-0.pre26.2} %{?with_selinux:Requires: libselinux >= 1.10} Obsoletes: lvm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -160,6 +160,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.60 2005/08/23 13:42:32 baggins +- no spaces in bconds + Revision 1.59 2005/08/09 22:06:29 areq - fix Requires without clvmd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lvm2.spec?r1=1.59&r2=1.60&f=u From romke at pld-linux.org Tue Aug 23 15:48:43 2005 From: romke at pld-linux.org (romke) Date: Tue Dec 20 10:39:31 2005 Subject: PLDWWW: FrontPage Message-ID: <20050823134843.3441.32436@korupcja.pld-linux.org> Author: romke Date: Tue Aug 23 13:48:43 2005 GMT Module: PLDWWW URL: http://www.pld-linux.org/FrontPage ---- Log message: News PLD Mugs ---- Page affected: FrontPage ---- Diffs: ================================================================ PLD is a free, RPM-based Linux distribution, aimed at the more advanced users and administrators, who accept the tradeoffs of using a system, that might require manual tweaking in exchange for much flexibility. Simultaneous support for a wide variety of architectures and non-conservative approach to RPM usage provides our users with a consistent environment on almost all available architectures. More details are available in the [:About:about] section. == News == + + === 23 August 2005 PLD Mugs === + We are preparing 360ml (12 1/4 oz) frosted glass mugs with PLD logo - [http://wojtaszek.name/kubki/ sign up for one]! === 6 July 2005 Forum back up === After a (too) long period of downtime, our [http://forum.pld-linux.org/ web forum] is again available. Unfortunately we're starting from zero, since the old data got definitively lost, so users need to reregister. We're sorry for the inconvenience and hope that everyone will find the new functionality useful. The forum currently looks raw, but that should change in the near future. From kosmo at pld-linux.org Tue Aug 23 16:01:51 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES: web-cyradm-locale.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:01:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-locale.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u /dev/null SOURCES/web-cyradm-locale.patch:1.1 --- /dev/null Tue Aug 23 16:01:50 2005 +++ SOURCES/web-cyradm-locale.patch Tue Aug 23 16:01:43 2005 @@ -0,0 +1,13 @@ +diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php +--- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 ++++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 +@@ -70,9 +70,6 @@ + putenv("LANG=" . $LANG); + putenv("LANGUAGE=" . $LANG); + +- // Specify location of translation tables +- bindtextdomain("web-cyradm", "./locale"); +- + // Choose domain + textdomain("web-cyradm"); + require_once WC_BASE . "/session.php"; ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:20 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: web-cyradm.spec (NEW) - initial release. In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 14:02:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial release. ---- Files affected: SPECS: web-cyradm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u /dev/null SPECS/web-cyradm.spec:1.1 --- /dev/null Tue Aug 23 16:02:20 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 16:02:14 2005 @@ -0,0 +1,136 @@ +# $Revision$, $Date$ +# +# TODO: +# - R: & BR: +# - better /etc/httpd/web-cyradm.conf +# - many more +# +%define version_major 0.5.4 +%define version_minor 1 +# +Summary: Cyrus-IMAP based mail accounts managment system. +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Name: web-cyradm +Version: %{version_major}.%{version_minor} +Release: 0.1 +Epoch: 0 +License: GPL +Group: Applications +Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Patch0: %{name}-locale.patch +# Source0-md5: d06dc16899680c29b94a5460709b5fe0 +URL: http://www.web-cyradm.org/ +Requires: mysql +Requires: webserver +Requires: php +Requires: php-gettext +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Web-cyradm is a software that glues topnotch mailing technologies +together. The software on which web-cyradm relies on is completely +free and opensource software. Web-cyradm is continously developed +further to expand its functionality and usability. + +Features: + - Administer multiple virtual domains + - Manage user-accounts + - Map useraccounts to emailadresses + - Create, delete and rename cyrus-imap mailboxes + - Setting of quotas for users and domains + - Delegation of some tasks to domain adminstrators + - Resetting password for accountusers by its domainadmins + and superusers + - Sieve functions like forwarding single e-mail adresses + and out-of-office replies + - Enable/Disable different services like imap, pop, sieve and stmp + for particular users + - Support for MySQL and PostgreSQL databases + - Storing passwords in crypt, md5 or MySQL passwd compatible format + +%description -l pl +Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Source w jeden du?y system pocztowy. + +Mo?liwo?ci: + - Administracja wieloma wirtualnymu domenami + - Zarz?dzanie kontami urzytkownik?w + - Mapowanie kont urzytkownik?w na adresy e-mail + - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Delegacja zada? do administrator?w domen + - Resetowanie hase? u?ytkownikom przez administrator?w domen + - Filtry poczty Sieve + - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w + - Wsparcie dla MySQL'a i PostgreSQL'a + - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() + +%prep +%setup -q -n %{name}-%{version_major}-%{version_minor} +%patch0 -p1 + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},httpd} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} +install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} + +install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf + +install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} +install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css +install images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images +install lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lib + +ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/config + +for i in locale/?? locale/??_??; do + install -d $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES + install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES +done + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi +fi + +%preun +if [ "$1" = "0" ]; then + umask 027 + if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then + rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf + + if [ -f /var/lock/subsys/httpd ]; then + %service httpd restart + fi + fi +fi + +%files -f %{name}.lang +%defattr(644,root,root,755) +%doc ChangeLog COPYRIGHT INSTALL README README.translations TO-BE-DONE migrate.php-dist doc/* scripts +%dir %{_sysconfdir}/%{name} +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%{_datadir}/%{name} + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/23 14:02:14 kosmo +- initial release. + ================================================================ From kosmo at pld-linux.org Tue Aug 23 16:02:18 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: web-cyradm-0.5.4-1.tar.gz Message-ID: <15611.1124805738@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.web-cyradm.org/web-cyradm-0.5.4-1.tar.gz d06dc16899680c29b94a5460709b5fe0 web-cyradm-0.5.4-1.tar.gz Size: 455900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:35:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): dbus.spec, gnome-system-tools.spec, gnome-vfs2.spec... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:35:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: ---- Files affected: SPECS: dbus.spec (1.90 -> 1.91) , gnome-system-tools.spec (1.46.2.3 -> 1.46.2.4) , gnome-vfs2.spec (1.157.2.10 -> 1.157.2.11) , gnome-volume-manager.spec (1.28 -> 1.29) , hal.spec (1.79 -> 1.80) , mlview.spec (1.34 -> 1.35) , streamtuner.spec (1.11 -> 1.12) , sylpheed.spec (1.167.2.1 -> 1.167.2.2) , system-tools-backends.spec (1.7.2.3 -> 1.7.2.4) ---- Diffs: ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ cvs [rdiff aborted]: cannot get working directory: No such file or directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.90&r2=1.91&f=u http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.3&r2=1.46.2.4&f=u http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.10&r2=1.157.2.11&f=u http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.28&r2=1.29&f=u http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.79&r2=1.80&f=u http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.34&r2=1.35&f=u http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.1&r2=1.167.2.2&f=u http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.3&r2=1.7.2.4&f=u From paladine at pld-linux.org Tue Aug 23 16:35:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: gnome-system-tools-1.3.92.tar.bz2 Message-ID: <3195.1124807735@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/gnome-system-tools-1.3.92.tar.bz2 c51a1867e130d5cdb0e389be59867a83 gnome-system-tools-1.3.92.tar.bz2 Size: 1957351 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 16:37:00 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: eclipse-plugin-ajdt.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:37:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: eclipse-plugin-ajdt.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-ajdt.spec diff -u SPECS/eclipse-plugin-ajdt.spec:1.4 SPECS/eclipse-plugin-ajdt.spec:1.5 --- SPECS/eclipse-plugin-ajdt.spec:1.4 Wed Dec 1 16:21:39 2004 +++ SPECS/eclipse-plugin-ajdt.spec Tue Aug 23 16:36:55 2005 @@ -2,19 +2,19 @@ Summary: AJDT - aspectJ development tools Summary(pl): AJDT - narz?dzia programistyczne aspectJ Name: eclipse-plugin-ajdt -Version: 1.1.12 +Version: 1.3.0 Release: 1 License: CPL v0.5 Group: Development/Languages -Source0: http://download.eclipse.org/technology/ajdt/30/update/ajdt_%{version}_archive.zip -# Source0-md5: 80a9fcbdb18d5ca46340c011cf28f45a +Source0: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_%{version}.20050823115355_archive.zip +# Source0-md5: ae776fad1db899469c8a1aee9a5de752 URL: http://www.eclipse.org/ajdt/ BuildRequires: unzip -Requires: eclipse >= 3.0 +Requires: eclipse >= 3.1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _eclipsedir %{_datadir}/eclipse +%define _eclipsedir %{_libdir}/eclipse %description The AspectJ Development Tools (AJDT) project provides Eclipse platform @@ -40,8 +40,8 @@ %files %defattr(644,root,root,755) -%{_eclipsedir}/features/* -%{_eclipsedir}/plugins/* +%{_libdir}/eclipse/features/* +%{_libdir}/eclipse/plugins/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -49,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 14:36:55 pawcioos +- updated to 1.3.0 + Revision 1.4 2004/12/01 15:21:39 zbyniu - BR: unzip ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-ajdt.spec?r1=1.4&r2=1.5&f=u From pawcioos at pld-linux.org Tue Aug 23 16:38:20 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated to 3.0.0 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 14:38:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.0 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.13 SPECS/eclipse-plugin-cdt.spec:1.14 --- SPECS/eclipse-plugin-cdt.spec:1.13 Fri Jul 1 22:54:44 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 16:38:15 2005 @@ -28,31 +28,30 @@ %endif %endif -%define _rc RC1 Summary: CDT - a set of plugins for Eclipse that implement a C/C++ IDE Summary(pl): CDT - zestaw wtyczek do ?rodowiska Eclipse implementuj?cy IDE C/C++ Name: eclipse-plugin-cdt %define _ver_major 3.0 %define _ver_minor 0 Version: %{_ver_major}.%{_ver_minor} -Release: 0.%{_rc}.1 +Release: 0.1 License: CPL v1.0 Group: Development/Languages %if %{need_x86} -Source0: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86.tar.gz -# Source0-md5: 454b6e0279c83fd209d6ac839a459134 +Source0: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86.tar.gz +# Source0-md5: fd578bf9bcbcd89cdbf1480e792a5506 %endif %if %{need_ppc} -Source1: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ppc.tar.gz -# Source1-md5: 1e5e716bf6f0bfd56139c706d344142a +Source1: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ppc.tar.gz +# Source1-md5: 92e83865c079406a231114f3fea74aa0 %endif %if %{need_ia64} -Source2: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.ia64.tar.gz +Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz # Source2-md5: 80ba477131beb0c0682019a7705b1cfe %endif %if %{need_x8664} -Source3: http://download.eclipse.org/tools/cdt/builds/%{version}/%{_rc}/org.eclipse.cdt-%{version}-%{_rc}-linux.x86_64.tar.gz -# Source3-md5: 7d8e6c97e9a8055b0823292064f71dbd +Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz +# Source3-md5: 05f7bdaba4eb8fa0ac07c62c722a6f65 %endif URL: http://www.eclipse.org/cdt/ BuildRequires: unzip @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/23 14:38:15 pawcioos +- updated to 3.0.0 + Revision 1.13 2005/07/01 20:54:44 qboosh - incall enabled by default - updated ia64 md5 as well ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.13&r2=1.14&f=u From paladine at pld-linux.org Tue Aug 23 16:39:38 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: dbus.spec - added missing commit log - added BR: libselinux... In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:39:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log - added BR: libselinux-devel ---- Files affected: SPECS: dbus.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.91 SPECS/dbus.spec:1.92 --- SPECS/dbus.spec:1.91 Tue Aug 23 16:35:14 2005 +++ SPECS/dbus.spec Tue Aug 23 16:39:33 2005 @@ -61,6 +61,7 @@ %{?with_qt:BuildRequires: qt-devel >= %{qt_version}} BuildRequires: rpmbuild(macros) >= 1.202 BuildRequires: sed >= 4.0 +BuildRequires: libselinux-devel >= 1.17.13 BuildRequires: xmlto PreReq: rc-scripts Requires: %{name}-libs = %{version}-%{release} @@ -344,7 +345,6 @@ --with-system-pid-file=%{_localstatedir}/run/dbus.pid \ --with-system-socket=%{_localstatedir}/lib/dbus-1/system_bus_socket \ --enable-selinux - %{__make} \ pythondir=%{py_sitedir} @@ -546,8 +546,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.92 2005/08/23 14:39:33 paladine +- added missing commit log +- added BR: libselinux-devel + Revision 1.91 2005/08/23 14:35:14 paladine -*** empty log message *** +- added --enable-selinux to configure Revision 1.90 2005/08/02 16:18:30 jpc - add a patch fixing the dbus serializer type definitions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.91&r2=1.92&f=u From paladine at pld-linux.org Tue Aug 23 16:50:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:50:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.4 -> 1.46.2.5) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.4 SPECS/gnome-system-tools.spec:1.46.2.5 --- SPECS/gnome-system-tools.spec:1.46.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-system-tools.spec Tue Aug 23 16:50:22 2005 @@ -114,8 +114,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.5 2005/08/23 14:50:22 paladine +- added missing commit log + Revision 1.46.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- use more macros +- sorted files Revision 1.46.2.3 2005/08/18 11:03:33 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.4&r2=1.46.2.5&f=u From paladine at pld-linux.org Tue Aug 23 16:52:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:52:00 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.11 -> 1.157.2.12) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.11 SPECS/gnome-vfs2.spec:1.157.2.12 --- SPECS/gnome-vfs2.spec:1.157.2.11 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-vfs2.spec Tue Aug 23 16:51:55 2005 @@ -195,8 +195,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.12 2005/08/23 14:51:55 paladine +- added missing commit log + Revision 1.157.2.11 2005/08/23 14:35:15 paladine -*** empty log message *** +- itemize schemas Revision 1.157.2.10 2005/08/14 09:28:25 freetz - dropped patches: resolve_fstab_symlinks, user_visible_drives, get_volume_ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.11&r2=1.157.2.12&f=u From pawcioos at pld-linux.org Tue Aug 23 16:54:15 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: ajdt_1.3.0.20050823115355_archive.zip Message-ID: <4210.1124808855@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.eclipse.org/technology/ajdt/31/dev/update/ajdt_1.3.0.20050823115355_archive.zip ae776fad1db899469c8a1aee9a5de752 ajdt_1.3.0.20050823115355_archive.zip Size: 15684941 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 16:56:02 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: gnome-volume-manager.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:56:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: gnome-volume-manager.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.29 SPECS/gnome-volume-manager.spec:1.30 --- SPECS/gnome-volume-manager.spec:1.29 Tue Aug 23 16:35:15 2005 +++ SPECS/gnome-volume-manager.spec Tue Aug 23 16:55:56 2005 @@ -96,8 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 14:55:56 paladine +- added missing commit log + Revision 1.29 2005/08/23 14:35:15 paladine -*** empty log message *** +- unpmountize +- itemize schemas Revision 1.28 2005/08/04 18:02:39 freetz - R: eject for CD volumes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Tue Aug 23 16:58:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: hal.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: hal.spec (1.80 -> 1.81) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.80 SPECS/hal.spec:1.81 --- SPECS/hal.spec:1.80 Tue Aug 23 16:35:15 2005 +++ SPECS/hal.spec Tue Aug 23 16:58:25 2005 @@ -230,8 +230,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.81 2005/08/23 14:58:25 paladine +- added missing commit log + Revision 1.80 2005/08/23 14:35:15 paladine -*** empty log message *** +- back to fstab-sync +- enable verbose-mode Revision 1.79 2005/08/07 19:52:44 freetz - changelog typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.80&r2=1.81&f=u From paladine at pld-linux.org Tue Aug 23 17:00:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: mlview.spec - reverted accidental commit In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:00:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted accidental commit ---- Files affected: SPECS: mlview.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/mlview.spec diff -u SPECS/mlview.spec:1.35 SPECS/mlview.spec:1.36 --- SPECS/mlview.spec:1.35 Tue Aug 23 16:35:15 2005 +++ SPECS/mlview.spec Tue Aug 23 17:00:44 2005 @@ -2,36 +2,30 @@ Summary: XML Editor for GNOME Summary(pl): Edytor XML-a dla GNOME Name: mlview -Version: 0.9.0 -Release: 1 +Version: 0.7.1 +Release: 2 License: GPL Group: X11/Applications/Editors -Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.9/%{name}-%{version}.tar.bz2 -# Source0-md5: eb3722950af8d78556b197f23870adba +Source0: http://ftp.gnome.org/pub/gnome/sources/mlview/0.7/%{name}-%{version}.tar.bz2 +# Source0-md5: 85383331e5bb6d59293cee5b86595284 Patch0: %{name}-locale-names.patch Patch1: %{name}-desktop.patch URL: http://www.freespiders.org/projects/gmlview/ BuildRequires: GConf2-devel >= 2.10.0 -BuildRequires: autoconf >= 2.59 +BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: dbus-devel >= 0.22 BuildRequires: eel-devel >= 2.10.0 BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.8.0 -BuildRequires: gnome-vfs2-devel >= 2.6.0 BuildRequires: gtk+2-devel >= 2:2.6.4 -BuildRequires: gktmm-devel >= 2.4.0 -BuildRequires: gktsourceview-devel >= 1.0.0 BuildRequires: intltool >= 0.33 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libglademm-devel >= 2.4.0 BuildRequires: libgnome-devel >= 2.10.0-2 -BuildRequires: libgnomeui-devel >= 2.2.0 +#BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libtool BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt >= 1.1.14 BuildRequires: rpmbuild(macros) >= 1.197 -BuildRequires: vte-devel >= 0.11.12 Requires(post): /sbin/ldconfig Requires(post,preun): GConf2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -107,8 +101,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ -Revision 1.35 2005/08/23 14:35:15 paladine -*** empty log message *** +Revision 1.36 2005/08/23 15:00:44 paladine +- reverted accidental commit Revision 1.34 2005/04/18 10:22:51 paladine - no ldconfig_post{,un} macros, use %%postun -p ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mlview.spec?r1=1.35&r2=1.36&f=u From paladine at pld-linux.org Tue Aug 23 17:02:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: streamtuner.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:02:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added missing commit log ---- Files affected: SPECS: streamtuner.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/streamtuner.spec diff -u SPECS/streamtuner.spec:1.12 SPECS/streamtuner.spec:1.13 --- SPECS/streamtuner.spec:1.12 Tue Aug 23 16:35:15 2005 +++ SPECS/streamtuner.spec Tue Aug 23 17:02:37 2005 @@ -224,8 +224,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 15:02:37 paladine +- added missing commit log + Revision 1.12 2005/08/23 14:35:15 paladine -*** empty log message *** +- removed todo +- works for me, rel. 1 Revision 1.11 2005/02/18 21:48:43 qboosh - missing defattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/streamtuner.spec?r1=1.12&r2=1.13&f=u From paladine at pld-linux.org Tue Aug 23 17:05:52 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: system-tools-backends-1.3.92.tar.bz2 Message-ID: <22092.1124809552@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/1.3/system-tools-backends-1.3.92.tar.bz2 fac8b7604603690e3e171086e42ba75b system-tools-backends-1.3.92.tar.bz2 Size: 705920 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Tue Aug 23 17:05:51 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): system-tools-backends.spec - added missing commit log In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:05:51 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added missing commit log ---- Files affected: SPECS: system-tools-backends.spec (1.7.2.4 -> 1.7.2.5) ---- Diffs: ================================================================ Index: SPECS/system-tools-backends.spec diff -u SPECS/system-tools-backends.spec:1.7.2.4 SPECS/system-tools-backends.spec:1.7.2.5 --- SPECS/system-tools-backends.spec:1.7.2.4 Tue Aug 23 16:35:15 2005 +++ SPECS/system-tools-backends.spec Tue Aug 23 17:05:46 2005 @@ -61,8 +61,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7.2.5 2005/08/23 15:05:46 paladine +- added missing commit log + Revision 1.7.2.4 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 1.3.92 +- sorted %%files Revision 1.7.2.3 2005/08/09 11:52:46 aflinta - up to version 1.3.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/system-tools-backends.spec?r1=1.7.2.4&r2=1.7.2.5&f=u From paladine at pld-linux.org Tue Aug 23 17:07:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS (DEVEL): sylpheed.spec - updated to 2.1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Tue Aug 23 15:07:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.1.1 ---- Files affected: SPECS: sylpheed.spec (1.167.2.2 -> 1.167.2.3) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167.2.2 SPECS/sylpheed.spec:1.167.2.3 --- SPECS/sylpheed.spec:1.167.2.2 Tue Aug 23 16:35:15 2005 +++ SPECS/sylpheed.spec Tue Aug 23 17:07:26 2005 @@ -139,8 +139,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.167.2.3 2005/08/23 15:07:26 paladine +- updated to 2.1.1 + Revision 1.167.2.2 2005/08/23 14:35:15 paladine -*** empty log message *** +- updated to 2.1.1 Revision 1.167.2.1 2005/08/14 18:31:50 freetz - starting developement on 2.1.x unstable series ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167.2.2&r2=1.167.2.3&f=u From paladine at pld-linux.org Tue Aug 23 17:07:42 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: sylpheed-2.1.1.tar.bz2 Message-ID: <22913.1124809662@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.1/sylpheed-2.1.1.tar.bz2 422db3499bec693f53673cf97f6ebb0c sylpheed-2.1.1.tar.bz2 Size: 2323547 bytes -- Virtually Yours: distfiles. From pawcioos at pld-linux.org Tue Aug 23 17:27:53 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: ERRORS: org.eclipse.cdt-3.0.0-linux.x86.tar.gz org.eclipse.cdt-3.0.0-linux.ppc.tar.gz org.eclipse.cdt-3.0.0-linux.ia64.tar.gz org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Message-ID: <4975.1124810873@distfiles.pld-linux.org> FATAL: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ia64.tar.gz md5 mismatch, needed 80ba477131beb0c0682019a7705b1cfe, got ee07f4d21c3785e7d3b2b40b4669def0 Files fetched: 3 STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86.tar.gz fd578bf9bcbcd89cdbf1480e792a5506 org.eclipse.cdt-3.0.0-linux.x86.tar.gz Size: 11946636 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.ppc.tar.gz 92e83865c079406a231114f3fea74aa0 org.eclipse.cdt-3.0.0-linux.ppc.tar.gz Size: 11949813 bytes STORED: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/3.0.0/org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz 05f7bdaba4eb8fa0ac07c62c722a6f65 org.eclipse.cdt-3.0.0-linux.x86_64.tar.gz Size: 11946896 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 17:59:17 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:31 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-vs2.patch - fix for removed fbsplash In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 15:59:17 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix for removed fbsplash ---- Files affected: SOURCES: linux-2.6-vs2.patch (1.1.2.6 -> 1.1.2.7) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-vs2.patch diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.6 SOURCES/linux-2.6-vs2.patch:1.1.2.7 --- SOURCES/linux-2.6-vs2.patch:1.1.2.6 Sun Aug 7 02:14:10 2005 +++ SOURCES/linux-2.6-vs2.patch Tue Aug 23 17:59:11 2005 @@ -7572,10 +7572,10 @@ --- linux-2.6.12.3/include/linux/sysctl.h 2005-06-22 02:38:52 +0200 +++ linux-2.6.12.3-vs2.0-rc9/include/linux/sysctl.h 2005-08-01 10:32:45 +0200 @@ -136,6 +136,7 @@ enum + KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */ KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ KERN_RANDOMIZE=68, /* int: randomize virtual address space */ - KERN_FBSPLASH=69, /* string: path to fbsplash helper */ -+ KERN_VSHELPER=70, /* string: path to vshelper policy agent */ ++ KERN_VSHELPER=69, /* string: path to vshelper policy agent */ }; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.patch?r1=1.1.2.6&r2=1.1.2.7&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:42 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 10:39:31 2005 Subject: SPECS: lms.spec - up to 1.6.3 (security update) In-Reply-To: References: Message-ID: Author: dzeus Date: Tue Aug 23 16:21:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.3 (security update) ---- Files affected: SPECS: lms.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/lms.spec diff -u SPECS/lms.spec:1.62 SPECS/lms.spec:1.63 --- SPECS/lms.spec:1.62 Thu Aug 11 17:20:59 2005 +++ SPECS/lms.spec Tue Aug 23 18:21:32 2005 @@ -8,17 +8,17 @@ # - cosmetics (sort in %%files and %%install) # - contrib split %define lmsver 1.6 -%define lmssubver 2 +%define lmssubver 3 Summary: LAN Managment System Summary(pl): System Zarz?dzania Sieci? Lokaln? Name: lms Version: %{lmsver}.%{lmssubver} -Release: 0.1 +Release: 1 License: GPL Vendor: LMS Developers Group: Networking/Utilities Source0: http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz -# Source0-md5: 36700215ccdb81674d183b7531d1a00c +# Source0-md5: 07619fbe576c6801fdb82d5a73fbb1ae Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig @@ -318,6 +318,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/23 16:21:32 dzeus +- up to 1.6.3 (security update) + Revision 1.62 2005/08/11 15:20:59 dzeus - up to 1.6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lms.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Tue Aug 23 18:21:51 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 10:39:31 2005 Subject: DISTFILES: lms-1.6.3.tar.gz Message-ID: <1322.1124814111@distfiles.pld-linux.org> Files fetched: 1 STORED: http://lms.rulez.pl/download/1.6/lms-1.6.3.tar.gz 07619fbe576c6801fdb82d5a73fbb1ae lms-1.6.3.tar.gz Size: 1980733 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Tue Aug 23 18:26:57 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:31 2005 Subject: rc-scripts/trunk/rc.d/init.d/network Message-ID: <6327@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:26:48 2005 New Revision: 6327 Modified: rc-scripts/trunk/rc.d/init.d/network Log: [a-z] doesn't always mean whole alphabet (for example et_EE locale). Use C locale when searching. (Patch by Elan Ruusam?e) Modified: rc-scripts/trunk/rc.d/init.d/network ============================================================================== --- rc-scripts/trunk/rc.d/init.d/network (original) +++ rc-scripts/trunk/rc.d/init.d/network Tue Aug 23 18:26:48 2005 @@ -134,7 +134,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -143,7 +143,7 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep 'ifcfg-(.*)\.(.*)' | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -151,7 +151,7 @@ interfaces_br_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-br* | \ - egrep 'ifcfg-[a-z0-9\.]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -159,7 +159,7 @@ interfaces_sit_boot=$(( . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg-sit* | \ - egrep 'ifcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'ifcfg-[a-z0-9]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ @@ -167,7 +167,7 @@ fi tunnels=$((cd /etc/sysconfig/interfaces && ls -1 tnlcfg-* | \ xargs egrep -l "ONBOOT=[^n][^o]" | \ - egrep 'tnlcfg-[a-z0-9]+$' | \ + LC_ALL=C egrep 'tnlcfg-[a-z0-9]+$' | \ awk ' { gsub(/tnlcfg-/,NIL); print $0 } ') 2> /dev/null) # See how we were called. From cvs at pld-linux.org Tue Aug 23 18:28:27 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:31 2005 Subject: rc-scripts/trunk/inittab Message-ID: <6328@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:28:24 2005 New Revision: 6328 Modified: rc-scripts/trunk/inittab Log: Example for agetty on serial port. Modified: rc-scripts/trunk/inittab ============================================================================== --- rc-scripts/trunk/inittab (original) +++ rc-scripts/trunk/inittab Tue Aug 23 18:28:24 2005 @@ -45,6 +45,8 @@ # If power was restored before the shutdown kicked in, cancel it. pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" +# Run agetty on serial port +# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels 1:12345:respawn:/sbin/mingetty --noclear tty1 From cvs at pld-linux.org Tue Aug 23 18:29:41 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:31 2005 Subject: rc-scripts/trunk/sysconfig/interfaces: data/chat-ppp0.gprs-plusgsm ifcfg-ppp0.gprs-plusgsm Message-ID: <6329@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:29:35 2005 New Revision: 6329 Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Log: Fixed PlusGSM examples. (Patch by Pawe? Go?aszewski) Modified: rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -1,6 +1,9 @@ -ABORT BUSY -ABORT ERROR +ABORT "BUSY" +ABORT "ERROR" ABORT "NO CARRIER" +ABORT "NO DIALTONE" +ABORT "NO ANSWER" +ABORT "Username/Password Incorrect" "" AT -OK-AT-OK ATD"$PHONE" +OK-AT-OK ATDT"$PHONE" CONNECT Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm ============================================================================== --- rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm (original) +++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm Tue Aug 23 18:29:35 2005 @@ -16,8 +16,8 @@ #ACTIVEFILTER= #IDLE= PHONE='*99***1#' -USER=ppp -PASSWORD=ppp +USER=plusgsm +PASSWORD=plusgsm #INITSTRING=ATe0s2=255 DATAFORCHAT="USER PASSWORD INITSTRING PHONE" From cvs at pld-linux.org Tue Aug 23 18:32:52 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: rc-scripts/trunk: ChangeLog configure.ac Message-ID: <6330@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:32:43 2005 New Revision: 6330 Modified: rc-scripts/trunk/ChangeLog rc-scripts/trunk/configure.ac Log: Update for 0.4.0.20. Modified: rc-scripts/trunk/ChangeLog ============================================================================== --- rc-scripts/trunk/ChangeLog (original) +++ rc-scripts/trunk/ChangeLog Tue Aug 23 18:32:43 2005 @@ -1,3 +1,115 @@ +2005-08-23 16:29 +0000 [r6327-6329] Arkadiusz Mi?kiewicz + + * sysconfig/interfaces/ifcfg-ppp0.gprs-plusgsm, + sysconfig/interfaces/data/chat-ppp0.gprs-plusgsm: Fixed PlusGSM + examples. (Patch by Pawe? Go?aszewski) + + * inittab: Example for agetty on serial port. + + * rc.d/init.d/network: [a-z] doesn't always mean whole alphabet + (for example et_EE locale). Use C locale when searching. (Patch + by Elan Ruusam?e) + +2005-08-15 22:45 +0000 [r6315] Jan R?korajski + + * rc.d/init.d/cpusets: - don't spew errors on stdout - inform about + failurse + +2005-08-14 18:32 +0000 [r6311] Tomasz Wittner + + * DEVELOPMENT: - typo in enumeration + +2005-08-13 23:06 +0000 [r6307-6310] Jan R?korajski + + * rc.d/init.d/cpusets: - added echo for better status readability + + * rc.d/init.d/cpusets: - properly test cpuset dir for status + display + + * rc.d/init.d/cpusets: - properly escape message + + * rc.d/init.d/cpusets: - use show() when creating/removing cpusets + +2005-08-13 22:58 +0000 [r6306] Jan R?korajski + + * rc.d/init.d/cpusets: - typo + +2005-08-13 22:34 +0000 [r6305] Jan R?korajski + + * rc.d/init.d/functions: - take CPUSETS setting into account + +2005-08-13 22:00 +0000 [r6304] Jan R?korajski + + * rc.d/rc.sysinit: - mount cpuset filesystem if kernel capable + +2005-08-11 17:43 +0000 [r6300] Jan R?korajski + + * doc/sysconfig.txt, doc/sysconfig.docb: - added description for + available per-service settings + +2005-08-11 17:11 +0000 [r6299] Jan R?korajski + + * rc-scripts.spec.in: - cpusets added + +2005-08-11 17:04 +0000 [r6297-6298] Jan R?korajski + + * rc.d/init.d/Makefile.am: - cpusets script added + + * configure.ac: - sysconfig/cpusets/Makefile added + +2005-08-11 16:58 +0000 [r6294-6296] Jan R?korajski + + * po/pl.po: - final touch + + * po/pl.po: - updated + + * rc.d/init.d/functions: - added some code for completness + +2005-08-11 16:36 +0000 [r6293] Jan R?korajski + + * rc.d/init.d/cpusets: - defile cpuset settings as local in + function + +2005-08-11 16:35 +0000 [r6292] Arkadiusz Mi?kiewicz + + * rc.d/init.d/functions: filter_chroot(): Do not filter pids for + processes that no longer exists. We don't know whether these were + from current (ch)root so we assume that they were. + +2005-08-11 16:23 +0000 [r6291] Jan R?korajski + + * rc.d/init.d/functions: - added cpuset support to daemon and + status functions + +2005-08-10 20:10 +0000 [r6290] Jan R?korajski + + * sysconfig/system, sysconfig/cpusets/cpuset-test (added), + sysconfig/Makefile.am, rc.d/init.d/cpusets (added), + sysconfig/cpusets/Makefile.am (added): - CPUSETS support (work in + progress) + +2005-08-10 19:49 +0000 [r6289] Jan R?korajski + + * sysconfig/cpusets (added): - a place for cpusets config files + +2005-08-08 21:53 +0000 [r6288] Andrzej Dopiera?a + + * rc.d/init.d/network: - get only tnlcfg-name, not tnlcfg-name~ + +2005-07-27 09:09 +0000 [r6229] Arkadiusz Mi?kiewicz + + * sysconfig/network-scripts/ifup: ifup: Handle special + pcmcia-hotplug case. + +2005-07-21 22:35 +0000 [r6226] Andrzej Dopiera?a + + * rc.d/init.d/network: - first up bridge, next tunnels (tunnels can + be on bridges) - first down tunnels, next bridge ;) + +2005-05-30 18:54 +0000 [r6028] Arkadiusz Mi?kiewicz + + * configure.ac: Release 0.4.0.19. + 2005-05-30 18:47 +0000 [r6027] Arkadiusz Mi?kiewicz * sysconfig/network-scripts/ifup: Understand BOOTPROTO=static Modified: rc-scripts/trunk/configure.ac ============================================================================== --- rc-scripts/trunk/configure.ac (original) +++ rc-scripts/trunk/configure.ac Tue Aug 23 18:32:43 2005 @@ -1,6 +1,6 @@ dnl $Id$ -AC_INIT(["rc-scripts"], [0.4.0.19], [pld-rc-scripts@pld-linux.org], [rc-scripts]) +AC_INIT(["rc-scripts"], [0.4.0.20], [pld-rc-scripts@pld-linux.org], [rc-scripts]) AM_INIT_AUTOMAKE ALL_LINGUAS="pl de" From cvs at pld-linux.org Tue Aug 23 18:33:37 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: rc-scripts/tags/0.4.0.20 Message-ID: <6331@svn.pld-linux.org> Author: arekm Date: Tue Aug 23 18:33:34 2005 New Revision: 6331 Added: rc-scripts/tags/0.4.0.20/ - copied from rev 6330, rc-scripts/trunk/ Log: Released 0.4.0.20. From glen at pld-linux.org Tue Aug 23 18:45:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - use non-expanding heredoc redirecti... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:45:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use non-expanding heredoc redirection for readiness ---- Files affected: SPECS: macromedia-flash.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.24 SPECS/macromedia-flash.spec:1.25 --- SPECS/macromedia-flash.spec:1.24 Fri Jan 21 23:21:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:45:34 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla}.1 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -82,38 +82,37 @@ %if ! %{with license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install +cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install #!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/%{base_name}.spec ]; then BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev + mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" else - cp -f "\$3" . + cp -f "$3" . fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 + cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 else - cp -i "\$3" \$SPECDIR || exit 1 + cp -i "$3" $SPECDIR || exit 1 fi - ( cd \$SPECDIR + ( cd $SPECDIR %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then + if [ "$?" -ne 0 ]; then exit 2 fi RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm @@ -121,28 +120,27 @@ RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm RPMNAMES= if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=\$RPMDIR/\$RPMNAME1 - echo "Installing \$RPMNAME1" + RPMNAMES=$RPMDIR/$RPMNAME1 + echo "Installing $RPMNAME1" else - echo "Not installing \$RPMNAME1" + echo "Not installing $RPMNAME1" fi if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" + echo "Installing $RPMNAME2" else - echo "Not installing \$RPMNAME2" + echo "Not installing $RPMNAME2" fi if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME3" - echo "Installing \$RPMNAME3" + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" + echo "Installing $RPMNAME3" else - echo "Not installing \$RPMNAME3" + echo "Not installing $RPMNAME3" fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/%{base_name}.spec.prev ]; then + mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec fi fi else @@ -151,7 +149,7 @@ this package by default. If you want to create full working package please build it with the following command: -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec +$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " fi EOF @@ -224,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/23 16:45:34 glen +- use non-expanding heredoc redirection for readiness + Revision 1.24 2005/01/21 22:21:34 qboosh - don't mention netraider, it's dead @@ -289,7 +290,7 @@ - updated to version 6.0.79.0 Revision 1.4 2003/03/04 10:47:30 grabba -added bcond to build in RA environment +- added bcond to build in RA environment Revision 1.3 2003/01/13 10:09:05 adgor - Prefix /usr @@ -318,7 +319,7 @@ - Release 2 Revision 1.6 2002/10/28 12:09:55 grabba -tested with mozilla 1.0 +- tested with mozilla 1.0 Revision 1.5 2002/10/28 10:56:25 misiek - updated to 6.0 beta @@ -327,7 +328,7 @@ - updated to 5.0r51 Revision 1.3 2002/08/18 12:34:00 blues -license fix +- license fix Revision 1.2 2002/08/12 18:27:34 blues - 5.0r50 - SECURITY update @@ -337,13 +338,13 @@ - License forbids distribution! Revision 1.12 2002/04/25 16:18:26 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/04/18 10:47:33 misiek -5.0r48 (still doesn't work with mozilla 0.9.9 +- 5.0r48 (still doesn't work with mozilla 0.9.9 Revision 1.10 2002/03/27 11:05:59 roman -s/Distribuable/distributable in License +- s/Distribuable/distributable in License Revision 1.9 2002/03/24 02:04:52 blues - s/Exclude/Exclusive/ @@ -356,13 +357,13 @@ Group field using gettext). Revision 1.6 2002/01/28 10:31:00 marcus --s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.5 2002/01/18 02:12:57 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.4 2001/07/12 14:07:53 kloczek -- ExcludeArch: %%{ix86} +- ExcludeArch: %{ix86} Revision 1.3 2001/07/12 14:04:47 kloczek - cosmetics and some minor changes in macros using. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.24&r2=1.25&f=u From glen at pld-linux.org Tue Aug 23 18:47:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 16:47:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: macromedia-flash.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.25 SPECS/macromedia-flash.spec:1.26 --- SPECS/macromedia-flash.spec:1.25 Tue Aug 23 18:45:34 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 18:47:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.1 +Release: 2%{?with_license_agreement:wla}.2 License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -79,7 +79,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -169,7 +169,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -194,7 +194,7 @@ MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if ! %{with license_agreement} +%if %{without license_agreement} %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{base_name}.install @@ -222,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/23 16:47:51 glen +- use without macro + Revision 1.25 2005/08/23 16:45:34 glen - use non-expanding heredoc redirection for readiness ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.25&r2=1.26&f=u From arekm at pld-linux.org Tue Aug 23 18:50:37 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: CVSROOT: loginfo Drop old stuff. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:50:37 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Drop old stuff. ---- Files affected: CVSROOT: loginfo (1.194 -> 1.195) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.194 CVSROOT/loginfo:1.195 --- CVSROOT/loginfo:1.194 Thu Feb 3 17:42:53 2005 +++ CVSROOT/loginfo Tue Aug 23 18:50:32 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m ser-cvs@it-zone.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.194&r2=1.195&f=u From arekm at pld-linux.org Tue Aug 23 18:51:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:51:47 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.13 -> 1.14) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.13 test/plik:1.14 --- test/plik:1.13 Tue Feb 1 20:38:34 2005 +++ test/plik Tue Aug 23 18:51:42 2005 @@ -1,3 +1,4 @@ +alala 1112 4682 85 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.13&r2=1.14&f=u From arekm at pld-linux.org Tue Aug 23 18:57:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:57:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.14 -> 1.15) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.14 test/plik:1.15 --- test/plik:1.14 Tue Aug 23 18:51:42 2005 +++ test/plik Tue Aug 23 18:57:24 2005 @@ -1,3 +1,4 @@ +test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 18:58:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:05 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.15 -> 1.16) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.15 test/plik:1.16 --- test/plik:1.15 Tue Aug 23 18:57:24 2005 +++ test/plik Tue Aug 23 18:58:00 2005 @@ -1,4 +1,5 @@ test1 +test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.15&r2=1.16&f=u From arekm at pld-linux.org Tue Aug 23 18:58:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test3 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 16:58:25 2005 GMT Module: test Tag: HEAD ---- Log message: - test3 ---- Files affected: test: plik (1.16 -> 1.17) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.16 test/plik:1.17 --- test/plik:1.16 Tue Aug 23 18:58:00 2005 +++ test/plik Tue Aug 23 18:58:20 2005 @@ -1,5 +1,6 @@ test1 test2 +test3 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.16&r2=1.17&f=u From glen at pld-linux.org Tue Aug 23 19:02:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: gplflash.spec - typos fixed In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:02:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typos fixed ---- Files affected: SPECS: gplflash.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.8 SPECS/gplflash.spec:1.9 --- SPECS/gplflash.spec:1.8 Wed Aug 17 23:05:16 2005 +++ SPECS/gplflash.spec Tue Aug 23 19:02:05 2005 @@ -78,7 +78,7 @@ Obsoletes: mozilla-plugin-gplflash Requires: browser-plugins -# use macro, otherwise extra LF isinserted along with the ifarch +# use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 %define browsers mozilla, mozilla-firefox, opera, konqueror %else @@ -145,7 +145,7 @@ %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libnpflash.so %ifarch %{ix86} ppc sparc sparc64 -%triggerin -n browser-plugin-%{name} -n browser-plugin-%{name} -- opera +%triggerin -n browser-plugin-%{name} -- opera %nsplugin_install -d %{_libdir}/opera/plugins libnpflash.so %triggerun -n browser-plugin-%{name} -- opera @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 17:02:05 glen +- typos fixed + Revision 1.8 2005/08/17 21:05:16 qboosh - pl update ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Tue Aug 23 19:12:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: CVSROOT: ciabot.pl Updated to latest version. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:12:15 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Updated to latest version. ---- Files affected: CVSROOT: ciabot.pl (1.9 -> 1.10) ---- Diffs: ================================================================ Index: CVSROOT/ciabot.pl diff -u CVSROOT/ciabot.pl:1.9 CVSROOT/ciabot.pl:1.10 --- CVSROOT/ciabot.pl:1.9 Sun Jan 4 17:55:22 2004 +++ CVSROOT/ciabot.pl Tue Aug 23 19:12:10 2005 @@ -12,32 +12,45 @@ # Free Software Foundation. # # The master location of this file is -# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl. +# +# This version has been modified a bit, and is available on CIA's web site: +# http://cia.navi.cx/clients/cvs/ciabot_cvs.pl # # This program is designed to run from the loginfo CVS administration file. It # takes a log message, massaging it and mailing it to the address given below. # # Its record in the loginfo file should look like: # -# ALL $CVSROOT/CVSROOT/ciabot.pl %s $USER project from_email dest_email +# ALL /usr/bin/perl $CVSROOT/CVSROOT/ciabot_cvs.pl %{,,,s} $USER project from_email dest_email ignore_regexp +# +# IMPORTANT: The %{,,,s} in loginfo is new, and is required for proper operation. # -# Note that the last three parameters are optional, you can alternatively change -# the defaults below in the configuration section. +# Make sure that you add the script to 'checkoutlist' before +# committing it. You may need to change /usr/bin/perl to point to your +# system's perl binary. # -# If it does not work, try to disable $xml_rpc in the configuration section -# below. +# Note that the last four parameters are optional, you can alternatively +# change the defaults below in the configuration section. # -# $Id$ use strict; -use vars qw ($project $from_email $dest_email $rpc_uri @sendmail $sync_delay $xml_rpc); - - +use vars qw ($project $from_email $dest_email $rpc_uri $sendmail $sync_delay + $xml_rpc $ignore_regexp $alt_local_message_target); ### Configuration # Project name (as known to CIA). +# +# NOTE: This shouldn't be a long description of your project. Ideally +# it is a short identifier with no spaces, punctuation, or +# unnecessary capitalization. This will be used in URLs related +# to your project, as an internal identifier, and in IRC messages. +# If you want a longer name shown for your project on the web +# interface, please use the "title" metadata key rather than +# putting that here. +# $project = 'pld'; # The from address in generated mails. @@ -49,25 +62,48 @@ # If using XML-RPC, connect to this URI. $rpc_uri = 'http://cia.navi.cx/RPC2'; -# Path to your sendmail binary. If you have it at a different place (and -# outside of $PATH), add your location at the start of this list. By all means -# keep the trailing empty string in the array. -@sendmail = ('sendmail', '/usr/lib/sendmail', '/usr/sbin/sendmail', ''); +# Path to your USCD sendmail compatible binary (your mailer daemon created this +# program somewhere). +$sendmail = '/usr/sbin/sendmail'; # Number of seconds to wait for possible concurrent instances. CVS calls up # this script for each involved directory separately and this is the sync # delay. 5s looks as a safe value, but feel free to increase if you are running # this on a slower (or overloaded) machine or if you have really a lot of # directories. +# Increasing this could be a very good idea if you're on Sourceforge ;) $sync_delay = 5; # This script can communicate with CIA either by mail or by an XML-RPC # interface. The XML-RPC interface is faster and more efficient, however you # need to have RPC::XML perl module installed, and some large CVS hosting sites # (like Savannah or Sourceforge) might not allow outgoing HTTP connections -# while they allow outgoing mail. +# while they allow outgoing mail. Also, this script will hang and eventually +# not deliver the event at all if CIA server happens to be down, which is +# unfortunately not an uncommon condition. $xml_rpc = 0; +# You can make this bot to totally ignore events concerning the objects +# specified below. Each object is composed of //, +# therefore file Manifest in root directory of module gentoo will be called +# "gentoo/Manifest", while file src/bfu/inphist.c of module elinks will be +# called "elinks/src/bfu/inphist.c". Easy, isn't it? +# +# This variable should contain regexp, against which will each object be +# checked, and if the regexp is matched, the file is ignored. Therefore ie. to +# ignore all changes in the two files above and everything concerning module +# 'admin', use: +# +# $ignore_regexp = "^(gentoo/Manifest|elinks/src/bfu/inphist.c|admin/)"; +$ignore_regexp = ""; + +# It can be useful to also grab the generated XML message by some other +# programs and ie. autogenerate some content based on it. Here you can specify +# a file to which it will be appended. +$alt_local_message_target = ""; + + + ### The code itself @@ -78,6 +114,16 @@ # affected in each directory +# A nice nonprinting character we can use as a separator relatively safely. +# The commas in loginfo above give us 4 commas and a space between file +# names given to us on the command line. This is the separator used internally. +# Now we can handle filenames containing spaces, and probably anything except +# strings of 4 commas or the ASCII bell character. +# +# This was inspired by the suggestion in: +# http://mail.gnu.org/archive/html/info-cvs/2003-04/msg00267.html +# +$" = "\7"; ### Input data loading @@ -85,7 +131,7 @@ # These arguments are from %s; first the relative path in the repository # and then the list of files modified. -@files = split (' ', ($ARGV[0] or '')); +@files = split (' ,,,', ($ARGV[0] or '')); $dir[0] = shift @files or die "$0: no directory specified\n"; $dirfiles[0] = "@files" or die "$0: no files specified\n"; @@ -97,6 +143,7 @@ # Figure out who is doing the update. +# $user = $ARGV[1]; $user = $ENV{'CVS_USER'} || $ENV{'CVS_USERNAME'} || $ENV{'CVSUSER'} || getlogin || (getpwuid($<))[0] || "nobody"; @@ -105,6 +152,7 @@ $project = $ARGV[2] if $ARGV[2]; $from_email = $ARGV[3] if $ARGV[3]; $dest_email = $ARGV[4] if $ARGV[4]; +$ignore_regexp = $ARGV[5] if $ARGV[5]; # Parse stdin (what's interesting is the tag and log message) @@ -114,11 +162,25 @@ last if /^Log Message/; } +$logmsg = ""; while () { next unless ($_ and $_ ne "\n" and $_ ne "\r\n"); + s/&/&/g; + s//>/g; $logmsg .= $_; } +### Remove to-be-ignored files + +$dirfiles[0] = join (' ', + grep { + my $f = "$module/$dir[0]/$_"; + $f !~ m/$ignore_regexp/; + } split (/\s+/, $dirfiles[0]) +) if ($ignore_regexp); +exit unless $dirfiles[0]; + ### Sync between the multiple instances potentially being ran simultanously @@ -126,6 +188,7 @@ my $sum; # _VERY_ simple hash of the log message. It is really weak, but I'm # lazy and it's really sorta exceptional to even get more commits # running simultanously anyway. +$sum = 0; map { $sum += ord $_ } split(//, $logmsg); my $syncfile; # Name of the file used for syncing @@ -173,7 +236,8 @@ ### Compose the mail message -my ($VERSION) = '$Revision$' =~ / (\d+\.\d+) /; +my ($VERSION) = '2.3'; +my ($URL) = 'http://cia.navi.cx/clients/cvs/ciabot_cvs.pl'; my $ts = time; $message = < CIA Perl client for CVS $VERSION - http://pasky.or.cz/~pasky/dev/cvs/ciabot.pl + $URL $project @@ -205,11 +269,11 @@ map { $_ = $dir[$dirnum] . '/' . $_; s#^.*?/##; # weed out the module name - s/ / /g; + s/&/&/g; s//>/g; $message .= " $_\n"; - } split(/ /, $dirfiles[$dirnum]); + } split($", $dirfiles[$dirnum]); } $message .= <>$alt_local_message_target")) { + print ALT $message; + close ALT; +} + + + ### Send out the XML-RPC message @@ -254,10 +327,7 @@ # Open our mail program -foreach my $sendmail (@sendmail) { - die "$0: cannot fork sendmail: $!\n" unless ($sendmail); - open (MAIL, "| $sendmail -t -oi -oem") and last; -} +open (MAIL, "| $sendmail -t -oi -oem") or die "Cannot execute $sendmail : " . ($?>>8); # The mail header @@ -276,6 +346,6 @@ # Close the mail close MAIL; -die "$0: sendmail exit status " . $? >> 8 . "\n" unless ($? == 0); +die "$0: sendmail exit status " . ($? >> 8) . "\n" unless ($? == 0); # vi: set sw=2: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/ciabot.pl?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Tue Aug 23 19:13:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test4 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:13:13 2005 GMT Module: test Tag: HEAD ---- Log message: - test4 ---- Files affected: test: plik (1.17 -> 1.18) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.17 test/plik:1.18 --- test/plik:1.17 Tue Aug 23 18:58:20 2005 +++ test/plik Tue Aug 23 19:13:08 2005 @@ -1,6 +1,7 @@ test1 test2 test3 +test4 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.17&r2=1.18&f=u From pawcioos at pld-linux.org Tue Aug 23 19:14:03 2005 From: pawcioos at pld-linux.org (pawcioos) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: eclipse-plugin-cdt.spec - updated md5 for Source2 In-Reply-To: References: Message-ID: Author: pawcioos Date: Tue Aug 23 17:14:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 for Source2 ---- Files affected: SPECS: eclipse-plugin-cdt.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/eclipse-plugin-cdt.spec diff -u SPECS/eclipse-plugin-cdt.spec:1.14 SPECS/eclipse-plugin-cdt.spec:1.15 --- SPECS/eclipse-plugin-cdt.spec:1.14 Tue Aug 23 16:38:15 2005 +++ SPECS/eclipse-plugin-cdt.spec Tue Aug 23 19:13:58 2005 @@ -47,7 +47,7 @@ %endif %if %{need_ia64} Source2: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.ia64.tar.gz -# Source2-md5: 80ba477131beb0c0682019a7705b1cfe +# Source2-md5: ee07f4d21c3785e7d3b2b40b4669def0 %endif %if %{need_x8664} Source3: http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/%{version}/org.eclipse.cdt-%{version}-linux.x86_64.tar.gz @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/23 17:13:58 pawcioos +- updated md5 for Source2 + Revision 1.14 2005/08/23 14:38:15 pawcioos - updated to 3.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eclipse-plugin-cdt.spec?r1=1.14&r2=1.15&f=u From arekm at pld-linux.org Tue Aug 23 19:16:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: CVSROOT: loginfo Fix for new ciabot.pl. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Fix for new ciabot.pl. ---- Files affected: CVSROOT: loginfo (1.195 -> 1.196) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.195 CVSROOT/loginfo:1.196 --- CVSROOT/loginfo:1.195 Tue Aug 23 18:50:32 2005 +++ CVSROOT/loginfo Tue Aug 23 19:16:05 2005 @@ -30,5 +30,5 @@ #^test /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -ALL /cvsroot/CVSROOT/ciabot.pl %s +ALL /cvsroot/CVSROOT/ciabot.pl %{,,,s} ALL /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.195&r2=1.196&f=u From arekm at pld-linux.org Tue Aug 23 19:16:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test5 In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:16:52 2005 GMT Module: test Tag: HEAD ---- Log message: - test5 ---- Files affected: test: plik (1.18 -> 1.19) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.18 test/plik:1.19 --- test/plik:1.18 Tue Aug 23 19:13:08 2005 +++ test/plik Tue Aug 23 19:16:47 2005 @@ -2,6 +2,7 @@ test2 test3 test4 +test5 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Tue Aug 23 19:21:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: linux-libc-headers-endian.patch (NEW) - glibc header (nam... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:21:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - glibc header (namely ) defines both __LITTLE_ENDIAN and __BIG_ENDIAN so check __BYTE_ORDER value instead of *_ENDIAN macros presence ---- Files affected: SOURCES: linux-libc-headers-endian.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u /dev/null SOURCES/linux-libc-headers-endian.patch:1.1 --- /dev/null Tue Aug 23 19:21:36 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:21:31 2005 @@ -0,0 +1,641 @@ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + /* M32R relocation types */ + #define R_M32R_NONE 0 +@@ -82,9 +83,9 @@ + * These are used to set parameters in the core dumps. + */ + #define ELF_CLASS ELFCLASS32 +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define ELF_DATA ELFDATA2LSB +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define ELF_DATA ELFDATA2MSB + #else + #error no endian defined +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 +@@ -5,7 +5,7 @@ + + /* orig : i386 2.4.18 */ + +-#include ++#include + + struct __old_kernel_stat { + unsigned short st_dev; +@@ -67,10 +67,10 @@ + long long st_size; + unsigned long st_blksize; + +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + unsigned long __pad4; /* future possible st_blocks high bits */ + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + unsigned long st_blocks; /* Number 512-byte blocks allocated. */ + unsigned long __pad4; /* future possible st_blocks high bits */ + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 +@@ -16,6 +16,7 @@ + #ifndef __ASSEMBLY__ + #include + #endif ++#include + + /* CS */ + #define JMR3927_ROMCE0 0x1fc00000 /* 4M */ +@@ -148,10 +149,10 @@ + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned short *)(a)) = (d) << 8) + #define jmr3927_ioc_reg_in(a) (((*(volatile unsigned short *)(a)) >> 8) & 0xff) + #else +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)(a)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)(a)) +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + #define jmr3927_ioc_reg_out(d, a) ((*(volatile unsigned char *)((a)^1)) = (d)) + #define jmr3927_ioc_reg_in(a) (*(volatile unsigned char *)((a)^1)) + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h +--- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 +@@ -67,9 +67,9 @@ + volatile unsigned long csr; + }; + +-#include ++#include + +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + #define endian_def_s2(e1,e2) \ + volatile unsigned short e1,e2 + #define endian_def_sb2(e1,e2,e3) \ +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 +@@ -53,9 +53,9 @@ + __s64 res2; /* secondary result */ + }; + +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define PADDED(x,y) x, y +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define PADDED(x,y) y, x + #else + #error edit for your odd byteorder. +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 +@@ -15,7 +15,7 @@ + #include + #include + +-#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN) ++#if (__BYTE_ORDER != __LITTLE_ENDIAN) && (__BYTE_ORDER != __BIG_ENDIAN) + #error "Endian problem - this didn't happen" + #endif + +@@ -699,20 +699,20 @@ + } dvd_authinfo; + + struct request_sense { +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 valid : 1; + __u8 error_code : 7; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 error_code : 7; + __u8 valid : 1; + #endif + __u8 segment_number; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 ili : 1; + __u8 reserved2 : 1; + __u8 sense_key : 4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 sense_key : 4; + __u8 reserved2 : 1; + __u8 ili : 1; +@@ -771,22 +771,22 @@ + + struct mrw_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; + __u8 reserved1 : 2; + #endif + __u8 add_len; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 write : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 write : 1; + __u8 reserved2 : 7; + #endif +@@ -798,12 +798,12 @@ + /* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */ + struct rwrt_feature_desc { + __u16 feature_code; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 2; + __u8 feature_version : 4; + __u8 persistent : 1; + __u8 curr : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 curr : 1; + __u8 persistent : 1; + __u8 feature_version : 4; +@@ -813,10 +813,10 @@ + __u32 last_lba; + __u32 block_size; + __u16 blocking; +-#if defined(__BIG_ENDIAN_BITFIELD) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 7; + __u8 page_present : 1; +-#elif defined(__LITTLE_ENDIAN_BITFIELD) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 page_present : 1; + __u8 reserved2 : 7; + #endif +@@ -825,12 +825,12 @@ + + typedef struct { + __u16 disc_information_length; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved1 : 3; + __u8 erasable : 1; + __u8 border_status : 2; + __u8 disc_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 disc_status : 2; + __u8 border_status : 2; + __u8 erasable : 1; +@@ -840,14 +840,14 @@ + __u8 n_sessions_lsb; + __u8 first_track_lsb; + __u8 last_track_lsb; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 did_v : 1; + __u8 dbc_v : 1; + __u8 uru : 1; + __u8 reserved2 : 2; + __u8 dbit : 1; + __u8 mrw_status : 2; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 mrw_status : 2; + __u8 dbit : 1; + __u8 reserved2 : 2; +@@ -872,7 +872,7 @@ + __u8 track_lsb; + __u8 session_lsb; + __u8 reserved1; +-#if defined(__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 reserved2 : 2; + __u8 damage : 1; + __u8 copy : 1; +@@ -885,7 +885,7 @@ + __u8 reserved3 : 6; + __u8 lra_v : 1; + __u8 nwa_v : 1; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 track_mode : 4; + __u8 copy : 1; + __u8 damage : 1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 +@@ -24,13 +24,13 @@ + } u_echo; + + struct icmpv6_nd_advt { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u32 reserved:5, + override:1, + solicited:1, + router:1, + reserved2:24; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u32 router:1, + solicited:1, + override:1, +@@ -42,12 +42,12 @@ + + struct icmpv6_nd_ra { + __u8 hop_limit; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6, + other:1, + managed:1; + +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 managed:1, + other:1, + reserved:6; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 +@@ -221,14 +221,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned set_geometry : 1; + unsigned recalibrate : 1; + unsigned set_multmode : 1; + unsigned set_tune : 1; + unsigned serviced : 1; + unsigned reserved : 3; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved : 3; + unsigned serviced : 1; + unsigned set_tune : 1; +@@ -250,10 +250,10 @@ + typedef union { + unsigned all :16; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned low :8; /* LSB */ + unsigned high :8; /* MSB */ +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned high :8; /* MSB */ + unsigned low :8; /* LSB */ + #else +@@ -277,7 +277,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned mark :1; + unsigned tzero :1; + unsigned abrt :1; +@@ -286,7 +286,7 @@ + unsigned mce :1; + unsigned ecc :1; + unsigned bdd :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bdd :1; + unsigned ecc :1; + unsigned mce :1; +@@ -313,13 +313,13 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned head : 4; + unsigned unit : 1; + unsigned bit5 : 1; + unsigned lba : 1; + unsigned bit7 : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bit7 : 1; + unsigned lba : 1; + unsigned bit5 : 1; +@@ -351,7 +351,7 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned check :1; + unsigned idx :1; + unsigned corr :1; +@@ -360,7 +360,7 @@ + unsigned df :1; + unsigned drdy :1; + unsigned bsy :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned bsy :1; + unsigned drdy :1; + unsigned df :1; +@@ -388,14 +388,14 @@ + typedef union { + unsigned all : 8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned bit0 : 1; + unsigned nIEN : 1; + unsigned SRST : 1; + unsigned bit3 : 1; + unsigned reserved456 : 3; + unsigned HOB : 1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned HOB : 1; + unsigned reserved456 : 3; + unsigned bit3 : 1; +@@ -419,12 +419,12 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned dma :1; + unsigned reserved321 :3; + unsigned reserved654 :3; + unsigned reserved7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved7 :1; + unsigned reserved654 :3; + unsigned reserved321 :3; +@@ -445,11 +445,11 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned cod :1; + unsigned io :1; + unsigned reserved :6; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned reserved :6; + unsigned io :1; + unsigned cod :1; +@@ -471,13 +471,13 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned ili :1; + unsigned eom :1; + unsigned abrt :1; + unsigned mcr :1; + unsigned sense_key :4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned sense_key :4; + unsigned mcr :1; + unsigned abrt :1; +@@ -506,14 +506,14 @@ + typedef union { + unsigned all :8; + struct { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned sam_lun :3; + unsigned reserved3 :1; + unsigned drv :1; + unsigned one5 :1; + unsigned reserved6 :1; + unsigned one7 :1; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + unsigned one7 :1; + unsigned reserved6 :1; + unsigned one5 :1; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 +@@ -82,7 +82,7 @@ + { + #if 0 + __u8 ulp; /* must contain 4 */ +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 d1_data_present:1; /* must be 1 */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 reserved:6; /* must be zero */ +@@ -91,7 +91,7 @@ + __u16 d1_area_size:8; /* must be 3 */ + __u16 d2_offset:3; /* must be zero */ + #endif +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 reserved:6; /* must be zero */ + __u8 start_d2_burst_boundary:1; /* must be zero */ + __u8 d1_data_present:1; /* must be 1 */ +@@ -111,20 +111,20 @@ + + struct hippi_le_hdr + { +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 fc:3; + __u8 double_wide:1; + __u8 message_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 message_type:4; + __u8 double_wide:1; + __u8 fc:3; + #endif + __u8 dest_switch_addr[3]; +-#if defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 dest_addr_type:4, + src_addr_type:4; +-#elif defined(__LITTLE_ENDIAN) ++#elif __BYTE_ORDER == __LITTLE_ENDIAN + __u8 src_addr_type:4, + dest_addr_type:4; + #endif +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 +@@ -91,10 +91,10 @@ + #define PTT_GEN_ERR __constant_htons(0x0203) + + struct pppoe_hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ver : 4; + __u8 type : 4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 type : 4; + __u8 ver : 4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 +@@ -67,11 +67,11 @@ + __u8 code; + __u16 csum; + __u32 group; +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 qrv:3, + suppress:1, + resv:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 resv:4, + suppress:1, + qrv:3; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 +@@ -83,10 +83,10 @@ + #ifndef __NETINET_IP_H + + struct iphdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 ihl:4, + version:4; +-#elif defined (__BIG_ENDIAN) ++#if __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + ihl:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 +@@ -102,10 +102,10 @@ + */ + + struct ipv6hdr { +-#if defined(__LITTLE_ENDIAN) ++#if __BYTE_ORDER == __LITTLE_ENDIAN + __u8 priority:4, + version:4; +-#elif defined(__BIG_ENDIAN) ++#elif __BYTE_ORDER == __BIG_ENDIAN + __u8 version:4, + priority:4; + #else +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + /* The map stuff is very simple. You fill in your struct map_info with + a handful of routines for accessing the device, making sure they handle +@@ -160,7 +161,7 @@ + } else { + for (i=start; i < start+len; i++) { + int bitpos; +-#ifdef __LITTLE_ENDIAN ++#if __BYTE_ORDER == __LITTLE_ENDIAN + bitpos = i*8; + #else /* __BIG_ENDIAN */ + bitpos = (map_bankwidth(map)-1-i)*8; +diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h +--- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 +@@ -16,6 +16,7 @@ + #define _MD_P_H + + #include ++#include + + /* + * RAID superblock. +@@ -130,7 +131,7 @@ + __u32 failed_disks; /* 4 Number of failed disks */ + __u32 spare_disks; /* 5 Number of spare disks */ + __u32 sb_csum; /* 6 checksum of the whole superblock */ +-#ifdef __BIG_ENDIAN ++#if __BYTE_ORDER == __BIG_ENDIAN + __u32 events_hi; /* 7 high-order of superblock update count */ <> From glen at pld-linux.org Tue Aug 23 19:22:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - single package with triggers on bro... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:22:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - single package with triggers on browser packages ---- Files affected: SPECS: macromedia-flash.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.26 SPECS/macromedia-flash.spec:1.27 --- SPECS/macromedia-flash.spec:1.26 Tue Aug 23 18:47:51 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:22:40 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2%{?with_license_agreement:wla}.2 +Release: 2.13%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -20,57 +20,33 @@ # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %endif URL: http://www.macromedia.com/software/flash/ +BuildRequires: rpmbuild(macros) >= 1.224 +Requires: browser-plugins +%if %{without license_agreement} +Requires: /usr/bin/builder +%endif +Obsoletes: flash-plugin +Obsoletes: mozilla-plugin-macromedia-flash +Obsoletes: mozilla-firefox-plugin-macromedia-flash +Obsoletes: konqueror-plugin-macromedia-flash ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _plugindir %{_libdir}/browser-plugins + +# TODO: opera, galeon and skipstone. +# use macro, otherwise extra LF inserted along with the ifarch +%define browsers mozilla, mozilla-firefox, konqueror + %description Flash plugin for Netscape-compatible WWW browsers. +Supported browsers: %{browsers}. + %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -%package -n mozilla-plugin-macromedia-flash -Summary: Flash plugin for Mozilla based browsers -Summary(pl): Wtyczka Flash dla przegl?darek opartych na Mozilli -Group: X11/Applications/Multimedia -PreReq: mozilla-embedded >= 1.0 -Obsoletes: flash-plugin - -%description -n mozilla-plugin-macromedia-flash -This package contains flash plugin for Mozilla based browsers, i.e. -mozilla itself, galeon or skipstone. - -%description -n mozilla-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darek opartych -na Mozilli, np.: mozilli jako takiej, galeona czy te? skipstone'a. - -%package -n mozilla-firefox-plugin-macromedia-flash -Summary: Flash plugin for Mozilla Firefox browser -Summary(pl): Wtyczka Flash dla Mozilla Firefox -Group: X11/Applications/Multimedia -PreReq: mozilla-firefox -Obsoletes: flash-plugin - -%description -n mozilla-firefox-plugin-macromedia-flash -This package contains flash plugin for Mozilla Firefox browser. - -%description -n mozilla-firefox-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? dla technologii Flash dla przegl?darki -Mozilla Firefox. - -%package -n konqueror-plugin-macromedia-flash -Summary: Flash plugin for Konqueror browser -Summary(pl): Wtyczka obs?uguj?ca Flash dla przegl?darki Konqueror -Group: X11/Applications/Multimedia -PreReq: konqueror >= 3.0.8-2.3 -Obsoletes: flash-plugin - -%description -n konqueror-plugin-macromedia-flash -This package contains flash plugin for Konqueror browser. - -%description -n konqueror-plugin-macromedia-flash -l pl -Pakiet zawiera wtyczk? obs?uguj?c? technologi? Flash dla przegl?darki -Konqueror. +Supported browsers: %{browsers}. %prep %if %{with license_agreement} @@ -115,28 +91,8 @@ if [ "$?" -ne 0 ]; then exit 2 fi - RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-firefox-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES= - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES=$RPMDIR/$RPMNAME1 - echo "Installing $RPMNAME1" - else - echo "Not installing $RPMNAME1" - fi - if rpm -q mozilla-firefox >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2" - echo "Installing $RPMNAME2" - else - echo "Not installing $RPMNAME2" - fi - if rpm -q konqueror >/dev/null 2>&1; then - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3" - echo "Installing $RPMNAME3" - else - echo "Not installing $RPMNAME3" - fi + RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm + RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/%{base_name}.spec.prev ]; then @@ -158,11 +114,8 @@ %else -install -d $RPM_BUILD_ROOT%{_libdir}/{mozilla/plugins,/mozilla-firefox/plugins,/kde3/plugins/konqueror} - -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins -install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins -install *.so $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror +install -d $RPM_BUILD_ROOT%{_plugindir} +install *.{so,xpt} $RPM_BUILD_ROOT%{_plugindir} %endif @@ -178,42 +131,48 @@ %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec " -%endif +%else -%post -n mozilla-plugin-macromedia-flash +%triggerin -- mozilla-firefox +%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerun -- mozilla-firefox +%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt + +%triggerin -- mozilla +%nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%postun -n mozilla-plugin-macromedia-flash +%triggerun -- mozilla +%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt umask 022 rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat if [ -x /usr/bin/regxpcom ]; then MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom fi -%if %{without license_agreement} +%triggerin -- konqueror +%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%triggerun -- konqueror +%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so + +%endif + %files %defattr(644,root,root,755) + +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else -%files -n mozilla-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla/plugins/*.so -%{_libdir}/mozilla/plugins/*.xpt - -%files -n mozilla-firefox-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/*.so -%{_libdir}/mozilla-firefox/plugins/*.xpt - -%files -n konqueror-plugin-macromedia-flash -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/kde3/plugins/konqueror/*.so +%attr(755,root,root) %{_plugindir}/*.so +%{_plugindir}/*.xpt %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -222,6 +181,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/23 17:22:40 glen +- single package with triggers on browser packages + Revision 1.26 2005/08/23 16:47:51 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Tue Aug 23 19:23:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: linux-libc-headers.spec - added endian patch, release 2 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:23:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added endian patch, release 2 ---- Files affected: SPECS: linux-libc-headers.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.98 SPECS/linux-libc-headers.spec:1.99 --- SPECS/linux-libc-headers.spec:1.98 Thu Aug 4 21:33:48 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:23:22 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 1 +Release: 2 Epoch: 7 License: GPL Group: Development @@ -15,6 +15,7 @@ Patch3: %{name}-fbsplash.patch Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch +Patch6: %{name}-endian.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -58,6 +59,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %ifarch %{x8664} @@ -172,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/23 17:23:22 qboosh +- added endian patch, release 2 + Revision 1.98 2005/08/04 19:33:48 pluto - imq headers added. - release 1. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.98&r2=1.99&f=u From arekm at pld-linux.org Tue Aug 23 19:26:22 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: CVSROOT: loginfo Add pld commit ml. In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:26:22 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: Add pld commit ml. ---- Files affected: CVSROOT: loginfo (1.196 -> 1.197) ---- Diffs: ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.196 CVSROOT/loginfo:1.197 --- CVSROOT/loginfo:1.196 Tue Aug 23 19:16:05 2005 +++ CVSROOT/loginfo Tue Aug 23 19:26:17 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.196&r2=1.197&f=u From arekm at pld-linux.org Tue Aug 23 19:27:20 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:32 2005 Subject: test: plik - test In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 17:27:20 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: plik (1.19 -> 1.20) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.19 test/plik:1.20 --- test/plik:1.19 Tue Aug 23 19:16:47 2005 +++ test/plik Tue Aug 23 19:27:15 2005 @@ -3,6 +3,7 @@ test3 test4 test5 +test6 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Tue Aug 23 19:30:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: test: pask2 - test In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:30:29 2005 GMT Module: test Tag: HEAD ---- Log message: - test ---- Files affected: test: pask2 (1.2 -> 1.3) ---- Diffs: ================================================================ Index: test/pask2 diff -u test/pask2:1.2 test/pask2:1.3 --- test/pask2:1.2 Thu Jun 23 19:13:17 2005 +++ test/pask2 Tue Aug 23 19:30:24 2005 @@ -1 +1 @@ -Thu Jun 23 20:13:06 EEST 2005 +Tue Aug 23 20:30:20 EEST 2005 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/pask2?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Tue Aug 23 19:30:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: iproute2.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:30:35 Modified files: iproute2.spec Log message: - release 5: rebuild with fixed on big-endians Index: iproute2.spec =================================================================== RCS file: /cvsroot/SPECS/iproute2.spec,v diff -d -u -r1.145 -r1.146 --- iproute2.spec 5 Jul 2005 16:38:17 -0000 1.145 +++ iproute2.spec 23 Aug 2005 17:30:30 -0000 1.146 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 From qboosh at pld-linux.org Tue Aug 23 19:30:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: iproute2.spec - release 5: rebuild with fixed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:30:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 5: rebuild with fixed on big-endians ---- Files affected: SPECS: iproute2.spec (1.145 -> 1.146) ---- Diffs: ================================================================ Index: SPECS/iproute2.spec diff -u SPECS/iproute2.spec:1.145 SPECS/iproute2.spec:1.146 --- SPECS/iproute2.spec:1.145 Tue Jul 5 18:38:17 2005 +++ SPECS/iproute2.spec Tue Aug 23 19:30:30 2005 @@ -17,7 +17,7 @@ %define sdate 050607 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8 Version: 2.6.11 -Release: 4 +Release: 5 License: GPL Vendor: Stephen Hemminger Group: Networking/Admin @@ -34,7 +34,7 @@ %if %{with atm} BuildRequires: linux-atm-devel %endif -BuildRequires: linux-libc-headers >= 7:2.6.11.2-3 +BuildRequires: linux-libc-headers >= 7:2.6.12.0-2 %if %{with doc} BuildRequires: psutils BuildRequires: sgml-tools @@ -145,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.146 2005/08/23 17:30:30 qboosh +- release 5: rebuild with fixed on big-endians + Revision 1.145 2005/07/05 16:38:17 arekm - up to 050607 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iproute2.spec?r1=1.145&r2=1.146&f=u From baggins at pld-linux.org Tue Aug 23 19:38:05 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: rc-scripts-con_serial_sparc.patch, rc-scripts-dev_alias.p... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.4.0.20 ---- Files affected: SOURCES: rc-scripts-con_serial_sparc.patch (1.2 -> 1.3) , rc-scripts-dev_alias.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-con_serial_sparc.patch diff -u SOURCES/rc-scripts-con_serial_sparc.patch:1.2 SOURCES/rc-scripts-con_serial_sparc.patch:1.3 --- SOURCES/rc-scripts-con_serial_sparc.patch:1.2 Wed Jun 15 21:59:32 2005 +++ SOURCES/rc-scripts-con_serial_sparc.patch Tue Aug 23 19:38:00 2005 @@ -1,10 +1,10 @@ --- rc-scripts-0.4.0.19/inittab.orig 2005-06-15 19:55:54.862429768 +0200 +++ rc-scripts-0.4.0.19/inittab 2005-06-15 19:56:09.442213304 +0200 -@@ -45,6 +45,8 @@ - # If power was restored before the shutdown kicked in, cancel it. +@@ -45,7 +45,7 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled" -+# Run agetty on serial port + # Run agetty on serial port +-# 0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 # Run gettys in standard runlevels ================================================================ Index: SOURCES/rc-scripts-dev_alias.patch diff -u SOURCES/rc-scripts-dev_alias.patch:1.3 SOURCES/rc-scripts-dev_alias.patch:1.4 --- SOURCES/rc-scripts-dev_alias.patch:1.3 Tue Mar 29 20:18:46 2005 +++ SOURCES/rc-scripts-dev_alias.patch Tue Aug 23 19:38:00 2005 @@ -4,8 +4,8 @@ . /etc/rc.d/init.d/functions; \ cd /etc/sysconfig/interfaces && ls -1 ifcfg* | \ egrep -v '(ifcfg-lo|ifcfg-sit|ifcfg-atm|ifcfg-lec|ifcfg-nas|ifcfg-br|ifcfg-(.*)\.(.*))' | \ -- egrep 'ifcfg-[a-z0-9\.]+$' | \ -+ egrep 'ifcfg-[a-z0-9\.:]+$' | \ +- LC_ALL=C egrep 'ifcfg-[a-z0-9\.]+$' | \ ++ LC_ALL=C egrep 'ifcfg-[a-z0-9\.:]+$' | \ for i in `cat`; do \ ONBOOT=""; . /etc/sysconfig/interfaces/"$i"; is_yes "$ONBOOT" && echo "$i"; \ done | \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rc-scripts-con_serial_sparc.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/rc-scripts-dev_alias.patch?r1=1.3&r2=1.4&f=u From baggins at pld-linux.org Tue Aug 23 19:38:26 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: rc-scripts-az-locale.patch (REMOVED), rc-scripts-plusgsm_... In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:38:26 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: outdated ---- Files affected: SOURCES: rc-scripts-az-locale.patch (1.1 -> NONE) (REMOVED), rc-scripts-plusgsm_example.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From baggins at pld-linux.org Tue Aug 23 19:40:07 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: DISTFILES: rc-scripts-0.4.0.20.tar.gz Message-ID: <19301.1124818807@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.pld-linux.org/people/arekm/software/rc-scripts-0.4.0.20.tar.gz d67b427da40f42b6b2fc5f562dc9286d rc-scripts-0.4.0.20.tar.gz Size: 309815 bytes -- Virtually Yours: distfiles. From baggins at pld-linux.org Tue Aug 23 19:40:00 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:39:58 Modified files: rc-scripts.spec Log message: - updated to 0.4.0.20 - release 0.1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.195 -r1.196 --- rc-scripts.spec 7 Jul 2005 16:42:20 -0000 1.195 +++ rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default From baggins at pld-linux.org Tue Aug 23 19:40:03 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rc-scripts.spec - updated to 0.4.0.20 - release 0.1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.0.20 - release 0.1 ---- Files affected: SPECS: rc-scripts.spec (1.195 -> 1.196) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.195 SPECS/rc-scripts.spec:1.196 --- SPECS/rc-scripts.spec:1.195 Thu Jul 7 18:42:20 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:39:58 2005 @@ -10,17 +10,15 @@ Summary(pl): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts -Version: 0.4.0.19 -Release: 3 +Version: 0.4.0.20 +Release: 0.1 License: GPL Vendor: PLD rc-scripts Team Group: Base Source0: ftp://ftp.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz -# Source0-md5: a6a4fd3de31247819f755a5c798c5816 +# Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch -Patch2: %{name}-plusgsm_example.patch -Patch3: %{name}-az-locale.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -101,8 +99,6 @@ %ifarch sparc sparc64 %patch1 -p1 %endif -%patch2 -p1 -%patch3 -p1 %build %{__aclocal} @@ -135,6 +131,7 @@ for i in 1 2 3 4 5; do ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S00killall + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S01cpusets ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S20random done @@ -145,6 +142,7 @@ ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single for i in 0 6; do + ln -s ../init.d/cpusets $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K99cpusets ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90killall ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K80random done @@ -194,6 +192,7 @@ /etc/rc.d/init.d/functions %attr(754,root,root) /etc/rc.d/init.d/allowlogin +%attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/killall %attr(754,root,root) /etc/rc.d/init.d/network %attr(754,root,root) /etc/rc.d/init.d/random @@ -208,6 +207,7 @@ %attr(754,root,root) /etc/rc.d/rc.sysinit %attr(754,root,root) /etc/rc.d/rc.shutdown %attr(754,root,root) /etc/rc.d/rc?.d/S??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/S??killall %attr(754,root,root) /etc/rc.d/rc?.d/S??local %attr(754,root,root) /etc/rc.d/rc?.d/S??network @@ -216,6 +216,7 @@ %attr(754,root,root) /etc/rc.d/rc?.d/S??timezone %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots %attr(754,root,root) /etc/rc.d/rc?.d/K??allowlogin +%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets %attr(754,root,root) /etc/rc.d/rc?.d/K??killall %attr(754,root,root) /etc/rc.d/rc?.d/K??network %attr(754,root,root) /etc/rc.d/rc?.d/K??random @@ -251,6 +252,7 @@ %attr(755,root,root) %dir %{_sysconfdir}/ppp %attr(754,root,root) %{_sysconfdir}/ppp/* %attr(755,root,root) %dir /etc/sysconfig +%attr(755,root,root) %dir /etc/sysconfig/cpusets %attr(755,root,root) %dir /etc/sysconfig/interfaces %attr(755,root,root) %dir /etc/sysconfig/interfaces/data %attr(755,root,root) %dir /etc/sysconfig/isapnp @@ -282,6 +284,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-eth0 +%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/cpusets/cpuset-test %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -302,6 +305,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.196 2005/08/23 17:39:58 baggins +- updated to 0.4.0.20 +- release 0.1 + Revision 1.195 2005/07/07 16:42:20 glen - also start/stop sys-chroot service by default ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.195&r2=1.196&f=u From qboosh at pld-linux.org Tue Aug 23 19:47:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: linux-libc-headers-endian.patch - bugfixes in ip.h and tcp.h In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:47:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - bugfixes in ip.h and tcp.h ---- Files affected: SOURCES: linux-libc-headers-endian.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-endian.patch diff -u SOURCES/linux-libc-headers-endian.patch:1.1 SOURCES/linux-libc-headers-endian.patch:1.2 --- SOURCES/linux-libc-headers-endian.patch:1.1 Tue Aug 23 19:21:31 2005 +++ SOURCES/linux-libc-headers-endian.patch Tue Aug 23 19:47:28 2005 @@ -1,6 +1,6 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h 2005-03-13 21:54:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 22:19:47.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -23,7 +23,7 @@ #error no endian defined diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h 2005-03-25 20:39:05.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 21:26:07.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h 2005-08-23 22:19:47.000000000 +0200 @@ -5,7 +5,7 @@ /* orig : i386 2.4.18 */ @@ -48,7 +48,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 21:27:06.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #ifndef __ASSEMBLY__ #include @@ -72,7 +72,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 21:27:45.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,9 +67,9 @@ volatile unsigned long csr; }; @@ -87,7 +87,7 @@ #define endian_def_sb2(e1,e2,e3) \ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h 2005-07-06 02:17:21.000000000 +0200 -+++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 21:45:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h 2005-08-23 22:19:47.000000000 +0200 @@ -53,9 +53,9 @@ __s64 res2; /* secondary result */ }; @@ -102,7 +102,7 @@ #error edit for your odd byteorder. diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h --- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h 2005-01-08 15:03:51.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 21:44:23.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h 2005-08-23 22:19:47.000000000 +0200 @@ -15,7 +15,7 @@ #include #include @@ -244,7 +244,7 @@ __u8 damage : 1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h 2005-03-26 19:58:03.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -24,13 +24,13 @@ } u_echo; @@ -278,7 +278,7 @@ reserved:6; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h 2005-03-13 21:54:02.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 21:45:12.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ide.h 2005-08-23 22:19:47.000000000 +0200 @@ -221,14 +221,14 @@ typedef union { unsigned all : 8; @@ -442,7 +442,7 @@ unsigned one5 :1; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h 2004-10-31 20:55:19.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 21:46:49.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h 2005-08-23 22:19:47.000000000 +0200 @@ -82,7 +82,7 @@ { #if 0 @@ -488,7 +488,7 @@ #endif diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h --- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h 2005-03-13 21:54:01.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 21:47:05.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h 2005-08-23 22:19:47.000000000 +0200 @@ -91,10 +91,10 @@ #define PTT_GEN_ERR __constant_htons(0x0203) @@ -504,7 +504,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h 2005-03-26 19:58:04.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 21:47:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h 2005-08-23 22:19:47.000000000 +0200 @@ -67,11 +67,11 @@ __u8 code; __u16 csum; @@ -521,7 +521,7 @@ qrv:3; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h 2004-10-31 20:55:50.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 21:47:40.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ip.h 2005-08-23 22:21:06.000000000 +0200 @@ -83,10 +83,10 @@ #ifndef __NETINET_IP_H @@ -531,13 +531,13 @@ __u8 ihl:4, version:4; -#elif defined (__BIG_ENDIAN) -+#if __BYTE_ORDER == __BIG_ENDIAN ++#elif __BYTE_ORDER == __BIG_ENDIAN __u8 version:4, ihl:4; #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h --- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h 2004-10-31 20:56:07.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 21:43:11.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h 2005-08-23 22:19:47.000000000 +0200 @@ -102,10 +102,10 @@ */ @@ -553,7 +553,7 @@ #else diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h --- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h 2005-03-25 20:34:24.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 21:31:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h 2005-08-23 22:19:47.000000000 +0200 @@ -7,6 +7,7 @@ #include #include @@ -573,7 +573,7 @@ bitpos = (map_bankwidth(map)-1-i)*8; diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h --- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 21:32:36.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h 2005-08-23 22:19:47.000000000 +0200 @@ -16,6 +16,7 @@ #define _MD_P_H @@ -593,16 +593,16 @@ __u32 cp_events_hi; /* 9 high-order of checkpoint update count */ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-headers-2.6.12.0/include/linux/tcp.h --- linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h 2005-01-08 15:03:40.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 21:48:11.000000000 +0200 -@@ -18,14 +18,14 @@ ++++ linux-libc-headers-2.6.12.0/include/linux/tcp.h 2005-08-23 22:22:11.000000000 +0200 +@@ -18,6 +18,7 @@ #define _LINUX_TCP_H #include --#include +#include + #include struct tcphdr { - __u16 source; +@@ -25,7 +26,7 @@ __u16 dest; __u32 seq; __u32 ack_seq; @@ -611,7 +611,7 @@ __u16 res1:4, doff:4, fin:1, -@@ -36,7 +36,7 @@ +@@ -36,7 +37,7 @@ urg:1, ece:1, cwr:1; @@ -622,7 +622,7 @@ cwr:1, diff -Nur linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h --- linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h 2005-03-25 20:30:35.000000000 +0100 -+++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 21:49:22.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h 2005-08-23 22:19:47.000000000 +0200 @@ -27,12 +27,12 @@ #ifndef __CS46XX_DSP_SCB_TYPES_H__ #define __CS46XX_DSP_SCB_TYPES_H__ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-libc-headers-endian.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 19:48:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: linux-libc-headers.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: qboosh 05/08/23 19:48:17 Modified files: linux-libc-headers.spec Log message: - bugfix in endian patch, release 3 Index: linux-libc-headers.spec =================================================================== RCS file: /cvsroot/SPECS/linux-libc-headers.spec,v diff -d -u -r1.99 -r1.100 --- linux-libc-headers.spec 23 Aug 2005 17:23:22 -0000 1.99 +++ linux-libc-headers.spec 23 Aug 2005 17:48:17 -0000 1.100 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 From qboosh at pld-linux.org Tue Aug 23 19:48:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: linux-libc-headers.spec - bugfix in endian patch, release 3 In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 17:48:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - bugfix in endian patch, release 3 ---- Files affected: SPECS: linux-libc-headers.spec (1.99 -> 1.100) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.99 SPECS/linux-libc-headers.spec:1.100 --- SPECS/linux-libc-headers.spec:1.99 Tue Aug 23 19:23:22 2005 +++ SPECS/linux-libc-headers.spec Tue Aug 23 19:48:17 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: Development @@ -174,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.100 2005/08/23 17:48:17 qboosh +- bugfix in endian patch, release 3 + Revision 1.99 2005/08/23 17:23:22 qboosh - added endian patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.99&r2=1.100&f=u From baggins at pld-linux.org Tue Aug 23 19:55:19 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rc-scripts.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: baggins 05/08/23 19:55:17 Modified files: rc-scripts.spec Log message: - release 1 Index: rc-scripts.spec =================================================================== RCS file: /cvsroot/SPECS/rc-scripts.spec,v diff -d -u -r1.196 -r1.197 --- rc-scripts.spec 23 Aug 2005 17:39:58 -0000 1.196 +++ rc-scripts.spec 23 Aug 2005 17:55:17 -0000 1.197 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 From baggins at pld-linux.org Tue Aug 23 19:55:22 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rc-scripts.spec - release 1 In-Reply-To: References: Message-ID: Author: baggins Date: Tue Aug 23 17:55:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: rc-scripts.spec (1.196 -> 1.197) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.196 SPECS/rc-scripts.spec:1.197 --- SPECS/rc-scripts.spec:1.196 Tue Aug 23 19:39:58 2005 +++ SPECS/rc-scripts.spec Tue Aug 23 19:55:17 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 0.1 +Release: 1 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -305,6 +305,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.197 2005/08/23 17:55:17 baggins +- release 1 + Revision 1.196 2005/08/23 17:39:58 baggins - updated to 0.4.0.20 - release 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.196&r2=1.197&f=u From glen at pld-linux.org Tue Aug 23 19:56:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: license-installer.sh (NEW) - shared installer, extracted ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - shared installer, extracted from macromedia-flash.spec ---- Files affected: SOURCES: license-installer.sh (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u /dev/null SOURCES/license-installer.sh:1.1 --- /dev/null Tue Aug 23 19:56:21 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:56:16 2005 @@ -0,0 +1,48 @@ +#!/bin/sh +if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then + TMPDIR=`rpm --eval "%{tmpdir}"`; export TMPDIR + SPECDIR=`rpm --eval "%{_specdir}"`; export SPECDIR + SRPMDIR=`rpm --eval "%{_srcrpmdir}"`; export SRPMDIR + SOURCEDIR=`rpm --eval "%{_sourcedir}"`; export SOURCEDIR + BUILDDIR=`rpm --eval "%{_builddir}"`; export BUILDDIR + RPMDIR=`rpm --eval "%{_rpmdir}"`; export RPMDIR + BACKUP=0 + mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR + if [ -f $SPECDIR/@BASE_NAME@.spec ]; then + BACKUP=1 + mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev + fi + if echo "$3" | grep '\.src\.rpm$' >/dev/null; then + ( cd $SRPMDIR + if echo "$3" | grep '://' >/dev/null; then + wget --passive-ftp -t0 "$3" + else + cp -f "$3" . + fi + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) + ) + cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + else + cp -i "$3" $SPECDIR || exit 1 + fi + ( cd $SPECDIR + /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + if [ "$?" -ne 0 ]; then + exit 2 + fi + RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" + rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + if [ "$BACKUP" -eq 1 ]; then + if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then + mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + fi +else + echo " +License issues made us not to include inherent files into +this package by default. If you want to create full working +package please build it with the following command: + +$0 --with license_agreement @SPECFILE@ +" +fi ================================================================ From glen at pld-linux.org Tue Aug 23 19:56:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 19:56:48 Modified files: macromedia-flash.spec Log message: - use shared installer script from SOURCES Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.27 -r1.28 --- macromedia-flash.spec 23 Aug 2005 17:22:40 -0000 1.27 +++ macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages From glen at pld-linux.org Tue Aug 23 19:56:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - use shared installer script from SO... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:56:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES ---- Files affected: SPECS: macromedia-flash.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.27 SPECS/macromedia-flash.spec:1.28 --- SPECS/macromedia-flash.spec:1.27 Tue Aug 23 19:22:40 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 19:56:48 2005 @@ -12,12 +12,14 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.13%{?with_license_agreement:wla} +Release: 2.17%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 +%else +Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 @@ -58,57 +60,13 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) - ) - cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1 - else - cp -i "$3" $SPECDIR || exit 1 - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) - if [ "$BACKUP" -eq 1 ]; then - if [ -f $SPECDIR/%{base_name}.spec.prev ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -124,13 +82,8 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: +%{_bindir}/%{base_name}.install -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" %else %triggerin -- mozilla-firefox @@ -181,6 +134,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.28 2005/08/23 17:56:48 glen +- use shared installer script from SOURCES + Revision 1.27 2005/08/23 17:22:40 glen - single package with triggers on browser packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.27&r2=1.28&f=u From glen at pld-linux.org Tue Aug 23 19:59:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: license-installer.sh - show install progress In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 17:59:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - show install progress ---- Files affected: SOURCES: license-installer.sh (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.1 SOURCES/license-installer.sh:1.2 --- SOURCES/license-installer.sh:1.1 Tue Aug 23 19:56:16 2005 +++ SOURCES/license-installer.sh Tue Aug 23 19:58:56 2005 @@ -31,7 +31,7 @@ exit 2 fi RPMNAMES="$RPMDIR/@BASE_NAME@-@VERSION@-@RELEASE@wla.@TARGET_CPU@.rpm" - rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) + rpm -Uhv $RPMNAMES || echo -e "Install manually the file(s):\n $RPMNAMES" ) if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Tue Aug 23 20:02:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:02:03 Modified files: macromedia-flash.spec Log message: - add opera support Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.28 -r1.29 --- macromedia-flash.spec 23 Aug 2005 17:56:48 -0000 1.28 +++ macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES From glen at pld-linux.org Tue Aug 23 20:02:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - add opera support In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:02:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add opera support ---- Files affected: SPECS: macromedia-flash.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.28 SPECS/macromedia-flash.spec:1.29 --- SPECS/macromedia-flash.spec:1.28 Tue Aug 23 19:56:48 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:02:03 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.17%{?with_license_agreement:wla} +Release: 2.22%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -36,9 +36,9 @@ %define _plugindir %{_libdir}/browser-plugins -# TODO: opera, galeon and skipstone. +# TODO: galeon and skipstone. # use macro, otherwise extra LF inserted along with the ifarch -%define browsers mozilla, mozilla-firefox, konqueror +%define browsers mozilla, mozilla-firefox, konqueror, opera %description Flash plugin for Netscape-compatible WWW browsers. @@ -114,6 +114,12 @@ %triggerun -- konqueror %nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so +%triggerin -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so + +%triggerun -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so + %endif %files @@ -134,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/23 18:02:03 glen +- add opera support + Revision 1.28 2005/08/23 17:56:48 glen - use shared installer script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.28&r2=1.29&f=u From glen at pld-linux.org Tue Aug 23 20:05:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec - arch dependant due %{_libdir} usage In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:05:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - arch dependant due %{_libdir} usage ---- Files affected: SPECS: browser-plugins.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.3 SPECS/browser-plugins.spec:1.4 --- SPECS/browser-plugins.spec:1.3 Thu Jun 23 15:05:39 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:05:28 2005 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 20:05:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:05:29 Modified files: browser-plugins.spec Log message: - arch dependant due %{_libdir} usage Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.3 -r1.4 --- browser-plugins.spec 23 Jun 2005 13:05:39 -0000 1.3 +++ browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 @@ -6,11 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1 +Release: 1.1 License: GPL Group: Base URL: http://www.mozilla.org/projects/plugins/ -BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -52,6 +51,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 18:05:28 glen +- arch dependant due %{_libdir} usage + Revision 1.3 2005/06/23 13:05:39 glen - rel 1 From glen at pld-linux.org Tue Aug 23 20:07:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec - provide virtual to identify built ar... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:07:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - provide virtual to identify built archdecture ---- Files affected: SPECS: browser-plugins.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.4 SPECS/browser-plugins.spec:1.5 --- SPECS/browser-plugins.spec:1.4 Tue Aug 23 20:05:28 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:07:14 2005 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 20:07:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:07:15 Modified files: browser-plugins.spec Log message: - provide virtual to identify built archdecture Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.4 -r1.5 --- browser-plugins.spec 23 Aug 2005 18:05:28 -0000 1.4 +++ browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 @@ -6,9 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Base +Provides: %{name}(%{_target_cpu}) URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:07:14 glen +- provide virtual to identify built archdecture + Revision 1.4 2005/08/23 18:05:28 glen - arch dependant due %{_libdir} usage From glen at pld-linux.org Tue Aug 23 20:10:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) template-browser-plugin.spec (HEAD) gplflash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:10:13 Modified files: macromedia-flash.spec template-browser-plugin.spec gplflash.spec Log message: - require correct arch of browser-plugins Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.29 -r1.30 --- macromedia-flash.spec 23 Aug 2005 18:02:03 -0000 1.29 +++ macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.4 -r1.5 --- template-browser-plugin.spec 23 Jun 2005 12:54:15 -0000 1.4 +++ template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) Index: gplflash.spec =================================================================== RCS file: /cvsroot/SPECS/gplflash.spec,v diff -d -u -r1.9 -r1.10 --- gplflash.spec 23 Aug 2005 17:02:05 -0000 1.9 +++ gplflash.spec 23 Aug 2005 18:10:13 -0000 1.10 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed From glen at pld-linux.org Tue Aug 23 20:10:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec, template-browser-plugin.spec, gplfla... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:10:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require correct arch of browser-plugins ---- Files affected: SPECS: macromedia-flash.spec (1.29 -> 1.30) , template-browser-plugin.spec (1.4 -> 1.5) , gplflash.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.29 SPECS/macromedia-flash.spec:1.30 --- SPECS/macromedia-flash.spec:1.29 Tue Aug 23 20:02:03 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:10:13 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.22%{?with_license_agreement:wla} +Release: 2.23%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -23,7 +23,7 @@ %endif URL: http://www.macromedia.com/software/flash/ BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder %endif @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.29 2005/08/23 18:02:03 glen - add opera support ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.4 SPECS/template-browser-plugin.spec:1.5 --- SPECS/template-browser-plugin.spec:1.4 Thu Jun 23 14:54:15 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:10:13 2005 @@ -11,7 +11,7 @@ License: GPL Group: X11/Applications/Multimedia BuildRequires: rpmbuild(macros) >= 1.224 -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # directory where you store the plugin @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.4 2005/06/23 12:54:15 glen - rpmmacros assigned (1.224) ================================================================ Index: SPECS/gplflash.spec diff -u SPECS/gplflash.spec:1.9 SPECS/gplflash.spec:1.10 --- SPECS/gplflash.spec:1.9 Tue Aug 23 19:02:05 2005 +++ SPECS/gplflash.spec Tue Aug 23 20:10:13 2005 @@ -76,7 +76,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: mozilla-plugin-flash Obsoletes: mozilla-plugin-gplflash -Requires: browser-plugins +Requires: browser-plugins(%{_target_cpu}) # use macro, otherwise extra LF inserted along with the ifarch %ifarch %{ix86} ppc sparc sparc64 @@ -186,6 +186,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 18:10:13 glen +- require correct arch of browser-plugins + Revision 1.9 2005/08/23 17:02:05 glen - typos fixed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.29&r2=1.30&f=u http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 20:14:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:14:06 Modified files: browser-plugins.spec Log message: - include VR in virtual prov, rel 2 Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.5 -r1.6 --- browser-plugins.spec 23 Aug 2005 18:07:14 -0000 1.5 +++ browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture From glen at pld-linux.org Tue Aug 23 20:14:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec - include VR in virtual prov, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:14:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - include VR in virtual prov, rel 2 ---- Files affected: SPECS: browser-plugins.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.5 SPECS/browser-plugins.spec:1.6 --- SPECS/browser-plugins.spec:1.5 Tue Aug 23 20:07:14 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:14:05 2005 @@ -6,10 +6,10 @@ Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins Version: 1.0 -Release: 1.2 +Release: 2 License: GPL Group: Base -Provides: %{name}(%{_target_cpu}) +Provides: %{name}(%{_target_cpu}) = %{version}-%{release} URL: http://www.mozilla.org/projects/plugins/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:14:05 glen +- include VR in virtual prov, rel 2 + Revision 1.5 2005/08/23 18:07:14 glen - provide virtual to identify built archdecture ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Tue Aug 23 20:19:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rpm-macros.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:19:50 Modified files: rpm-macros.spec Log message: - rpm macros 1.233 Index: rpm-macros.spec =================================================================== RCS file: /cvsroot/SPECS/rpm-macros.spec,v diff -d -u -r1.18 -r1.19 --- rpm-macros.spec 15 Jul 2005 11:15:25 -0000 1.18 +++ rpm-macros.spec 23 Aug 2005 18:19:49 -0000 1.19 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 From glen at pld-linux.org Tue Aug 23 20:19:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: rpm-macros.spec - rpm macros 1.233 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:19:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rpm macros 1.233 ---- Files affected: SPECS: rpm-macros.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.18 SPECS/rpm-macros.spec:1.19 --- SPECS/rpm-macros.spec:1.18 Fri Jul 15 13:15:25 2005 +++ SPECS/rpm-macros.spec Tue Aug 23 20:19:49 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.233 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 18:19:49 glen +- rpm macros 1.233 + Revision 1.18 2005/07/15 11:15:25 glen - rpm macros 1.231 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 20:32:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - allow additional dir... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:32:10 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - allow additional dirs to wipe .py files in %py_postclean ---- Files affected: SOURCES: rpm.macros (1.158.4.54 -> 1.158.4.55) SOURCES: rpm.macros (1.233 -> 1.234) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.54 SOURCES/rpm.macros:1.158.4.55 --- SOURCES/rpm.macros:1.158.4.54 Mon Jul 25 11:05:50 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -505,7 +505,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.233 SOURCES/rpm.macros:1.234 --- SOURCES/rpm.macros:1.233 Thu Aug 11 18:54:56 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:32:05 2005 @@ -508,7 +508,7 @@ # remove python sources, so that check-files won't complain # (idea by glen pld-linux org) %py_postclean() \ -for d in %{py_sitescriptdir} %{py_sitedir}; do \ +for d in %{py_sitescriptdir} %{py_sitedir} %*; do \ [ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 | xargs -0r -l512 rm;\ done \ %{nil} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.54&r2=1.158.4.55&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.233&r2=1.234&f=u From glen at pld-linux.org Tue Aug 23 20:33:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: PLD-doc: BuildRequires.txt - enhanced %py_postclean macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:33:15 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - enhanced %py_postclean macro ---- Files affected: PLD-doc: BuildRequires.txt (1.39 -> 1.40) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.39 PLD-doc/BuildRequires.txt:1.40 --- PLD-doc/BuildRequires.txt:1.39 Tue Aug 16 01:32:09 2005 +++ PLD-doc/BuildRequires.txt Tue Aug 23 20:33:10 2005 @@ -119,6 +119,8 @@ # %py_postclean BuildRequires: rpmbuild(macros) >= 1.219 +# %py_postclean with additional dirs to wipe .py files from +BuildRequires: rpmbuild(macros) >= 1.234 # %gconf_schema_uninstall BuildRequires: rpmbuild(macros) >= 1.198 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.39&r2=1.40&f=u From twittner at pld-linux.org Tue Aug 23 20:39:14 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: darkice.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 20:39:12 Modified files: darkice.spec Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. Index: darkice.spec =================================================================== RCS file: /cvsroot/SPECS/darkice.spec,v diff -d -u -r1.20 -r1.21 --- darkice.spec 22 Aug 2005 14:50:06 -0000 1.20 +++ darkice.spec 23 Aug 2005 18:39:11 -0000 1.21 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ From twittner at pld-linux.org Tue Aug 23 20:39:17 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: darkice.spec - reverted last blekot's change - I've checked... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 18:39:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted last blekot's change - I've checked (and lost some my precious time) - it builds with lame-libs-devel-3.96.1-2 on my box - lame-libs-static is not needed. ---- Files affected: SPECS: darkice.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/darkice.spec diff -u SPECS/darkice.spec:1.20 SPECS/darkice.spec:1.21 --- SPECS/darkice.spec:1.20 Mon Aug 22 16:50:06 2005 +++ SPECS/darkice.spec Tue Aug 23 20:39:11 2005 @@ -15,7 +15,7 @@ URL: http://darkice.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: lame-libs-static +BuildRequires: lame-libs-devel BuildRequires: libstdc++-devel BuildRequires: libvorbis-devel >= 1:1.0 BuildRequires: readline-devel @@ -75,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/23 18:39:11 twittner +- reverted last blekot's change - I've checked (and lost some my precious + time) - it builds with lame-libs-devel-3.96.1-2 on my box - + lame-libs-static is not needed. + Revision 1.20 2005/08/22 14:50:06 blekot - BR: s/lame-libs-devel/lame-libs-static/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkice.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Tue Aug 23 20:44:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES (AC-branch): rpm.macros, rpm.macros - %nsplugin_install fi... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:44:05 2005 GMT Module: SOURCES Tag: AC-branch ---- Log message: - %nsplugin_install fix: check for target dir existence, if installing on alien base arch (i686 package on amd64) as the dependencies are basename based ---- Files affected: SOURCES: rpm.macros (1.158.4.55 -> 1.158.4.56) SOURCES: rpm.macros (1.234 -> 1.235) ---- Diffs: ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.158.4.55 SOURCES/rpm.macros:1.158.4.56 --- SOURCES/rpm.macros:1.158.4.55 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -719,7 +719,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ Index: SOURCES/rpm.macros diff -u SOURCES/rpm.macros:1.234 SOURCES/rpm.macros:1.235 --- SOURCES/rpm.macros:1.234 Tue Aug 23 20:32:05 2005 +++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005 @@ -722,7 +722,7 @@ # written by glen@pld-linux.org. %nsplugin_install(d:) { \ # create link if it's first install of either of the packages \ -if [ "$1" = "1" ] && [ "$2" = "1" ]; then \ +if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \ ( \ %( \ for file in %{*}; do \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.55&r2=1.158.4.56&f=u http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.234&r2=1.235&f=u From glen at pld-linux.org Tue Aug 23 20:45:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:45:30 Modified files: macromedia-flash.spec Log message: - make i686 package install on amd64 Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.30 -r1.31 --- macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30 +++ macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:45:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - make i686 package install on amd64 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:45:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - make i686 package install on amd64 ---- Files affected: SPECS: macromedia-flash.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.30 SPECS/macromedia-flash.spec:1.31 --- SPECS/macromedia-flash.spec:1.30 Tue Aug 23 20:10:13 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 20:45:30 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 7.0r25 -Release: 2.23%{?with_license_agreement:wla} +Release: 2.26%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} @@ -22,7 +22,7 @@ Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flash/ -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: /usr/bin/builder @@ -94,18 +94,22 @@ %triggerin -- mozilla %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerun -- mozilla %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt -umask 022 -rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat -if [ -x /usr/bin/regxpcom ]; then - MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom +if [ -d /usr/%{_lib}/mozilla ]; then + umask 022 + rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat + if [ -x /usr/bin/regxpcom ]; then + MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom + fi fi %triggerin -- konqueror @@ -140,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/23 18:45:30 glen +- make i686 package install on amd64 + Revision 1.30 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Tue Aug 23 20:46:13 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: template-browser-plugin.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:46:11 Modified files: template-browser-plugin.spec Log message: - up macros requirement for installing cross-arch packages Index: template-browser-plugin.spec =================================================================== RCS file: /cvsroot/SPECS/template-browser-plugin.spec,v diff -d -u -r1.5 -r1.6 --- template-browser-plugin.spec 23 Aug 2005 18:10:13 -0000 1.5 +++ template-browser-plugin.spec 23 Aug 2005 18:46:11 -0000 1.6 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins From glen at pld-linux.org Tue Aug 23 20:46:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: template-browser-plugin.spec - up macros requirement for in... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up macros requirement for installing cross-arch packages ---- Files affected: SPECS: template-browser-plugin.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/template-browser-plugin.spec diff -u SPECS/template-browser-plugin.spec:1.5 SPECS/template-browser-plugin.spec:1.6 --- SPECS/template-browser-plugin.spec:1.5 Tue Aug 23 20:10:13 2005 +++ SPECS/template-browser-plugin.spec Tue Aug 23 20:46:11 2005 @@ -10,7 +10,7 @@ Release: 0.1 License: GPL Group: X11/Applications/Multimedia -BuildRequires: rpmbuild(macros) >= 1.224 +BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/23 18:46:11 glen +- up macros requirement for installing cross-arch packages + Revision 1.5 2005/08/23 18:10:13 glen - require correct arch of browser-plugins ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-browser-plugin.spec?r1=1.5&r2=1.6&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 20:53:34 Modified files: man.spec Log message: - updated to 1.6a - added URL - adaptarized - sorted BR Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.102 -r1.103 --- man.spec 9 Aug 2005 18:37:01 -0000 1.102 +++ man.spec 23 Aug 2005 18:53:33 -0000 1.103 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it From paszczus at pld-linux.org Tue Aug 23 20:53:39 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: man.spec - updated to 1.6a - added URL - adaptarized - sort... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 18:53:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.6a - added URL - adaptarized - sorted BR ---- Files affected: SPECS: man.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.102 SPECS/man.spec:1.103 --- SPECS/man.spec:1.102 Tue Aug 9 20:37:01 2005 +++ SPECS/man.spec Tue Aug 23 20:53:33 2005 @@ -10,12 +10,12 @@ Summary(ru): ????? ?????? ??? ????????????: man, apropos ? whatis Summary(uk): ????? ?????? ??? ????????????: man, apropos ?? whatis Name: man -Version: 1.5p -Release: 2 +Version: 1.6a +Release: 1 License: GPL Group: Applications/System -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/%{name}-%{version}.tar.gz -# Source0-md5: 037d5644f8ef9ea0ef22b271bae0297d +Source0: http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz +# Source0-md5: d53114b9ec030be32b858b1618da3c25 Source1: makewhatis.crondaily Source2: makewhatis.cronweekly Source3: %{name}-additional-%{name}-pages.tar.bz2 @@ -36,15 +36,16 @@ Patch13: %{name}-fmntbug.patch Patch14: %{name}-awk_path.patch Patch15: %{name}-cgi_paths.patch +URL: http://primates.ximian.com/~flucifredi/man/ BuildRequires: less Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk +Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less Requires: mktemp >= 1.5-8 -Requires: FHS >= 2.3-12 Obsoletes: man-cs Obsoletes: man-da Obsoletes: man-de @@ -141,12 +142,12 @@ Requires: crondaemon %description whatis -This package provides the following utilities: -apropos, whatis and makewhatis. +This package provides the following utilities: apropos, whatis and +makewhatis. %description whatis -l pl -Ten pakiet dostracza nast?puj?ce narz?dzia: -apropos, whatis i makewhatis. +Ten pakiet dostracza nast?puj?ce narz?dzia: apropos, whatis i +makewhatis. %package -n man2html Summary: manroff to html converter @@ -208,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} -%{__make} \ + make \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -368,8 +369,8 @@ %files whatis %defattr(644,root,root,755) -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.weekly/makewhatis -%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.daily/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.weekly/makewhatis +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/makewhatis %attr(755,root,root) %{_bindir}/apropos %attr(755,root,root) %{_bindir}/whatis %attr(755,root,root) %{_sbindir}/makewhatis @@ -429,6 +430,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/23 18:53:33 paszczus +- updated to 1.6a +- added URL +- adaptarized +- sorted BR + Revision 1.102 2005/08/09 18:37:01 charles - added subpackage -whatis, since he requires crondaemon and relations resulting from it ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.102&r2=1.103&f=u From paszczus at pld-linux.org Tue Aug 23 20:53:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:32 2005 Subject: DISTFILES: man-1.6a.tar.gz man-additional-man-pages.tar.bz2 Message-ID: <9685.1124823224@distfiles.pld-linux.org> Files fetched: 1 STORED: http://primates.ximian.com/~flucifredi/man/man-1.6a.tar.gz d53114b9ec030be32b858b1618da3c25 man-1.6a.tar.gz Size: 234660 bytes ALREADY GOT: no-url://man-additional-man-pages.tar.bz2 16c3fde2243289524cf40c1d2e7150e4 man-additional-man-pages.tar.bz2 -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 20:54:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:54:26 Modified files: browser-plugins.spec Log message: - listing browsers (please complete the list if you find somebody missing) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.6 -r1.7 --- browser-plugins.spec 23 Aug 2005 18:14:05 -0000 1.6 +++ browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:54:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec - listing browsers (please complete th... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:54:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - listing browsers (please complete the list if you find somebody missing) ---- Files affected: SPECS: browser-plugins.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.6 SPECS/browser-plugins.spec:1.7 --- SPECS/browser-plugins.spec:1.6 Tue Aug 23 20:14:05 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:54:24 2005 @@ -2,6 +2,14 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. +# known browsers from PLD CVS: +# - mozilla +# - mozilla-firefox +# - konqueror +# - opera (ix86 only) +# - galeon +# - skipstone +# - kazehakase Summary: Base package for web browser plugins Summary(pl): Podstawowy pakiet dla wtyczek przegl?darek WWW Name: browser-plugins @@ -52,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/23 18:54:24 glen +- listing browsers (please complete the list if you find somebody missing) + Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Tue Aug 23 20:55:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:55:18 Modified files: browser-plugins.spec Log message: - i belive browser is a thing (fix last commit msg) Index: browser-plugins.spec =================================================================== RCS file: /cvsroot/SPECS/browser-plugins.spec,v diff -d -u -r1.7 -r1.8 --- browser-plugins.spec 23 Aug 2005 18:54:24 -0000 1.7 +++ browser-plugins.spec 23 Aug 2005 18:55:18 -0000 1.8 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 From glen at pld-linux.org Tue Aug 23 20:55:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: browser-plugins.spec - i belive browser is a thing (fix las... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:55:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - i belive browser is a thing (fix last commit msg) ---- Files affected: SPECS: browser-plugins.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/browser-plugins.spec diff -u SPECS/browser-plugins.spec:1.7 SPECS/browser-plugins.spec:1.8 --- SPECS/browser-plugins.spec:1.7 Tue Aug 23 20:54:24 2005 +++ SPECS/browser-plugins.spec Tue Aug 23 20:55:18 2005 @@ -2,7 +2,7 @@ # TODO # - convert all plugin packages to store their plugins in this base # directory. -# known browsers from PLD CVS: +# known NPAPI compatible browsers from PLD CVS: # - mozilla # - mozilla-firefox # - konqueror @@ -60,8 +60,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 18:55:18 glen +- i belive browser is a thing (fix last commit msg) + Revision 1.7 2005/08/23 18:54:24 glen -- listing browsers (please complete the list if you find somebody missing) +- listing browsers (please complete the list if you find something missing) Revision 1.6 2005/08/23 18:14:05 glen - include VR in virtual prov, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/browser-plugins.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Tue Aug 23 20:57:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 20:57:27 Modified files: w32codec.spec Log message: - use without macro Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.70 -r1.71 --- w32codec.spec 15 Apr 2005 07:15:57 -0000 1.70 +++ w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs From glen at pld-linux.org Tue Aug 23 20:57:32 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: w32codec.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 18:57:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: w32codec.spec (1.70 -> 1.71) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.70 SPECS/w32codec.spec:1.71 --- SPECS/w32codec.spec:1.70 Fri Apr 15 09:15:57 2005 +++ SPECS/w32codec.spec Tue Aug 23 20:57:26 2005 @@ -50,7 +50,7 @@ Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie files. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: @@ -62,7 +62,7 @@ Biblioteki niezb?dne do kompresji/dekompresji film?w. S? one wykorzystywane przez odtwarzacze, ale mog? by? u?yte do tworzenia kompresowanych plik?w z filmami. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -86,7 +86,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -151,7 +151,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/codecs/*_linuxELFx86c6.xa %endif -%if ! %{with license_agreement} +%if %{without license_agreement} %pre echo " License issues made us not to include inherent files into @@ -180,6 +180,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.71 2005/08/23 18:57:26 glen +- use without macro + Revision 1.70 2005/04/15 07:15:57 tommat - update to 20050412 @@ -276,8 +279,9 @@ - Source[67] (dmo and mjpeg2k) allready included in Source0, - new Source6 (vanguard), - removed duplicated xanim files, -- NOTE: - not all of there files are win32! - - there are overlapping files in rp8 and rp9. +- NOTE: + - not all of there files are win32! + - there are overlapping files in rp8 and rp9. Revision 1.41 2003/05/25 06:27:47 misi3k - massive attack s/pld.org.pl/pld-linux.org/ @@ -337,7 +341,7 @@ - fixed bcond Revision 1.23 2002/08/02 17:55:02 kloczek -- release 4: reverse %%{?with_license_agreement} macro - now by default will +- release 4: reverse %{?with_license_agreement} macro - now by default will be builded empty package. Revision 1.22 2002/07/28 12:14:42 kloczek @@ -354,7 +358,7 @@ Group field using gettext). Revision 1.18 2002/01/28 10:31:00 marcus -- s/%%{x86}/%%{ix86}/g +- s/%{x86}/%{ix86}/g Revision 1.17 2002/01/18 02:15:18 kloczek - perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" @@ -398,7 +402,7 @@ - typo Revision 1.4 2001/07/30 10:04:18 kloczek -- release 2: added "ExclusiveArch: %%{ix86}". +- release 2: added "ExclusiveArch: %{ix86}". Revision 1.3 2001/07/28 22:56:45 qboosh - added Obsoletes: avi-codecs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.70&r2=1.71&f=u From glen at pld-linux.org Tue Aug 23 21:17:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:28 Modified files: macromedia-flash.spec Log message: - sync requires from w32codec.spec Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.31 -r1.32 --- macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31 +++ macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 From glen at pld-linux.org Tue Aug 23 21:17:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - sync requires from w32codec.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sync requires from w32codec.spec ---- Files affected: SPECS: macromedia-flash.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.31 SPECS/macromedia-flash.spec:1.32 --- SPECS/macromedia-flash.spec:1.31 Tue Aug 23 20:45:30 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:25 2005 @@ -25,7 +25,10 @@ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} -Requires: /usr/bin/builder +Requires: cpio +Requires: rpm-build-tools +Requires: unzip +Requires: wget %endif Obsoletes: flash-plugin Obsoletes: mozilla-plugin-macromedia-flash @@ -144,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 19:17:25 glen +- sync requires from w32codec.spec + Revision 1.31 2005/08/23 18:45:30 glen - make i686 package install on amd64 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 21:17:52 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:17:50 Modified files: macromedia-flash.spec Log message: - unzip unneccessary Index: macromedia-flash.spec =================================================================== RCS file: /cvsroot/SPECS/macromedia-flash.spec,v diff -d -u -r1.32 -r1.33 --- macromedia-flash.spec 23 Aug 2005 19:17:25 -0000 1.32 +++ macromedia-flash.spec 23 Aug 2005 19:17:50 -0000 1.33 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec From glen at pld-linux.org Tue Aug 23 21:17:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: macromedia-flash.spec - unzip unneccessary In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:17:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unzip unneccessary ---- Files affected: SPECS: macromedia-flash.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.32 SPECS/macromedia-flash.spec:1.33 --- SPECS/macromedia-flash.spec:1.32 Tue Aug 23 21:17:25 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 21:17:50 2005 @@ -27,7 +27,6 @@ %if %{without license_agreement} Requires: cpio Requires: rpm-build-tools -Requires: unzip Requires: wget %endif Obsoletes: flash-plugin @@ -147,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 19:17:50 glen +- unzip unneccessary + Revision 1.32 2005/08/23 19:17:25 glen - sync requires from w32codec.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.32&r2=1.33&f=u From paszczus at pld-linux.org Tue Aug 23 21:18:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: man.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: paszczus 05/08/23 21:18:09 Modified files: man.spec Log message: - backing to %{__make} Index: man.spec =================================================================== RCS file: /cvsroot/SPECS/man.spec,v diff -d -u -r1.103 -r1.104 --- man.spec 23 Aug 2005 18:53:33 -0000 1.103 +++ man.spec 23 Aug 2005 19:18:09 -0000 1.104 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL From paszczus at pld-linux.org Tue Aug 23 21:18:14 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: man.spec - backing to %{__make} In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 19:18:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - backing to %{__make} ---- Files affected: SPECS: man.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.103 SPECS/man.spec:1.104 --- SPECS/man.spec:1.103 Tue Aug 23 20:53:33 2005 +++ SPECS/man.spec Tue Aug 23 21:18:09 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - make \ + %{__make} \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/23 19:18:09 paszczus +- backing to %{__make} + Revision 1.103 2005/08/23 18:53:33 paszczus - updated to 1.6a - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.103&r2=1.104&f=u From twittner at pld-linux.org Tue Aug 23 21:18:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: luma.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: twittner 05/08/23 21:18:44 Modified files: luma.spec Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. Index: luma.spec =================================================================== RCS file: /cvsroot/SPECS/luma.spec,v diff -d -u -r1.8 -r1.9 --- luma.spec 22 Aug 2005 21:33:56 -0000 1.8 +++ luma.spec 23 Aug 2005 19:18:44 -0000 1.9 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog From twittner at pld-linux.org Tue Aug 23 21:18:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:32 2005 Subject: SPECS: luma.spec - truly noarch - %%_libdir replaced with %%{_pref... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 19:18:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - truly noarch - %%_libdir replaced with %%{_prefix}/lib. ---- Files affected: SPECS: luma.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/luma.spec diff -u SPECS/luma.spec:1.8 SPECS/luma.spec:1.9 --- SPECS/luma.spec:1.8 Mon Aug 22 23:33:56 2005 +++ SPECS/luma.spec Tue Aug 23 21:18:44 2005 @@ -39,11 +39,11 @@ --prefix=$RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_bindir}/luma -echo '#!%{__python} %{_libdir}/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma +echo '#!%{__python} %{_prefix}/lib/%{name}/luma.py' > $RPM_BUILD_ROOT%{_bindir}/luma install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/luma-48.png $RPM_BUILD_ROOT%{_pixmapsdir}/luma.png -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_prefix}/lib/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_bindir}/* -%{_libdir}/%{name} +%{_prefix}/lib/%{name} %{_datadir}/%{name} %{_mandir}/man1/* %{_desktopdir}/* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 19:18:44 twittner +- truly noarch - %%_libdir replaced with %%{_prefix}/lib. + Revision 1.8 2005/08/22 21:33:56 twittner - fixed my previous commit message in changelog ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/luma.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Tue Aug 23 21:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:32 2005 Subject: SOURCES: license-installer.sh - mirrors file not present, disable ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:20:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - mirrors file not present, disable mirrors file ---- Files affected: SOURCES: license-installer.sh (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.2 SOURCES/license-installer.sh:1.3 --- SOURCES/license-installer.sh:1.2 Tue Aug 23 19:58:56 2005 +++ SOURCES/license-installer.sh Tue Aug 23 21:20:31 2005 @@ -26,7 +26,7 @@ cp -i "$3" $SPECDIR || exit 1 fi ( cd $SPECDIR - /usr/bin/builder -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec + /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec if [ "$?" -ne 0 ]; then exit 2 fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Tue Aug 23 21:26:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: w32codec.spec (HEAD) In-Reply-To: References: Message-ID: Module name: SPECS Changes by: glen 05/08/23 21:26:18 Modified files: w32codec.spec Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) Index: w32codec.spec =================================================================== RCS file: /cvsroot/SPECS/w32codec.spec,v diff -d -u -r1.71 -r1.72 --- w32codec.spec 23 Aug 2005 18:57:26 -0000 1.71 +++ w32codec.spec 23 Aug 2005 19:26:18 -0000 1.72 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro From glen at pld-linux.org Tue Aug 23 21:26:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: w32codec.spec - use shared installer script from SOURCES - ... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:26:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared installer script from SOURCES - removed independent of available version hack (sorry ankry), the releases aren't that often that this is really neccessary, wait for new package on ftp instead. i choose unified(+readable+maintainable) scripts over this hack (which btw didn't work right now for me) - NoSource for those binary files (i don't think they're distributable) ---- Files affected: SPECS: w32codec.spec (1.71 -> 1.72) ---- Diffs: ================================================================ Index: SPECS/w32codec.spec diff -u SPECS/w32codec.spec:1.71 SPECS/w32codec.spec:1.72 --- SPECS/w32codec.spec:1.71 Tue Aug 23 20:57:26 2005 +++ SPECS/w32codec.spec Tue Aug 23 21:26:18 2005 @@ -1,24 +1,18 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package # %define source_url ftp://ftp1.mplayerhq.hu/MPlayer/releases/codecs/ -# don't remove this macro -%define get_version %(cd %{tmpdir};rm -f index.html;wget --passive-ftp %{source_url}>/dev/null 2>&1;grep '>all-.*\.tar\.bz2' index.html|sed -e 's:\.tar\.bz2.*::' -e 's:.*>all-::'|sort|tail -n1;rm -f index.html) Summary: Binary compression/decompression libraries used by movie players Summary(pl): Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy film?w %define base_name w32codec -%define _version 20050412 %if %{with license_agreement} Name: %{base_name} -# don't change the following line -Version: %{_version} %else Name: %{base_name}-installer -Version: %{_version} %endif -Release: 1%{?with_license_agreement:wla} +Version: 20050412 +Release: 1.3%{?with_license_agreement:wla} Group: Libraries License: Free for non-commercial use %if %{with license_agreement} @@ -29,14 +23,17 @@ #Source4: %{source_url}rp9codecs.tar.bz2 #Source5: %{source_url}xanimdlls.tar.bz2 Source6: http://www.ezgoal.com/dll_files/tsd32.zip +BuildRequires: unzip Provides: avi-codecs Obsoletes: avi-codecs Obsoletes: w32codec-qt -BuildRequires: unzip +NoSource: 0 +NoSource: 6 %else +Source0: license-installer.sh Requires: cpio -Requires: unzip Requires: rpm-build-tools +Requires: unzip Requires: wget Provides: %{base_name} %endif @@ -44,8 +41,6 @@ ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define w32codecDIR ftp://ftp.pld-linux.org/dists/ac/PLD/SRPMS/SRPMS - %description Libraries required to compress/decompress content of movie files. They are used by movie players, but can be used to create compressed movie @@ -89,61 +84,15 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=\$(cd \$RPMDIR;ls -t %{base_name}-*-%{release}wla.%{_target_cpu}.rpm|head -n1) - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -sed '0,/^Version:.*%%{_version}/s/{_version}/{get_version}/' < %{_specdir}/%{base_name}.spec > $RPM_BUILD_ROOT%{_datadir}/%{base_name}/%{base_name}.spec +install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} %else install -d $RPM_BUILD_ROOT%{_libdir}/codecs @@ -153,13 +102,7 @@ %if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %clean @@ -180,6 +123,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.72 2005/08/23 19:26:18 glen +- use shared installer script from SOURCES +- removed independent of available version hack (sorry ankry), + the releases aren't that often that this is really neccessary, wait for new + package on ftp instead. i choose unified(+readable+maintainable) scripts + over this hack (which btw didn't work right now for me) +- NoSource for those binary files (i don't think they're distributable) + Revision 1.71 2005/08/23 18:57:26 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/w32codec.spec?r1=1.71&r2=1.72&f=u From arekm at pld-linux.org Tue Aug 23 21:27:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:33 2005 Subject: CVSROOT: logdiff.pl, loginfo -m option no longer required In-Reply-To: References: Message-ID: Author: arekm Date: Tue Aug 23 19:27:06 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: -m option no longer required ---- Files affected: CVSROOT: logdiff.pl (1.41 -> 1.42) , loginfo (1.197 -> 1.198) ---- Diffs: ================================================================ Index: CVSROOT/logdiff.pl diff -u CVSROOT/logdiff.pl:1.41 CVSROOT/logdiff.pl:1.42 --- CVSROOT/logdiff.pl:1.41 Mon Jul 28 12:42:50 2003 +++ CVSROOT/logdiff.pl Tue Aug 23 21:27:01 2005 @@ -256,8 +256,6 @@ @ARGVX = $arg; } } -($mailto) || die("No -m mail recipient specified\n"); - ## for now, the first "file" is the repository directory being committed, ## relative to the $CVSROOT location @@ -295,7 +293,10 @@ &do_changes_file($commitlog, @text); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -323,7 +324,10 @@ push(@text, " ".$_); } - &mail_notification(@text); + if ($mailto) + { + &mail_notification(@text); + } exit 0; } @@ -558,7 +562,10 @@ ## ## Mail out the notification. ## -&mail_notification(@plain_txt); +if ($mailto) +{ + &mail_notification(@plain_txt); +} exit 0; # vim: ts=4 sw=4 et noai nosi cin ================================================================ Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.197 CVSROOT/loginfo:1.198 --- CVSROOT/loginfo:1.197 Tue Aug 23 19:26:17 2005 +++ CVSROOT/loginfo Tue Aug 23 21:27:01 2005 @@ -24,7 +24,7 @@ #DEFAULT /cvsroot/CVSROOT/cvslog.pl %{sVv} $USER -^SPECS /cvsroot/CVSROOT/logdiff.pl -m pld-cvs-commit@pld-linux.org --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} +^SPECS /cvsroot/CVSROOT/logdiff.pl --distfiles dfadm@cvs-real.pld-linux.org --diffs --module SPECS --logfile commits.log %{sVv} ^cdg /cvsroot/CVSROOT/cdg.sh %{sVv} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/logdiff.pl?r1=1.41&r2=1.42&f=u http://cvs.pld-linux.org/CVSROOT/loginfo?r1=1.197&r2=1.198&f=u From glen at pld-linux.org Tue Aug 23 21:28:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: builder - CVS/Entries might not always present, hide errors In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:28:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - CVS/Entries might not always present, hide errors ---- Files affected: SPECS: builder (1.323 -> 1.324) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.323 SPECS/builder:1.324 --- SPECS/builder:1.323 Sun Aug 21 19:35:46 2005 +++ SPECS/builder Tue Aug 23 21:28:11 2005 @@ -512,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -974,7 +974,7 @@ # --- # * -selinux # samba -mysql -pgsql - # w32codec license_agreement + # w32codec-installer license_agreement # php +mysqli # --- if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.323&r2=1.324&f=u From glen at pld-linux.org Tue Aug 23 21:39:40 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: builder - up from SPECS HEAD, rev 1.324 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:39:39 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up from SPECS HEAD, rev 1.324 ---- Files affected: SOURCES: builder (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/builder diff -u SOURCES/builder:1.11 SOURCES/builder:1.12 --- SOURCES/builder:1.11 Sat Aug 14 04:23:46 2004 +++ SOURCES/builder Tue Aug 23 21:39:34 2005 @@ -2,15 +2,18 @@ # ----------- # $Id$ # Exit codes: -# 0 - succesful -# 1 - help displayed -# 2 - no spec file name in cmdl parameters -# 3 - spec file not stored in repo -# 4 - some source, patch or icon files not stored in repo -# 5 - package build failed -# 6 - spec file with errors -# 7 - wrong source in /etc/poldek.conf -# 8 - Failed installing buildrequirements and subrequirements +# 0 - succesful +# 1 - help displayed +# 2 - no spec file name in cmdl parameters +# 3 - spec file not stored in repo +# 4 - some source, patch or icon files not stored in repo +# 5 - package build failed +# 6 - spec file with errors +# 7 - wrong source in /etc/poldek.conf +# 8 - Failed installing buildrequirements and subrequirements +# 9 - Requested tag already exist +# 10 - Refused to build fractional release +# 100 - Unknown error (should not happen) # Notes (todo): # - builder -u fetches current version first @@ -23,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.11 (C) 1999-2004 Free Penguins". +V 0.12 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" @@ -42,6 +45,7 @@ UPDATE5="" ADD5="" NO5="" +ADAPTERIZE="" ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"} CVSROOT="" @@ -64,6 +68,7 @@ RPMOPTS="" BCOND="" GROUP_BCONDS="no" +CVSIGNORE_DF="no" PATCHES="" SOURCES="" @@ -80,30 +85,18 @@ CVS_SERVER="cvs.pld-linux.org" DISTFILES_SERVER="://distfiles.pld-linux.org" +ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org" -DEF_NICE_LEVEL=0 +DEF_NICE_LEVEL=19 FAIL_IF_NO_SOURCES="yes" -wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" -wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - -GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" -GETLOCAL="cp -a" - -if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then - RPM="rpm" - RPMBUILD="rpm" +if [ -x /usr/bin/rpm-getdeps ]; then + FETCH_BUILD_REQUIRES_RPMGETDEPS="yes" else - RPM="rpm" - RPMBUILD="rpmbuild" + FETCH_BUILD_REQUIRES_RPMGETDEPS="no" fi -POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" -POLDEK_SOURCE="cvs" -POLDEK_CMD="/usr/bin/poldek --noask" - # Here we load saved user environment used to # predefine options set above, or passed to builder # in command line. @@ -121,6 +114,7 @@ #GROUP_BCONDS="yes" #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE' # +SU_SUDO="" if [ -n "$HOME_ETC" ]; then USER_CFG="$HOME_ETC/.builderrc" else @@ -129,6 +123,36 @@ [ -f "$USER_CFG" ] && . "$USER_CFG" +if [ -n "$USE_PROZILLA" ]; then + GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-O" +elif [ -n "$USE_AXEL" ]; then + GETURI="axel -a $AXEL_OPTS" + GETURI2="$GETURI" + OUTFILEOPT="-o" +else + wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" + wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" + + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" + GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" + OUTFILEOPT="-O" +fi + +GETLOCAL="cp -a" + +if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then + RPM="rpm" + RPMBUILD="rpm" +else + RPM="rpm" + RPMBUILD="rpmbuild" +fi + +POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/" +POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask" + run_poldek() { RES_FILE=~/tmp/poldek-exit-status.$RANDOM @@ -137,7 +161,7 @@ if [ -n "$LASTLOG_FILE" ]; then echo "LASTLOG=$LOG" > $LASTLOG_FILE fi - (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee $LOG + (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG return $exit_pldk else (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null @@ -146,17 +170,6 @@ fi } -# Example grep cvs /etc/poldek.conf: -# source = cvs /home/users/yoshi/rpm/RPMS/ -if [ "$UPDATE_POLDEK_INDEXES" = "yes" ]; then - run_poldek -l -n ${POLDEK_SOURCE} 1>&2 > /dev/null - if [ ! "$?" == "0" ]; then - echo "Using improper source '${POLDEK_SOURCE}' in /etc/poldek.conf" - echo "Fix it and try to continue" - exit 7 - fi -fi - #--------------------------------------------- # functions @@ -175,11 +188,13 @@ [{-Tp|--tag-prefix} ] [{-tt|--test-tag}] [-nu|--no-urls] [-v|--verbose] [--opts ] [--with/--without ] [--define ] [.spec] - + -5, --update-md5 - update md5 comments in spec, implies -nd -ncs +--adapter[ize] - run adapter.awk on SPECFILE -a5, --add-md5 - add md5 comments to URL sources, implies -nc -nd -ncs -n5, --no-md5 - ignore md5 comments in spec --D, --debug - enable script debugging mode, +-D, --debug - enable builder script debugging mode, +-debug - produce rpm debug package (same as --opts -debug) -V, --version - output builder version -a, --as_anon - get files via pserver as cvs@$CVS_SERVER, -b, -ba, --build - get all files from CVS repo or HTTP/FTP and build package @@ -192,7 +207,7 @@ -B, --branch - add branch -c, --clean - clean all temporarily created files (in BUILD, SOURCES, SPECS and \$RPM_BUILD_ROOT), --d , --cvsroot +-d , --cvsroot - setup \$CVSROOT, --define - define a macro with value , @@ -227,22 +242,30 @@ -FRB, --force-remove-build-requires - remove all you fetched with -R or --fetch-build-requires remember, this option works without confirmation, +-sf, --source-files - list sources - bare filenames (intended for offline + operations; does not work when Icon field is present + but icon file is absent), +-sp, --source-paths - list sources - filenames with full local paths (intended for + offline operations; does not work when Icon field is present + but icon file is absent), -T , --tag - add cvs tag for files, -Tvs, --tag-version-stable - - add cvs tags STABLE and NAME-VERSION-RELESE for files, + - add cvs tags STABLE and NAME-VERSION-RELEASE for files, -Tvn, --tag-version-nest - - add cvs tags NEST and NAME-VERSION-RELESE for files, + - add cvs tags NEST and NAME-VERSION-RELEASE for files, -Ts, --tag-stable - add cvs tag STABLE for files, -Tn, --tag-nest - add cvs tag NEST for files, -Tv, --tag-version - - add cvs tag NAME-VERSION-RELESE for files, + - add cvs tag NAME-VERSION-RELEASE for files, -Tp, --tag-prefix - add to NAME-VERSION-RELEASE tags, -tt, --test-tag - fail if tag is already present, +-ir, --integer-release-only + - allow only integer and snapshot releases -v, --verbose - be verbose, -u, --try-upgrade - check version, and try to upgrade package -un, --try-upgrade-with-float-version @@ -255,16 +278,20 @@ %_without_ macro switch. You may now use --with feat1 feat2 feat3 --without feat4 feat5 --with feat6 constructions. Set GROUP_BCONDS to yes to make use of it. ---target +--target , --target= - build for platform . " } cache_rpm_dump () { + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi rpm_dump_cache=` case "$RPMBUILD" in rpm ) - rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1 + rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1 ;; rpmbuild ) rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1 @@ -303,6 +330,13 @@ PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -n 1`" PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`" +# These variables may be unset after first cache_rpm_dump call +# (because of not-yet-retrieved icon file) +# +# if [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then +# Exit_error err_no_package_data; +# fi + if [ -n "$BE_VERBOSE" ]; then echo "- Sources : `nourl $SOURCES`" if [ -n "$PATCHES" ]; then @@ -347,7 +381,22 @@ remove_build_requires echo "Error: package build failed. (${2:-no more info})"; exit 5 ;; + "err_no_package_data" ) + remove_build_requires + echo "Error: couldn't get out package name/version/release from spec file." + exit 6 ;; + "err_tag_exists" ) + remove_build_requires + echo "Tag ${2} already exists (spec release: ${3})."; + exit 9 ;; + "err_fract_rel" ) + remove_build_requires + echo "Release ${2} not integer and not a snapshot."; + exit 10 ;; + esac + echo "Unknown error." + exit 100 } init_builder() @@ -423,7 +472,7 @@ chmod $CHMOD_MODE $SPECFILE fi unset OPTIONS - grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE + [ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE } find_mirror() @@ -463,7 +512,7 @@ no=$(src_no "$1") [ -z "$no" ] && return cd $SPECS_DIR - spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::) + spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::) if [ -z "$spec_rev" ]; then spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')" fi @@ -473,7 +522,17 @@ sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \ grep -E '^[0-9a-f]{32}$') if [ X"$md5" = X"" ] ; then - grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://' | xargs + source_md5=`grep -i "#[ ]*Source$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$source_md5" ] ; then + echo $source_md5; + else + # we have empty SourceX-md5, but it is still possible + # that we have NoSourceX-md5 AND NoSource: X + nosource_md5=`grep -i "#[ ]*NoSource$no-md5[ ]*:" $SPECFILE | sed -e 's/.*://'` + if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[ ]*$no$" $SPECFILE`" = X"" ] ; then + echo $nosource_md5; + fi; + fi; else if [ $(echo "$md5" | wc -l) != 1 ] ; then echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2 @@ -484,12 +543,12 @@ distfiles_url () { - echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$DISTFILES_SERVER/distfiles/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } distfiles_attic_url () { - echo "$PROTOCOL$DISTFILES_SERVER/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" + echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")" } good_md5 () @@ -499,6 +558,23 @@ [ "$md5" = "$(md5sum $(nourl "$1") 2> /dev/null | sed -e 's/ .*//')" ] } +good_size () +{ + size="$(find $(nourl "$1") -printf "%s" 2>/dev/null)" + [ -n "$size" -a "$size" -gt 0 ] +} + +cvsignore_df () +{ + if [ "$CVSIGNORE_DF" != "yes" ]; then + return + fi + cvsignore=${SOURCE_DIR}/.cvsignore + if ! grep -q "^$1\$" $cvsignore 2> /dev/null; then + echo "$1" >> $cvsignore + fi +} + get_files() { GET_FILES="$@" @@ -547,7 +623,7 @@ fi if [ -n "$(src_md5 "$i")" ] && [ -z "$NODIST" ]; then - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i"; then echo "$(nourl "$i") having proper md5sum already exists" continue fi @@ -561,9 +637,9 @@ if [ -z "$NOMIRRORS" ]; then url="`find_mirror "$url"`" fi - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi fi if ! test -s "$target"; then @@ -574,13 +650,15 @@ if [ -z "$NOMIRRORS" ]; then url_attic="`find_mirror "$url_attic"`" fi - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi fi - if ! test -s "$target"; then + if test -s "$target"; then + cvsignore_df $target + else rm -f "$target" FROM_DISTFILES=0 fi @@ -613,7 +691,7 @@ ${GETURI} "$im" || \ if [ `echo $im | grep -E 'ftp://'` ]; then ${GETURI2} "$im" - fi + fi fi fi @@ -634,8 +712,8 @@ ' \ $SPECS_DIR/$SPECFILE fi - - if good_md5 "$i"; then + + if good_md5 "$i" && good_size "$i"; then : elif [ "$FROM_DISTFILES" = 1 ]; then # wrong md5 from distfiles: remove the file and try again @@ -643,24 +721,24 @@ echo "MD5 sum mismatch. Trying full fetch." FROM_DISTFILES=2 rm -f $target - ${GETURI} -O "$target" "$url" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url" || \ if [ `echo $url | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url" + ${GETURI2} ${OUTFILEOPT} "$target" "$url" fi if ! test -s "$target"; then rm -f "$target" - ${GETURI} -O "$target" "$url_attic" || \ + ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \ if [ `echo $url_attic | grep -E 'ftp://'` ]; then - ${GETURI2} -O "$target" "$url_attic" + ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic" fi fi test -s "$target" || rm -f "$target" fi - if good_md5 "$i"; then + if good_md5 "$i" && good_size "$i" ; then : else - echo "MD5 sum mismatch. Use -U to refetch sources," + echo "MD5 sum mismatch or 0 size. Use -U to refetch sources," echo "or -5 to update md5 sums, if you're sure files are correct." Exit_error err_no_source_in_repo $i fi @@ -677,6 +755,12 @@ } make_tagver() { + + if [ -n "$DEBUG" ]; then + set -x; + set -v; + fi + # Check whether first character of PACKAGE_NAME is legal for tag name if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then TAG_PREFIX=tag_ @@ -807,16 +891,16 @@ eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE" eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE" parse_spec; + if [ -n "$ICONS" ]; then + get_files $ICONS; + parse_spec; + fi get_files "$SOURCES $PATCHES"; unset TOLDVER TNEWVER TNOTIFY fi fi cd "$SPECS_DIR" - - if [ -n "$TARGET" ]; then - TARGET_SWITCH="--target $TARGET" - fi - + case "$COMMAND" in build ) BUILD_SWITCH="-ba" ;; @@ -838,7 +922,7 @@ echo "LASTLOG=$LOG" > $LASTLOG_FILE fi RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM - (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG + (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG RETVAL=`cat $RES_FILE` rm $RES_FILE if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then @@ -849,7 +933,7 @@ fi fi else - eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH $TARGET_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE + eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE RETVAL=$? fi if [ "$RETVAL" -ne "0" ]; then @@ -860,7 +944,6 @@ Exit_error err_build_fail; fi unset BUILD_SWITCH - unset TARGET_SWITCH } nourl() @@ -868,7 +951,6 @@ echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g' } - install_required_packages() { run_poldek -vi $1 @@ -881,16 +963,56 @@ AVAIL_BCONDS_WITH="" if `grep -q ^%bcond ${SPECFILE}`; then BCOND_VERSION="NEW" - elif `grep -q bcond ${SPECFILE}`; then + elif `egrep -q ^#\ *_with ${SPECFILE}`; then BCOND_VERSION="OLD" else BCOND_VERSION="NONE" fi + + # expand bconds from ~/.bcondrc + # The file structure is like gentoo's package.use: + # --- + # * -selinux + # samba -mysql -pgsql + # w32codec-installer license_agreement + # php +mysqli + # --- + if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then + # This takes package name, first defined in spec. + # so consider that when defining flags for package. + PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1` + AVAIL=`$RPMBUILD --bcond $SPECFILE` + + BCONDRC=$HOME/.bcondrc + [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && BCONDRC=$HOME_ETC/.bcondrc + + while read pkg flags; do + # ignore comments + [[ "$pkg" == \#* ]] && continue + + # any package or current package? + if [ "$pkg" = "*" ] || [ "$pkg" = "$PN" ]; then + for flag in $flags; do + opt=${flag#[+-]} + + # use only flags which are in this package. + if [[ $AVAIL = *${opt}* ]]; then + if [[ $flag = -* ]]; then + BCOND="$BCOND --without $opt" + else + BCOND="$BCOND --with $opt" + fi + fi + done + fi + done < $BCONDRC + fi + case "${BCOND_VERSION}" in NONE) - : + : ;; - OLD) + OLD) echo "Warning: This spec has old style bconds. Fix it || die." for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_without_` do @@ -901,7 +1023,7 @@ AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT" fi done - + for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_with_` do AVAIL_BCOND_WITH=`echo $opt|sed -e "s/^_with_//g"` @@ -923,6 +1045,22 @@ _with) cond_type="with" ;; + _without_*) + AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`" + if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/builder?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Tue Aug 23 21:41:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: builder - v0.13 :) In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 19:41:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - v0.13 :) ---- Files affected: SPECS: builder (1.324 -> 1.325) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.324 SPECS/builder:1.325 --- SPECS/builder:1.324 Tue Aug 23 21:28:11 2005 +++ SPECS/builder Tue Aug 23 21:41:39 2005 @@ -26,7 +26,7 @@ VERSION="\ Build package utility from PLD CVS repository -V 0.12 (C) 1999-2005 Free Penguins". +V 0.13 (C) 1999-2005 Free Penguins". PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin" COMMAND="build" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.324&r2=1.325&f=u From pluto at pld-linux.org Tue Aug 23 21:59:36 2005 From: pluto at pld-linux.org (pluto) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: gcc.spec - %files updated, rebuild. In-Reply-To: References: Message-ID: Author: pluto Date: Tue Aug 23 19:59:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %files updated, rebuild. ---- Files affected: SPECS: gcc.spec (1.358 -> 1.359) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.358 SPECS/gcc.spec:1.359 --- SPECS/gcc.spec:1.358 Tue Aug 23 15:21:59 2005 +++ SPECS/gcc.spec Tue Aug 23 21:59:29 2005 @@ -41,7 +41,7 @@ Name: gcc Version: 4.1.0 %define _snap 20050823T1409UTC -Release: 0.%{_snap}.1 +Release: 0.%{_snap}.2 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1173,8 +1173,6 @@ %attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain %{_infodir}/fastjar* %{_infodir}/gcj* -%{_infodir}/hacking* -%{_infodir}/vmintegration* %{_mandir}/man1/fastjar* %{_mandir}/man1/gcj* %{_mandir}/man1/gjnih* @@ -1280,6 +1278,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.359 2005/08/23 19:59:29 pluto +- %files updated, rebuild. + Revision 1.358 2005/08/23 13:21:59 pluto - updated to 4.1.0-20050823T1409UTC. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.358&r2=1.359&f=u From glen at pld-linux.org Tue Aug 23 22:00:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: macromedia-flash.spec - update URL In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:00:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update URL ---- Files affected: SPECS: macromedia-flash.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.33 SPECS/macromedia-flash.spec:1.34 --- SPECS/macromedia-flash.spec:1.33 Tue Aug 23 21:17:50 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:00:05 2005 @@ -21,7 +21,7 @@ %else Source0: license-installer.sh %endif -URL: http://www.macromedia.com/software/flash/ +URL: http://www.macromedia.com/software/flashplayer/ BuildRequires: rpmbuild(macros) >= 1.235 Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/23 20:00:05 glen +- update URL + Revision 1.33 2005/08/23 19:17:50 glen - unzip unneccessary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.33&r2=1.34&f=u From twittner at pld-linux.org Tue Aug 23 22:11:04 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: man.spec - force make -j1 - simultaneous builds fail (repor... In-Reply-To: References: Message-ID: Author: twittner Date: Tue Aug 23 20:11:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ---- Files affected: SPECS: man.spec (1.104 -> 1.105) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.104 SPECS/man.spec:1.105 --- SPECS/man.spec:1.104 Tue Aug 23 21:18:09 2005 +++ SPECS/man.spec Tue Aug 23 22:10:58 2005 @@ -209,7 +209,7 @@ +lang all \ -confdir %{_sysconfdir} - %{__make} \ +%{__make} -j1 \ CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.105 2005/08/23 20:10:58 twittner +- force make -j1 - simultaneous builds fail (reported by paszczus, + confirmed by me) + Revision 1.104 2005/08/23 19:18:09 paszczus - backing to %{__make} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.104&r2=1.105&f=u From glen at pld-linux.org Tue Aug 23 22:16:31 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: horde-path.patch - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:16:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SOURCES: horde-path.patch (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SOURCES/horde-path.patch diff -u SOURCES/horde-path.patch:1.9 SOURCES/horde-path.patch:1.10 --- SOURCES/horde-path.patch:1.9 Mon May 9 19:57:40 2005 +++ SOURCES/horde-path.patch Tue Aug 23 22:16:24 2005 @@ -1,433 +1,14 @@ --- horde-3.0-rc3/config/registry.php.dist 2004-11-01 11:39:39.000000000 +0000 -+++ horde-3.0-rc3.new/config/registry.php.dist 2004-12-12 23:00:36.489047024 +0000 -@@ -45,7 +45,7 @@ - // variable uses forward slashes. If it does not, you'll have to tweak ++++ ./config/registry.php.dist 2005-08-23 23:15:12.000000000 +0300 +@@ -46,7 +46,7 @@ // this. if (isset($_SERVER['PHP_SELF'])) { -- $webroot = strstr(dirname(__FILE__), '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); -+ $webroot = strstr("/usr/share/horde", '/' . array_shift(preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY))); + $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY); +- $webroot = strstr(dirname(__FILE__), '/' . array_shift($webroot)); ++ $webroot = strstr("/usr/share/horde", '/' . array_shift($webroot)); if ($webroot !== false) { $webroot = preg_replace(';/config$;', '', $webroot); } else { -@@ -56,17 +56,17 @@ - } - - $this->applications['horde'] = array( -- 'fileroot' => dirname(__FILE__) . '/..', -+ 'fileroot' => '/usr/share/horde', - 'webroot' => $webroot, - 'initial_page' => 'login.php', - 'name' => _("Horde"), - 'status' => 'active', -- 'templates' => dirname(__FILE__) . '/../templates', -+ 'templates' => '/usr/share/horde/templates', - 'provides' => 'horde' - ); - - $this->applications['imp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../imp', -+ 'fileroot' => '/usr/share/horde/imp', - 'webroot' => $this->applications['horde']['webroot'] . '/imp', - 'name' => _("Mail"), - 'status' => 'active', -@@ -81,7 +81,7 @@ - ); - - $this->applications['ingo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ingo', -+ 'fileroot' => '/usr/share/horde/ingo', - 'webroot' => $this->applications['horde']['webroot'] . '/ingo', - 'name' => _("Filters"), - 'status' => 'active', -@@ -129,7 +129,7 @@ - ); - - $this->applications['turba'] = array( -- 'fileroot' => dirname(__FILE__) . '/../turba', -+ 'fileroot' => '/usr/share/horde/turba', - 'webroot' => $this->applications['horde']['webroot'] . '/turba', - 'name' => _("Address Book"), - 'status' => 'active', -@@ -138,7 +138,7 @@ - ); - - $this->applications['kronolith'] = array( -- 'fileroot' => dirname(__FILE__) . '/../kronolith', -+ 'fileroot' => '/usr/share/horde/kronolith', - 'webroot' => $this->applications['horde']['webroot'] . '/kronolith', - 'name' => _("Calendar"), - 'status' => 'active', -@@ -154,7 +154,7 @@ - ); - - $this->applications['mnemo'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mnemo', -+ 'fileroot' => '/usr/share/horde/mnemo', - 'webroot' => $this->applications['horde']['webroot'] . '/mnemo', - 'name' => _("Notes"), - 'status' => 'active', -@@ -163,7 +163,7 @@ - ); - - $this->applications['nag'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nag', -+ 'fileroot' => '/usr/share/horde/nag', - 'webroot' => $this->applications['horde']['webroot'] . '/nag', - 'name' => _("Tasks"), - 'status' => 'active', -@@ -195,7 +195,7 @@ - ); - - $this->applications['chora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../chora', -+ 'fileroot' => '/usr/share/horde/chora', - 'webroot' => $this->applications['horde']['webroot'] . '/chora', - 'name' => _("Version Control"), - 'status' => 'active', -@@ -284,7 +284,7 @@ - ); - - $this->applications['klutz'] = array( -- 'fileroot' => dirname(__FILE__) . '/../klutz', -+ 'fileroot' => '/usr/share/horde/klutz', - 'webroot' => $this->applications['horde']['webroot'] . '/klutz', - 'name' => _("Comics"), - 'status' => 'inactive', ---- ./config/registry.php.dist~ 2005-03-04 20:59:19.000000000 +0200 -+++ ./config/registry.php.dist 2005-03-04 21:00:57.000000000 +0200 -@@ -90,7 +90,7 @@ - ); - - $this->applications['sam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sam', -+ 'fileroot' => '/usr/share/horde/sam', - 'webroot' => $this->applications['horde']['webroot'] . '/sam', - 'name' => _("Spam"), - 'status' => 'inactive', -@@ -101,7 +101,7 @@ - ); - - $this->applications['troll'] = array( -- 'fileroot' => dirname(__FILE__) . '/../troll', -+ 'fileroot' => '/usr/share/horde/troll', - 'webroot' => $this->applications['horde']['webroot'] . '/troll', - 'name' => _("Newsgroups"), - 'status' => 'inactive', -@@ -109,7 +109,7 @@ - ); - - $this->applications['vilma'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vilma', -+ 'fileroot' => '/usr/share/horde/vilma', - 'webroot' => $this->applications['horde']['webroot'] . '/vilma', - 'name' => _("Mail Admin"), - 'status' => 'inactive', -@@ -117,7 +117,7 @@ - ); - - $this->applications['mimp'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mimp', -+ 'fileroot' => '/usr/share/horde/mimp', - 'webroot' => $this->applications['horde']['webroot'] . '/mimp', - 'name' => _("Mobile Mail"), - 'status' => 'inactive' -@@ -172,7 +172,7 @@ - ); - - $this->applications['genie'] = array( -- 'fileroot' => dirname(__FILE__) . '/../genie', -+ 'fileroot' => '/usr/share/horde/genie', - 'webroot' => $this->applications['horde']['webroot'] . '/genie', - 'name' => _("Wishlists"), - 'status' => 'inactive', -@@ -181,7 +181,7 @@ - ); - - $this->applications['trean'] = array( -- 'fileroot' => dirname(__FILE__) . '/../trean', -+ 'fileroot' => '/usr/share/horde/trean', - 'webroot' => $this->applications['horde']['webroot'] . '/trean', - 'name' => _("Bookmarks"), - 'status' => 'inactive', -@@ -203,7 +203,7 @@ - ); - - $this->applications['babel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../babel', -+ 'fileroot' => '/usr/share/horde/babel', - 'webroot' => $this->applications['horde']['webroot'] . '/babel', - 'name' => _("i18n"), - 'status' => 'inactive', -@@ -211,7 +211,7 @@ - ); - - $this->applications['thor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../thor', -+ 'fileroot' => '/usr/share/horde/thor', - 'webroot' => $this->applications['horde']['webroot'] . '/thor', - 'name' => _("Projects"), - 'status' => 'inactive', -@@ -220,7 +220,7 @@ - ); - - $this->applications['whups'] = array( -- 'fileroot' => dirname(__FILE__) . '/../whups', -+ 'fileroot' => '/usr/share/horde/whups', - 'webroot' => $this->applications['horde']['webroot'] . '/whups', - 'name' => _("Tickets"), - 'status' => 'inactive', -@@ -229,7 +229,7 @@ - ); - - $this->applications['luxor'] = array( -- 'fileroot' => dirname(__FILE__) . '/../luxor', -+ 'fileroot' => '/usr/share/horde/luxor', - 'webroot' => $this->applications['horde']['webroot'] . '/luxor', - 'name' => _("X-Ref"), - 'status' => 'inactive', -@@ -237,7 +237,7 @@ - ); - - $this->applications['nic'] = array( -- 'fileroot' => dirname(__FILE__) . '/../nic', -+ 'fileroot' => '/usr/share/horde/nic', - 'webroot' => $this->applications['horde']['webroot'] . '/nic', - 'name' => _("Network"), - 'status' => 'inactive', -@@ -251,7 +251,7 @@ - ); - - $this->applications['mottle'] = array( -- 'fileroot' => dirname(__FILE__) . '/../mottle', -+ 'fileroot' => '/usr/share/horde/mottle', - 'webroot' => $this->applications['horde']['webroot'] . '/mottle', - 'name' => _("MOTD"), - 'status' => 'inactive', -@@ -259,7 +259,7 @@ - ); - - $this->applications['jonah'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jonah', -+ 'fileroot' => '/usr/share/horde/jonah', - 'webroot' => $this->applications['horde']['webroot'] . '/jonah', - 'name' => _("News"), - 'status' => 'inactive', -@@ -268,7 +268,7 @@ - ); - - $this->applications['occam'] = array( -- 'fileroot' => dirname(__FILE__) . '/../occam', -+ 'fileroot' => '/usr/share/horde/occam', - 'webroot' => $this->applications['horde']['webroot'] . '/occam', - 'name' => _("Courses"), - 'status' => 'inactive', -@@ -276,7 +276,7 @@ - ); - - $this->applications['goops'] = array( -- 'fileroot' => dirname(__FILE__) . '/../goops', -+ 'fileroot' => '/usr/share/horde/goops', - 'webroot' => $this->applications['horde']['webroot'] . '/goops', - 'name' => _("Search Engines"), - 'status' => 'inactive', -@@ -293,7 +293,7 @@ - ); - - $this->applications['orator'] = array( -- 'fileroot' => dirname(__FILE__) . '/../orator', -+ 'fileroot' => '/usr/share/horde/orator', - 'webroot' => $this->applications['horde']['webroot'] . '/orator', - 'name' => _("Presentations"), - 'status' => 'inactive', -@@ -306,7 +306,7 @@ - ); - - $this->applications['hermes'] = array( -- 'fileroot' => dirname(__FILE__) . '/../hermes', -+ 'fileroot' => '/usr/share/horde/hermes', - 'webroot' => $this->applications['horde']['webroot'] . '/hermes', - 'name' => _("Time Tracking"), - 'status' => 'inactive', -@@ -315,7 +315,7 @@ - ); - - $this->applications['juno'] = array( -- 'fileroot' => dirname(__FILE__) . '/../juno', -+ 'fileroot' => '/usr/share/horde/juno', - 'webroot' => $this->applications['horde']['webroot'] . '/juno', - 'name' => _("Accounting"), - 'status' => 'inactive', -@@ -323,7 +323,7 @@ - ); - - $this->applications['sesha'] = array( -- 'fileroot' => dirname(__FILE__) . '/../sesha', -+ 'fileroot' => '/usr/share/horde/sesha', - 'webroot' => $this->applications['horde']['webroot'] . '/sesha', - 'name' => _("Inventory"), - 'status' => 'inactive', -@@ -336,7 +336,7 @@ - ); - - $this->applications['accounts'] = array( -- 'fileroot' => dirname(__FILE__) . '/../accounts', -+ 'fileroot' => '/usr/share/horde/accounts', - 'webroot' => $this->applications['horde']['webroot'] . '/accounts', - 'name' => _("My Account"), - 'status' => 'inactive', -@@ -344,7 +344,7 @@ - ); - - $this->applications['gollem'] = array( -- 'fileroot' => dirname(__FILE__) . '/../gollem', -+ 'fileroot' => '/usr/share/horde/gollem', - 'webroot' => $this->applications['horde']['webroot'] . '/gollem', - 'name' => _("File Manager"), - 'status' => 'inactive', -@@ -353,7 +353,7 @@ - ); - - $this->applications['forwards'] = array( -- 'fileroot' => dirname(__FILE__) . '/../forwards', -+ 'fileroot' => '/usr/share/horde/forwards', - 'webroot' => $this->applications['horde']['webroot'] . '/forwards', - 'name' => _("Forwards"), - 'status' => 'inactive', -@@ -362,7 +362,7 @@ - ); - - $this->applications['passwd'] = array( -- 'fileroot' => dirname(__FILE__) . '/../passwd', -+ 'fileroot' => '/usr/share/horde/passwd', - 'webroot' => $this->applications['horde']['webroot'] . '/passwd', - 'name' => _("Password"), - 'status' => 'inactive', -@@ -370,7 +370,7 @@ - ); - - $this->applications['jeta'] = array( -- 'fileroot' => dirname(__FILE__) . '/../jeta', -+ 'fileroot' => '/usr/share/horde/jeta', - 'webroot' => $this->applications['horde']['webroot'] . '/jeta', - 'name' => _("SSH"), - 'status' => 'inactive', -@@ -378,7 +378,7 @@ - ); - - $this->applications['vacation'] = array( -- 'fileroot' => dirname(__FILE__) . '/../vacation', -+ 'fileroot' => '/usr/share/horde/vacation', - 'webroot' => $this->applications['horde']['webroot'] . '/vacation', - 'name' => _("Vacation"), - 'status' => 'inactive', -@@ -392,7 +392,7 @@ - ); - - $this->applications['giapeto'] = array( -- 'fileroot' => dirname(__FILE__) . '/../giapeto', -+ 'fileroot' => '/usr/share/horde/giapeto', - 'webroot' => $this->applications['horde']['webroot'] . '/giapeto', - 'name' => _("CMS"), - 'status' => 'inactive', -@@ -401,7 +401,7 @@ - ); - - $this->applications['midas'] = array( -- 'fileroot' => dirname(__FILE__) . '/../midas', -+ 'fileroot' => '/usr/share/horde/midas', - 'webroot' => $this->applications['horde']['webroot'] . '/midas', - 'name' => _("Ads"), - 'status' => 'inactive', -@@ -409,7 +409,7 @@ - ); - - $this->applications['agora'] = array( -- 'fileroot' => dirname(__FILE__) . '/../agora', -+ 'fileroot' => '/usr/share/horde/agora', - 'webroot' => $this->applications['horde']['webroot'] . '/agora', - 'name' => _("Forums"), - 'status' => 'inactive', -@@ -418,7 +418,7 @@ - ); - - $this->applications['odin'] = array( -- 'fileroot' => dirname(__FILE__) . '/../odin', -+ 'fileroot' => '/usr/share/horde/odin', - 'webroot' => $this->applications['horde']['webroot'] . '/odin', - 'name' => _("Data"), - 'status' => 'inactive', -@@ -426,7 +426,7 @@ - ); - - $this->applications['ulaform'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ulaform', -+ 'fileroot' => '/usr/share/horde/ulaform', - 'webroot' => $this->applications['horde']['webroot'] . '/ulaform', - 'name' => _("Forms"), - 'status' => 'inactive', -@@ -434,7 +434,7 @@ - ); - - $this->applications['volos'] = array( -- 'fileroot' => dirname(__FILE__) . '/../volos', -+ 'fileroot' => '/usr/share/horde/volos', - 'webroot' => $this->applications['horde']['webroot'] . '/volos', - 'name' => _("Guestbook"), - 'status' => 'inactive', -@@ -442,7 +442,7 @@ - ); - - $this->applications['ansel'] = array( -- 'fileroot' => dirname(__FILE__) . '/../ansel', -+ 'fileroot' => '/usr/share/horde/ansel', - 'webroot' => $this->applications['horde']['webroot'] . '/ansel', - 'name' => _("Photos"), - 'status' => 'inactive', -@@ -451,7 +451,7 @@ - ); - - $this->applications['scry'] = array( -- 'fileroot' => dirname(__FILE__) . '/../scry', -+ 'fileroot' => '/usr/share/horde/scry', - 'webroot' => $this->applications['horde']['webroot'] . '/scry', - 'name' => _("Polls"), - 'status' => 'inactive', -@@ -460,7 +460,7 @@ - ); - - $this->applications['rakim'] = array( -- 'fileroot' => dirname(__FILE__) . '/../rakim', -+ 'fileroot' => '/usr/share/horde/rakim', - 'webroot' => $this->applications['horde']['webroot'] . '/rakim', - 'name' => _("Support"), - 'status' => 'inactive', -@@ -468,7 +468,7 @@ - ); - - $this->applications['merk'] = array( -- 'fileroot' => dirname(__FILE__) . '/../merk', -+ 'fileroot' => '/usr/share/horde/merk', - 'webroot' => $this->applications['horde']['webroot'] . '/merk', - 'name' => _("Shopping"), - 'status' => 'inactive', -@@ -476,7 +476,7 @@ - ); - - $this->applications['swoosh'] = array( -- 'fileroot' => dirname(__FILE__) . '/../swoosh', -+ 'fileroot' => '/usr/share/horde/swoosh', - 'webroot' => $this->applications['horde']['webroot'] . '/swoosh', - 'name' => _("SMS Messaging"), - 'status' => 'inactive', -@@ -485,7 +485,7 @@ - ); - - $this->applications['wicked'] = array( -- 'fileroot' => dirname(__FILE__) . '/../wicked', -+ 'fileroot' => '/usr/share/horde/wicked', - 'webroot' => $this->applications['horde']['webroot'] . '/wicked', - 'name' => _("Wiki"), - 'status' => 'inactive', --- ./config/registry.php.dist~ 2005-03-04 21:02:58.000000000 +0200 +++ ./config/registry.php.dist 2005-03-04 21:12:11.517027935 +0200 @@ -223,7 +223,7 @@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-path.patch?r1=1.9&r2=1.10&f=u From glen at pld-linux.org Tue Aug 23 22:24:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde.spec - merged from DEVEL, updated to 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:24:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL, updated to 3.0.5 ---- Files affected: SPECS: horde.spec (1.95 -> 1.96) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.95 SPECS/horde.spec:1.96 --- SPECS/horde.spec:1.95 Sun May 22 22:15:19 2005 +++ SPECS/horde.spec Tue Aug 23 22:23:55 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ # TODO: # - support for Oracle and Sybase +# - Support SQLite and Oracle in all SQL configurations. +# - LDAP and memcached session handlers. # - remove config/ (and others in apache.conf) from document root, so # apache deny from all not needed. # - put docs/CREDITS to package, rather in doc (so installations with @@ -12,40 +14,40 @@ Summary(pl): Wsp?lny szkielet Horde do wszystkich modu??w Horde Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde -Version: 3.0.4 -Release: 6 +Version: 3.0.5 +Release: 0.1 License: LGPL Vendor: The Horde Project Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz -# Source0-md5: e2221d409ba1c8841ce4ecee981d7b61 +# Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch Patch3: %{name}-blank-admins.patch -Patch4: %{name}-fix-config-blanks.patch +Patch4: %{name}-config-xml.patch URL: http://www.horde.org/ -BuildRequires: rpmbuild(macros) >= 1.177 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 Requires(triggerpostun): grep Requires(triggerpostun): sed >= 4.0 Requires: apache >= 1.3.33-3 -Requires: apache(mod_dir) >= 1.3.22 Requires: apache(mod_access) Requires: apache(mod_alias) +Requires: apache(mod_dir) >= 1.3.22 Requires: php >= 4.1.0 +Requires: php-domxml Requires: php-gettext >= 4.1.0 Requires: php-imap >= 4.1.0 Requires: php-mcrypt >= 4.1.0 -Requires: php-pear-PEAR -Requires: php-pear-Log Requires: php-pcre >= 4.1.0 +Requires: php-pear-Log +Requires: php-pear-PEAR Requires: php-posix >= 4.1.0 Requires: php-session >= 4.1.0 Requires: php-xml >= 4.1.0 Requires: php-zlib >= 4.1.0 -Requires: php-domxml Obsoletes: horde-mysql Obsoletes: horde-pgsql BuildArch: noarch @@ -58,11 +60,8 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org %define _appdir %{hordedir} -%define _apache1dir /etc/apache -%define _apache2dir /etc/httpd %define schemadir /usr/share/openldap/schema - %description The Horde Framework provides a common structure and interface for Horde modules (such as IMP, a web-based mail program). This RPM is @@ -106,13 +105,17 @@ Ten pakiet zawiera horde.schema dla pakietu openldap. %prep -%setup -q +%setup -q %{?_rc:-n %{name}-%{version}-%{_rc}} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p0 %patch4 -p1 +sed -i -e " +s#dirname(__FILE__) . '/..#'%{hordedir}#g +" config/registry.php.dist + # Described in documentation as dangerous file... rm test.php @@ -121,16 +124,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_appdir}/{admin,js,services} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \ - $RPM_BUILD_ROOT/var/log/%{name} \ + $RPM_BUILD_ROOT/var/{lib,log}/%{name} \ $RPM_BUILD_ROOT%{schemadir} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.php.dist; do cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) done -sed -e ' - s,/tmp/horde.log,/var/log/%{name}/%{name}.log, -'< config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml + +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak cp -pR admin/* $RPM_BUILD_ROOT%{_appdir}/admin @@ -159,21 +161,6 @@ install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak fi -# apache1 -if [ -d %{_apache1dir}/conf.d ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache1dir}/conf.d/99_%{name}.conf - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi -fi -# apache2 -if [ -d %{_apache2dir}/httpd.conf ]; then - ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi -fi - if [ "$1" = 1 ]; then %banner %{name} -e <&2 - fi - fi - # apache2 - if [ -d %{_apache2dir}/httpd.conf ]; then - rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi - fi -fi - %post -n openldap-schema-horde if ! grep -q %{schemadir}/horde.schema /etc/openldap/slapd.conf; then sed -i -e ' @@ -244,6 +213,18 @@ fi fi +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %triggerpostun -- horde <= 2.2.7-2 for i in horde.php html.php lang.php mime_drivers.php mime_mapping.php motd.php prefs.php registry.php; do if [ -f /home/services/httpd/html/horde/config/$i.rpmsave ]; then @@ -267,14 +248,14 @@ fi fi -if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then +if [ -f /etc/apache/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache1dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/apache/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi -if [ -f %{_apache2dir}/horde.conf.rpmsave ]; then +if [ -f /etc/httpd/horde.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew} - mv -f %{_apache2dir}/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf + mv -f /etc/httpd/horde.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf fi # unified location @@ -284,11 +265,11 @@ fi if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 + /etc/rc.d/init.d/apache reload 1>&2 fi if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + /etc/rc.d/init.d/httpd reload 1>&2 fi %files @@ -317,6 +298,7 @@ %{_appdir}/themes %dir %attr(770,root,http) /var/log/%{name} +%dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log %files -n openldap-schema-horde @@ -329,6 +311,36 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.96 2005/08/23 20:23:55 glen +- merged from DEVEL, updated to 3.0.5 + +Revision 1.95.2.9 2005/08/15 21:49:37 glen +- sorter BR/R with adapter + +Revision 1.95.2.8 2005/08/15 21:31:19 glen +- adapter "friendly" + +Revision 1.95.2.7 2005/07/31 10:52:01 glen +- include /var/lib/horde to package (one can store vfs tmp data there) + +Revision 1.95.2.6 2005/07/31 10:40:45 glen +- use apache config triggers + +Revision 1.95.2.5 2005/07/31 10:29:13 glen +- patch conf.xml, rather sed-ing + +Revision 1.95.2.4 2005/07/16 14:22:34 glen +- 3.0.5-RC2 + +Revision 1.95.2.3 2005/07/13 07:00:23 glen +- TODO updated + +Revision 1.95.2.2 2005/07/12 20:34:29 glen +- make df happy + +Revision 1.95.2.1 2005/07/12 20:19:57 glen +- 3.0.5-rc1 + Revision 1.95 2005/05/22 20:15:19 glen - fix for Ticket #2013. rel 6; STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.95&r2=1.96&f=u From glen at pld-linux.org Tue Aug 23 22:24:28 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: horde-3.0.5.tar.gz Message-ID: <14271.1124828668@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz Size: 3549687 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: ocaml-findlib.spec - updated to 1.0.4 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:25:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.4 ; STBR ---- Files affected: SPECS: ocaml-findlib.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.15 SPECS/ocaml-findlib.spec:1.16 --- SPECS/ocaml-findlib.spec:1.15 Mon Jun 6 16:24:03 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:25:31 2005 @@ -2,14 +2,14 @@ Summary: OCaml module manager Summary(pl): Zarz?dca modu??w OCamla Name: ocaml-findlib -Version: 0.8.1 -Release: 6 +Version: 1.0.4 +Release: 1 License: distributable Group: Development/Tools Vendor: Gerd Stolpmann URL: http://www.ocaml-programming.de/packages/ -# Source0-md5: b4643888d1a6626981113e23a92b9154 Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz +# Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -69,7 +69,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install PREFIX=$RPM_BUILD_ROOT +%{__make} install prefix=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli @@ -92,7 +92,7 @@ %files %defattr(644,root,root,755) -%doc README LICENSE doc/html +%doc README LICENSE doc/*-html %attr(755,root,root) %{_bindir}/* %config %{_sysconfdir}/ocamlfind.conf %{_libdir}/ocaml/site-lib @@ -105,7 +105,6 @@ %{_libdir}/ocaml/findlib/*.a %{_libdir}/ocaml/ocamlfind %{_libdir}/ocaml/topfind -%{_mandir}/man3/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -113,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/23 20:25:31 paszczus +- updated to 1.0.4 ; STBR + Revision 1.15 2005/06/06 14:24:03 zbyniu - BR: ncurses-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.15&r2=1.16&f=u From paszczus at pld-linux.org Tue Aug 23 22:25:36 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: findlib-1.0.4.tar.gz Message-ID: <15253.1124828736@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ocaml-programming.de/packages/findlib-1.0.4.tar.gz dbfabe1b3677a03bcf238ecccb36d84f findlib-1.0.4.tar.gz Size: 148287 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:26:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: horde-fix-config-blanks.patch (REMOVED) - outdated in 3.0.5 In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:26:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated in 3.0.5 ---- Files affected: SOURCES: horde-fix-config-blanks.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paszczus at pld-linux.org Tue Aug 23 22:32:29 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: gollem.spec - updated to FINAL 1.0 In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:32:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to FINAL 1.0 ---- Files affected: SPECS: gollem.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.9 SPECS/gollem.spec:1.10 --- SPECS/gollem.spec:1.9 Tue Aug 2 22:29:34 2005 +++ SPECS/gollem.spec Tue Aug 23 22:32:23 2005 @@ -1,18 +1,15 @@ # $Revision$, $Date$ -%define _rc rc2 -%define _rel 1 - %include /usr/lib/rpm/macros.php Summary: Gollem - the Horde File Manager Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.%{_rc}.%{_rel} +Release: 0.1 License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/gollem/%{name}-%{version}-%{_rc}.tar.gz -# Source0-md5: c5270fd6603ddf21682e7dcbb41b195c +Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz +# Source0-md5: 29f668de08c0672169cbe52a80dc1771 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/gollem/ @@ -54,7 +51,7 @@ Gollema) mo?na znale?? na stronie . %prep -%setup -q -n %{name}-%{version}-%{_rc} +%setup -q -n %{name}-h3-%{version} tar zxf %{SOURCE0} --strip-components=1 %patch0 -p1 @@ -132,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/23 20:32:23 paszczus +- updated to FINAL 1.0 + Revision 1.9 2005/08/02 20:29:34 qboosh - typo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.9&r2=1.10&f=u From paszczus at pld-linux.org Tue Aug 23 22:32:38 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gollem-h3-1.0.tar.gz Message-ID: <18933.1124829158@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/gollem/gollem-h3-1.0.tar.gz 29f668de08c0672169cbe52a80dc1771 gollem-h3-1.0.tar.gz Size: 680558 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 22:34:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): adapter.spec - tests updated In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - tests updated ---- Files affected: SPECS: adapter.spec (1.26.2.6 -> 1.26.2.7) ---- Diffs: ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.6 SPECS/adapter.spec:1.26.2.7 --- SPECS/adapter.spec:1.26.2.6 Fri Jul 15 09:01:45 2005 +++ SPECS/adapter.spec Tue Aug 23 22:33:58 2005 @@ -35,13 +35,21 @@ %{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8} PreReq: sh-utils Requires(pre): /bin/id -Requires(pre): /usr/sbin/useradd Requires(post): /bin/hostname +Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/userdel Requires: pam >= 0.77.3 +Requires: ll +Requires: c +# this is comment to R: aaaa +Requires: aaaa Requires: daemontools >= 0.76-1.4 BuildRequires: rpm-pythonprov %{?with_home_etc:Requires: home-etc >= 1.0.8} +%{!?with_home_etc:Requires: home-etc <= 1} +Requires: poop +Conflicts: qmail-client1 +Requires: afterwards Conflicts: qmail-client Provides: group(nofiles) Obsoletes: zmailer @@ -134,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.7 2005/08/23 20:33:58 glen +- tests updated + Revision 1.26.2.6 2005/07/15 07:01:45 glen - fix fix-info-dir misuse in %post ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.6&r2=1.26.2.7&f=u From glen at pld-linux.org Tue Aug 23 22:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): adapter.awk, adapter.spec - replace name and versio... In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 20:34:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - replace name and version with macros in %setup. req by PaSzCzUs ---- Files affected: SPECS: adapter.awk (1.171 -> 1.172) , adapter.spec (1.26.2.7 -> 1.26.2.8) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.171 SPECS/adapter.awk:1.172 --- SPECS/adapter.awk:1.171 Tue Aug 16 00:06:39 2005 +++ SPECS/adapter.awk Tue Aug 23 22:34:51 2005 @@ -206,6 +206,11 @@ sub(/^%setup/, "%setup -q") } + if (/^%setup/) { + gsub(name, "%{name}"); + gsub(version, "%{version}"); + } + if (/^%setup/ && /-n %{name}-%{version}( |$)/) { sub(/ -n %{name}-%{version}/, "") } ================================================================ Index: SPECS/adapter.spec diff -u SPECS/adapter.spec:1.26.2.7 SPECS/adapter.spec:1.26.2.8 --- SPECS/adapter.spec:1.26.2.7 Tue Aug 23 22:33:58 2005 +++ SPECS/adapter.spec Tue Aug 23 22:34:51 2005 @@ -64,6 +64,7 @@ - this one gets wrapped, but logically it shouldn't due bcond %prep +%setup -q -n adapter-0.666 %setup -q -n %{name}-%{version} %setup -q -c -n %{name}-%{version} %setup -q -n %{name}-%{version}.orig -a 1 @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.8 2005/08/23 20:34:51 glen +- replace name and version with macros in %setup. req by PaSzCzUs + Revision 1.26.2.7 2005/08/23 20:33:58 glen - tests updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.171&r2=1.172&f=u http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.7&r2=1.26.2.8&f=u From paszczus at pld-linux.org Tue Aug 23 22:38:49 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: pcre-ocaml-5.10.1.tar.bz2 Message-ID: <23014.1124829529@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-5.10.1.tar.bz2 d53864f6a0436e40c3cdedcdc8352aba pcre-ocaml-5.10.1.tar.bz2 Size: 46328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 22:38:42 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: ocaml-pcre.spec - updated to 5.10.1 ; STBR In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 20:38:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 5.10.1 ; STBR ---- Files affected: SPECS: ocaml-pcre.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/ocaml-pcre.spec diff -u SPECS/ocaml-pcre.spec:1.8 SPECS/ocaml-pcre.spec:1.9 --- SPECS/ocaml-pcre.spec:1.8 Thu Mar 17 10:02:37 2005 +++ SPECS/ocaml-pcre.spec Tue Aug 23 22:38:35 2005 @@ -2,13 +2,13 @@ Summary: PCRE binding for OCaml Summary(pl): Wi?zania PCRE dla OCamla Name: ocaml-pcre -Version: 5.09.0 +Version: 5.10.1 Release: 1 License: LGPL Group: Libraries Vendor: Markus Mottl Source0: http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-%{version}.tar.bz2 -# Source0-md5: 070e556348e050c4d3d75e8917e7e322 +# Source0-md5: d53864f6a0436e40c3cdedcdc8352aba URL: http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html BuildRequires: pcre-devel BuildRequires: ocaml-findlib @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 20:38:35 paszczus +- updated to 5.10.1 ; STBR + Revision 1.8 2005/03/17 09:02:37 paszczus - updated to 5.09.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-pcre.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Tue Aug 23 22:39:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: ocaml-findlib.spec - unified, pl cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:39:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified, pl cosmetics ---- Files affected: SPECS: ocaml-findlib.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/ocaml-findlib.spec diff -u SPECS/ocaml-findlib.spec:1.16 SPECS/ocaml-findlib.spec:1.17 --- SPECS/ocaml-findlib.spec:1.16 Tue Aug 23 22:25:31 2005 +++ SPECS/ocaml-findlib.spec Tue Aug 23 22:39:40 2005 @@ -7,9 +7,9 @@ License: distributable Group: Development/Tools Vendor: Gerd Stolpmann -URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz # Source0-md5: dbfabe1b3677a03bcf238ecccb36d84f +URL: http://www.ocaml-programming.de/packages/ BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml >= 3.08 @@ -26,9 +26,9 @@ %description -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. %package devel Summary: OCaml module manager @@ -46,9 +46,9 @@ %description devel -l pl Biblioteka "findlib" udost?pnia metod? zarz?dzania komponentami -oprogramowania (pakietami) oraz zawiera narz?dzia kt?re ow? metod? -wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych jest -przechowywana metainformacja. +oprogramowania (pakietami) oraz zawiera narz?dzia, kt?re ow? metod? +wspieraj?. Pakiety s? kolekcjami modu??w w OCamlu, dla kt?rych mog? +by? przechowywane metainformacje. Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba. @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/23 20:39:40 qboosh +- unified, pl cosmetics + Revision 1.16 2005/08/23 20:25:31 paszczus - updated to 1.0.4 ; STBR @@ -164,4 +167,3 @@ Revision 1.1 2002/05/10 11:32:51 malekith - initial; from scratch - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-findlib.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Tue Aug 23 22:41:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: macromedia-flash.spec - updated pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:41:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl desc ---- Files affected: SPECS: macromedia-flash.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.34 SPECS/macromedia-flash.spec:1.35 --- SPECS/macromedia-flash.spec:1.34 Tue Aug 23 22:00:05 2005 +++ SPECS/macromedia-flash.spec Tue Aug 23 22:41:27 2005 @@ -50,7 +50,7 @@ %description -l pl Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape. -Supported browsers: %{browsers}. +Obs?ugiwane przegl?darki: %{browsers}. %prep %if %{with license_agreement} @@ -146,6 +146,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/23 20:41:27 qboosh +- updated pl desc + Revision 1.34 2005/08/23 20:00:05 glen - update URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Tue Aug 23 22:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: web-cyradm.spec - pl fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fixes ---- Files affected: SPECS: web-cyradm.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.1 SPECS/web-cyradm.spec:1.2 --- SPECS/web-cyradm.spec:1.1 Tue Aug 23 16:02:14 2005 +++ SPECS/web-cyradm.spec Tue Aug 23 22:48:55 2005 @@ -8,8 +8,8 @@ %define version_major 0.5.4 %define version_minor 1 # -Summary: Cyrus-IMAP based mail accounts managment system. -Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP. +Summary: Cyrus-IMAP based mail accounts managment system +Summary(pl): System zarz?dzania kontami pocztowymi oparty o Cyrus-IMAP Name: web-cyradm Version: %{version_major}.%{version_minor} Release: 0.1 @@ -21,9 +21,9 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ Requires: mysql -Requires: webserver Requires: php Requires: php-gettext +Requires: webserver BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,25 +44,28 @@ and superusers - Sieve functions like forwarding single e-mail adresses and out-of-office replies - - Enable/Disable different services like imap, pop, sieve and stmp + - Enable/Disable different services like imap, pop, sieve and smtp for particular users - Support for MySQL and PostgreSQL databases - Storing passwords in crypt, md5 or MySQL passwd compatible format %description -l pl -Web-cyradm jest oprogramowaniem kt?re skleja wiele technologii Open +Web-cyradm jest oprogramowaniem sklejaj?cym wiele technologii Open Source w jeden du?y system pocztowy. Mo?liwo?ci: - - Administracja wieloma wirtualnymu domenami - - Zarz?dzanie kontami urzytkownik?w - - Mapowanie kont urzytkownik?w na adresy e-mail + - Administrowanie wieloma wirtualnymi domenami + - Zarz?dzanie kontami u?ytkownik?w + - Mapowanie kont u?ytkownik?w na adresy e-mail - Tworzenie, usuwanie i zmiana nazwy skrzynek pocztwowych + - Ustawianie limit?w dla u?ytkownik?w i domen - Delegacja zada? do administrator?w domen - Resetowanie hase? u?ytkownikom przez administrator?w domen - - Filtry poczty Sieve - - W??czanie i wy??czanie us?ug dla poszczeg?lnych urzytkownik?w - - Wsparcie dla MySQL'a i PostgreSQL'a + - Funkcje Sieve, takie jak przekazywanie pojedynczych adres?w e-mail + czy automatyczne odpowiedzi o nieobecno?ci + - W??czanie i wy??czanie us?ug (imap, pop, sieve, smtp) dla + poszczeg?lnych u?ytkownik?w + - Obsluga baz MySQL i PostgreSQL - Obs?uga hase? w formacie MD5, Crypt i MySQL PASSWORD() %prep @@ -131,6 +134,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/23 20:48:55 qboosh +- pl fixes + Revision 1.1 2005/08/23 14:02:14 kosmo - initial release. - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Tue Aug 23 22:56:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: rlocate.spec - don't link scripts (causes EPERM) In-Reply-To: References: Message-ID: Author: qboosh Date: Tue Aug 23 20:56:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't link scripts (causes EPERM) ---- Files affected: SPECS: rlocate.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.31 SPECS/rlocate.spec:1.32 --- SPECS/rlocate.spec:1.31 Mon Aug 22 22:56:51 2005 +++ SPECS/rlocate.spec Tue Aug 23 22:56:04 2005 @@ -137,7 +137,6 @@ ln -sf %{_kernelsrcdir}/config-$cfg .config ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm - ln -sf %{_kernelsrcdir}/scripts scripts touch include/config/MARKER echo "EXTRA_CFLAGS:= -DRL_VERSION=\\\"%{version}\\\" -DRLOCATE_UPDATES" > Makefile @@ -253,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/23 20:56:04 qboosh +- don't link scripts (causes EPERM) + Revision 1.31 2005/08/22 20:56:51 paszczus - fixed %files, cron and init ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.31&r2=1.32&f=u From glen at pld-linux.org Tue Aug 23 23:03:09 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-nag.spec - 2.0.2 final In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:03:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 final ---- Files affected: SPECS: horde-nag.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.3 SPECS/horde-nag.spec:1.4 --- SPECS/horde-nag.spec:1.3 Tue Aug 2 22:28:41 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:03:03 2005 @@ -3,20 +3,20 @@ # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec -%define _rc rc1 -%define _rel 5 +#define _rc rc1 +%define _rel 0.1 %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? Name: nag Version: 2.0.2 -Release: %{_rc}.%{_rel} +Release: %{?_rc:%{_rc}.}%{_rel} License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}-%{_rc}.tar.gz -# Source0-md5: c6f572411894f706df19f8b649a11b2e +Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +# Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch URL: http://www.horde.org/nag/ @@ -55,7 +55,7 @@ Naga) mo?na znale?? na stronie . %prep -%setup -q -n nag-h3-%{version}-%{_rc} +%setup -q -n %{?_snap:nag}%{!?_snap:nag-h3-%{version}%{?_rc:-%{_rc}}} %install rm -rf $RPM_BUILD_ROOT @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/23 21:03:03 glen +- 2.0.2 final + Revision 1.3 2005/08/02 20:28:41 qboosh - pl, copy-pasto ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Tue Aug 23 23:03:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: nag-h3-2.0.2.tar.gz Message-ID: <8202.1124831003@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/nag/nag-h3-2.0.2.tar.gz 7aa928522dadda94f02dfcbc5fb90058 nag-h3-2.0.2.tar.gz Size: 1050906 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Tue Aug 23 23:06:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: rlocate.spec - rel 0.2, so still not finished... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:06:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 0.2, so still not finished... ---- Files affected: SPECS: rlocate.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/rlocate.spec diff -u SPECS/rlocate.spec:1.32 SPECS/rlocate.spec:1.33 --- SPECS/rlocate.spec:1.32 Tue Aug 23 22:56:04 2005 +++ SPECS/rlocate.spec Tue Aug 23 23:05:58 2005 @@ -20,7 +20,7 @@ Summary(pl): Szukanie plik?w w systemie poprzez centraln? baz? danych Name: rlocate Version: 0.3.2 -%define _rel 0.1 +%define _rel 0.2 Release: %{_rel} License: GPL Group: Base @@ -252,6 +252,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/23 21:05:58 paszczus +- rel 0.2, so still not finished... + Revision 1.32 2005/08/23 20:56:04 qboosh - don't link scripts (causes EPERM) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rlocate.spec?r1=1.32&r2=1.33&f=u From glen at pld-linux.org Tue Aug 23 23:08:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-nag.spec - unify with horde-passwd.spec In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:08:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unify with horde-passwd.spec ---- Files affected: SPECS: horde-nag.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/horde-nag.spec diff -u SPECS/horde-nag.spec:1.4 SPECS/horde-nag.spec:1.5 --- SPECS/horde-nag.spec:1.4 Tue Aug 23 23:03:03 2005 +++ SPECS/horde-nag.spec Tue Aug 23 23:08:02 2005 @@ -2,10 +2,12 @@ # TODO # - rename nag.spec to tldp-nag.spec # - rename this spec to nag.spec +# - or forget it and rename all horde packages to horde-*.spec #define _rc rc1 -%define _rel 0.1 +%define _rel 0.3 +%define _hordeapp nag %include /usr/lib/rpm/macros.php Summary: Nag Task List Manager Summary(pl): Nag - zarz?dca list zada? @@ -15,7 +17,7 @@ License: GPL v2 Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/nag/%{name}-h3-%{version}.tar.gz +Source0: ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}.tar.gz # Source0-md5: 7aa928522dadda94f02dfcbc5fb90058 Source1: %{name}.conf Patch0: %{name}-prefs.patch @@ -34,7 +36,7 @@ %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define _appdir %{hordedir}/%{_hordeapp} %description Nag is the Horde task list application. It stores todo items, things @@ -59,33 +61,33 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi if [ "$1" = 1 ]; then @@ -100,12 +102,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml %dir %{_appdir} %{_appdir}/*.php @@ -122,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/23 21:08:02 glen +- unify with horde-passwd.spec + Revision 1.4 2005/08/23 21:03:03 glen - 2.0.2 final ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Tue Aug 23 23:20:36 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-passwd.spec - 2005-08-23 snap In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:20:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005-08-23 snap ---- Files affected: SPECS: horde-passwd.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.17 SPECS/horde-passwd.spec:1.18 --- SPECS/horde-passwd.spec:1.17 Tue Aug 23 10:00:47 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:20:29 2005 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +%define _snap 2005-08-23 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -6,14 +8,15 @@ Summary(pl): passwd - modu? do zmieniania hase? w Horde Name: horde-passwd Version: 3.0 -Release: 0.12 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: LGPL Vendor: The Horde Project Group: Applications/WWW -Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -# Source0-md5: 9ea299d2822c9d3ca5efca03ce6a23a4 +#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz +Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-hook-misconf.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -46,7 +49,7 @@ modu?. %prep -%setup -q -n passwd-h3-%{version}-beta +%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -72,7 +75,7 @@ cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf @@ -138,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/23 21:20:29 glen +- 2005-08-23 snap + Revision 1.17 2005/08/23 08:00:47 paszczus - little clean ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Tue Aug 23 23:20:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: passwd-HEAD-2005-08-23.tar.gz Message-ID: <17201.1124832048@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-23/passwd-HEAD-2005-08-23.tar.gz 15944d881c02ce24379d58a4bb613ab1 passwd-HEAD-2005-08-23.tar.gz Size: 903848 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Tue Aug 23 23:22:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-passwd.spec - don't package .htaccess In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:22:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't package .htaccess ---- Files affected: SPECS: horde-passwd.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.18 SPECS/horde-passwd.spec:1.19 --- SPECS/horde-passwd.spec:1.18 Tue Aug 23 23:20:29 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:22:27 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-23 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -52,6 +52,7 @@ %setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} %patch0 -p1 +rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) rm -f test.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/23 21:22:27 glen +- don't package .htaccess + Revision 1.18 2005/08/23 21:20:29 glen - 2005-08-23 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.18&r2=1.19&f=u From glen at pld-linux.org Tue Aug 23 23:23:45 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES (DEVEL): horde-passwd.conf, imp.conf - vim modeline In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:23:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - vim modeline ---- Files affected: SOURCES: horde-passwd.conf (1.2 -> 1.3) , imp.conf (1.3 -> 1.3.2.1) ---- Diffs: ================================================================ Index: SOURCES/horde-passwd.conf diff -u SOURCES/horde-passwd.conf:1.2 SOURCES/horde-passwd.conf:1.3 --- SOURCES/horde-passwd.conf:1.2 Tue Nov 9 11:46:43 2004 +++ SOURCES/horde-passwd.conf Tue Aug 23 23:23:39 2005 @@ -21,3 +21,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ Index: SOURCES/imp.conf diff -u SOURCES/imp.conf:1.3 SOURCES/imp.conf:1.3.2.1 --- SOURCES/imp.conf:1.3 Thu Oct 28 20:31:10 2004 +++ SOURCES/imp.conf Tue Aug 23 23:23:39 2005 @@ -22,3 +22,5 @@ order deny,allow deny from all + +# vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/horde-passwd.conf?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/imp.conf?r1=1.3&r2=1.3.2.1&f=u From paszczus at pld-linux.org Tue Aug 23 23:51:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-passwd.spec - added one more noautoreq - please do no... In-Reply-To: References: Message-ID: Author: paszczus Date: Tue Aug 23 21:51:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added one more noautoreq - please do not remove it... ---- Files affected: SPECS: horde-passwd.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.19 SPECS/horde-passwd.spec:1.20 --- SPECS/horde-passwd.spec:1.19 Tue Aug 23 23:22:27 2005 +++ SPECS/horde-passwd.spec Tue Aug 23 23:51:45 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' +%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/23 21:51:45 paszczus +- added one more noautoreq - please do not remove it... + Revision 1.19 2005/08/23 21:22:27 glen - don't package .htaccess ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.19&r2=1.20&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:25 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gtksourceview.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:52:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gtksourceview.spec (1.26.4.2 -> 1.26.4.3) ---- Diffs: ================================================================ Index: SPECS/gtksourceview.spec diff -u SPECS/gtksourceview.spec:1.26.4.2 SPECS/gtksourceview.spec:1.26.4.3 --- SPECS/gtksourceview.spec:1.26.4.2 Sun Aug 21 10:22:59 2005 +++ SPECS/gtksourceview.spec Tue Aug 23 23:52:19 2005 @@ -2,12 +2,12 @@ Summary: Text widget that extends the standard GTK+ 2.x Summary(pl): Widget tekstowy rozszerzaj?cy standardowy z GTK+ 2.x Name: gtksourceview -Version: 1.3.91 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/%{name}-%{version}.tar.bz2 -# Source0-md5: ce519c2eba2adaabe908f12f953916cc +# Source0-md5: 998b7ab6ffdc661943fa1d610d7d82b7 URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.4.3 2005/08/23 21:52:19 aflinta +- 1.3.92 + Revision 1.26.4.2 2005/08/21 08:22:59 wiget - rebuild with new cairo, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtksourceview.spec?r1=1.26.4.2&r2=1.26.4.3&f=u From aflinta at pld-linux.org Tue Aug 23 23:52:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gtksourceview-1.3.92.tar.bz2 Message-ID: <3655.1124833949@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.3/gtksourceview-1.3.92.tar.bz2 998b7ab6ffdc661943fa1d610d7d82b7 gtksourceview-1.3.92.tar.bz2 Size: 698267 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: zenity-2.11.92.tar.bz2 Message-ID: <4479.1124834035@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/zenity-2.11.92.tar.bz2 b6ea8f5f1b46fd9409d11a2c31d6a5e3 zenity-2.11.92.tar.bz2 Size: 648483 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Tue Aug 23 23:53:56 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): zenity.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Tue Aug 23 21:53:56 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: zenity.spec (1.25.2.4 -> 1.25.2.5) ---- Diffs: ================================================================ Index: SPECS/zenity.spec diff -u SPECS/zenity.spec:1.25.2.4 SPECS/zenity.spec:1.25.2.5 --- SPECS/zenity.spec:1.25.2.4 Mon Aug 8 15:41:52 2005 +++ SPECS/zenity.spec Tue Aug 23 23:53:51 2005 @@ -2,12 +2,12 @@ Summary: The GNOME port of dialog Summary(pl): Port dialog dla GNOME Name: zenity -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/zenity/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: a4bd15f652d5464cc77b562accd0d52c +# Source0-md5: b6ea8f5f1b46fd9409d11a2c31d6a5e3 URL: http://freshmeat.net/projects/zenity/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25.2.5 2005/08/23 21:53:51 aflinta +- 2.11.92 + Revision 1.25.2.4 2005/08/08 13:41:52 paladine - updated to 2.11.91 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/zenity.spec?r1=1.25.2.4&r2=1.25.2.5&f=u From glen at pld-linux.org Tue Aug 23 23:57:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: php-pear-Crypt_CHAP.spec - R php-mhash In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 21:57:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R php-mhash ---- Files affected: SPECS: php-pear-Crypt_CHAP.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/php-pear-Crypt_CHAP.spec diff -u SPECS/php-pear-Crypt_CHAP.spec:1.12 SPECS/php-pear-Crypt_CHAP.spec:1.13 --- SPECS/php-pear-Crypt_CHAP.spec:1.12 Fri Dec 3 22:57:03 2004 +++ SPECS/php-pear-Crypt_CHAP.spec Tue Aug 23 23:57:02 2005 @@ -17,6 +17,7 @@ URL: http://pear.php.net/package/Crypt_CHAP/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear +Requires: php-mhash BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -63,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/23 21:57:02 glen +- R php-mhash + Revision 1.12 2004/12/03 21:57:03 adamg - rebuild with new PEAR provides/requires scripts - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Crypt_CHAP.spec?r1=1.12&r2=1.13&f=u From kosmo at pld-linux.org Wed Aug 24 00:36:26 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (AC-branch): beecrypt.spec - fixed _without_java bcond In-Reply-To: References: Message-ID: Author: kosmo Date: Tue Aug 23 22:36:26 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - fixed _without_java bcond ---- Files affected: SPECS: beecrypt.spec (1.36.2.4 -> 1.36.2.5) ---- Diffs: ================================================================ Index: SPECS/beecrypt.spec diff -u SPECS/beecrypt.spec:1.36.2.4 SPECS/beecrypt.spec:1.36.2.5 --- SPECS/beecrypt.spec:1.36.2.4 Sun Jun 19 19:43:32 2005 +++ SPECS/beecrypt.spec Wed Aug 24 00:36:19 2005 @@ -220,9 +220,11 @@ $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.la > $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.la mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt.a $RPM_BUILD_ROOT%{_libdir}/ +%if %{with java} mv $RPM_BUILD_ROOT%{_libaltdir}/libbeecrypt_java* $RPM_BUILD_ROOT%{_libdir}/ %{__sed} -i "s|libdir='%{_libaltdir}'|libdir='%{_libdir}'|" \ $RPM_BUILD_ROOT%{_libdir}/libbeecrypt_java.la +%endif rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} @@ -283,6 +285,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36.2.5 2005/08/23 22:36:19 kosmo +- fixed _without_java bcond + Revision 1.36.2.4 2005/06/19 17:43:32 baggins - release 4 - moved so lib to /lib ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/beecrypt.spec?r1=1.36.2.4&r2=1.36.2.5&f=u From glen at pld-linux.org Wed Aug 24 00:42:55 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: php4-mcache.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:42:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-mcache.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.7 SPECS/php4-mcache.spec:1.8 --- SPECS/php4-mcache.spec:1.7 Tue Aug 23 14:42:29 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:42:47 2005 @@ -1,13 +1,14 @@ # $Revision$, $Date$ %define _name mcache %define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: mcache PHP Extension Summary(pl): Rozszerzenie PHP mcache Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.1 +Release: 0.beta%{_beta}.5 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -16,12 +17,13 @@ URL: http://www.klir.com/~johnm/php-mcache/ BuildRequires: automake BuildRequires: libmemcache-devel >= 1.3.0 +BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel Requires: php4-common = %{php_ver} +Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 %define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -78,21 +80,28 @@ %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_name} %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_name} %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README index.html %doc mcache.php +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/mcache.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -101,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 22:42:47 glen +- use .ini file in conf.d directory + Revision 1.7 2005/08/23 12:42:29 glen - up to 1.2.0-beta7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Wed Aug 24 00:46:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: php4-mcache.spec - use %requires_eq_to macro In-Reply-To: References: Message-ID: Author: glen Date: Tue Aug 23 22:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %requires_eq_to macro ---- Files affected: SPECS: php4-mcache.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php4-mcache.spec diff -u SPECS/php4-mcache.spec:1.8 SPECS/php4-mcache.spec:1.9 --- SPECS/php4-mcache.spec:1.8 Wed Aug 24 00:42:47 2005 +++ SPECS/php4-mcache.spec Wed Aug 24 00:46:45 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ %define _name mcache -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) %define _sysconfdir /etc/php4 Summary: mcache PHP Extension @@ -8,7 +7,7 @@ Name: php4-%{_name} Version: 1.2.0 %define _beta 7 -Release: 0.beta%{_beta}.5 +Release: 0.beta%{_beta}.7 Epoch: 0 License: PHP 2.02 Group: Development/Languages/PHP @@ -19,7 +18,7 @@ BuildRequires: libmemcache-devel >= 1.3.0 BuildRequires: rpmbuild(macros) >= 1.230 BuildRequires: php4-devel -Requires: php4-common = %{php_ver} +%requires_eq_to php4-common php4-devel Requires: %{_sysconfdir}/conf.d Requires(post,preun): php-common >= 3:4.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/23 22:46:45 glen +- use %requires_eq_to macro + Revision 1.8 2005/08/23 22:42:47 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.8&r2=1.9&f=u From charles at pld-linux.org Wed Aug 24 01:26:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: libtheora.spec - updated to 1.0alpha5 - clear optflags, BR:... In-Reply-To: References: Message-ID: Author: charles Date: Tue Aug 23 23:26:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0alpha5 - clear optflags, BR: sed >= 4.0 ---- Files affected: SPECS: libtheora.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/libtheora.spec diff -u SPECS/libtheora.spec:1.7 SPECS/libtheora.spec:1.8 --- SPECS/libtheora.spec:1.7 Wed May 25 14:33:42 2005 +++ SPECS/libtheora.spec Wed Aug 24 01:26:47 2005 @@ -3,12 +3,12 @@ Summary(pl): Theora - kodek obrazu do u?ywania w systemie strumieni multimedialnych Ogg Name: libtheora Version: 1.0 -%define bver alpha4 -Release: 0.%{bver}.2 +%define bver alpha5 +Release: 0.%{bver}.1 License: BSD-like Group: Libraries -Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.gz -# Source0-md5: 75f436a980b80f8b8102ee182ddb8748 +Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}%{bver}.tar.bz2 +# Source0-md5: 41940562932a8b7bf795d79e4190b21a URL: http://www.theora.org/ BuildRequires: SDL-devel BuildRequires: autoconf @@ -18,6 +18,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel >= 1:1.0.1 BuildRequires: pkgconfig +BuildRequires: sed >= 4.0 Requires: libogg >= 2:1.1 Requires: libvorbis >= 1:1.0.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -64,8 +65,10 @@ %setup -q -n %{name}-%{version}%{bver} %build +%{__sed} -i 's,CFLAGS="-g -O2 ,CFLAGS=",' configure.ac + %{__libtoolize} -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__automake} %configure @@ -108,6 +111,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/23 23:26:47 charles +- updated to 1.0alpha5 +- clear optflags, BR: sed >= 4.0 + Revision 1.7 2005/05/25 12:33:42 pluto - release .2 for Th. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libtheora.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 01:27:08 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: libtheora-1.0alpha5.tar.bz2 Message-ID: <636.1124839628@distfiles.pld-linux.org> Files fetched: 1 STORED: http://downloads.xiph.org/releases/theora/libtheora-1.0alpha5.tar.bz2 41940562932a8b7bf795d79e4190b21a libtheora-1.0alpha5.tar.bz2 Size: 1765512 bytes -- Virtually Yours: distfiles. From cvs at pld-linux.org Wed Aug 24 01:27:39 2005 From: cvs at pld-linux.org (qwiat) Date: Tue Dec 20 10:39:33 2005 Subject: PLD-doc/queue/system.sec Message-ID: <6332@svn.pld-linux.org> Author: qwiat Date: Wed Aug 24 01:27:36 2005 New Revision: 6332 Added: PLD-doc/queue/system.sec Log: - prawie gotowy opis pliku /etc/sysconfig/system Added: PLD-doc/queue/system.sec ============================================================================== --- (empty file) +++ PLD-doc/queue/system.sec Wed Aug 24 01:27:36 2005 @@ -0,0 +1,89 @@ + +
+Podstawowe ustawienia systemu + + Plik /etc/sysconfig/system przechowuje + zaawansowan? konfiguracj? systemu, poni?ej przedstawiono opis + cz??ci z nich. + + +
+ Konfiguracja skrypt?w startowych + + Zmienna okre?la czy skrypty startowe maj? u?ywa? kolor?w: + COLOR_INIT=yes + + + Numer kolumny wy?wietlania statusu skryptu startowego: + INIT_COL=75 + + + Szybsze uruchomienie systemu z pomini?ciem niekt?rych skrypt?w, + startowych - m.in. skryptu od obs?ugi j?zyk?w. + FASTRC=no + + + Zezwolenie na interaktywny start rc-skrypt?w po wci?ni?ciu + klawisza "I": + PROMPT=yes + +
+ + +
+ Opcje zwi?zane z j?drem + + "Gadatliwo??" kernela dla komunikat?w wysy?anych na konsol? + tekstow?. Opcja jest jednoznaczna z wywo?aniem polecenia + dmesg -n {$nr} (domyslnie 1): + CONSOLE_LOGLEVEL=1 + + + Czas w sekundach, po kt?rym nast?pi restart maszyny je?li wyst?pi? + krytyczny b??d j?dra (kernel panic). Wa?na opcja w przypadku + komputer?w do kt?rych nie mamy fizycznego dost?pu + PANIC_REBOOT_TIME=60 + +
+ + +
+ Opcje uruchamiania systemu + + Uruchomienie programu sulogin (pytanie o has?o root-a) zamiast + pow?oki je?li wyst?pi? problemy w trakcie uruchomienia; + RUN_SULOGIN_ON_ERR=yes + + + Warto?? "yes" poni?szej zmiennej pozwala na zalogowanie + si? u?ytkownik?w dopiero po zako?czeniu procesu ?adowania + systemu. + DELAY_LOGIN=yes + + + Opcja okre?la czy pod czas startu ma by? usuwana zawarto?? + katalogu /tmp + CLEAN_TMP=yes + + + Wskazuje czy ma by? zamontowany system plik?w devfs + MOUNT_DEVFS=no + +
+ +
+ Us?ugi + + Domy?lny priorytet (liczba nice) dla us?ug o ile + ta warto?? nie zosta?a zdefiniowana w zmiennej SERVICE_RUN_NICE_LEVEL + umieszczonej w /etc/sysconfig/{$us?uga}: + DEFAULT_SERVICE_RUN_NICE_LEVEL=0 + + + Lista katalog?w przechowuj?cych systemy typu chroot. Warto?? + ta jest odczytywana przez skrypt + /etc/init.d/sys-chroots: + SYSTEM_CHROOTS=/jakis_katalog + +
+
From charles at pld-linux.org Wed Aug 24 02:00:19 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: mkvtoolnix.spec - updated to 1.5.5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 00:00:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5.5 ---- Files affected: SPECS: mkvtoolnix.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.5 SPECS/mkvtoolnix.spec:1.6 --- SPECS/mkvtoolnix.spec:1.5 Sun Jul 3 21:29:39 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 02:00:08 2005 @@ -5,12 +5,12 @@ Summary: Matroska video utilities Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix -Version: 1.5.0 +Version: 1.5.5 Release: 0.1 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 -# Source0-md5: 71c447f02ee306dbff53804c770b5ff3 +# Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 00:00:08 charles +- updated to 1.5.5 + Revision 1.5 2005/07/03 19:29:39 charles - updated to 1.5.0 (now build gui) - updated TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 02:00:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: mkvtoolnix-1.5.5.tar.bz2 Message-ID: <11871.1124841627@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-1.5.5.tar.bz2 f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 mkvtoolnix-1.5.5.tar.bz2 Size: 648667 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:54:29 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-applets.spec - updated to 2.11.92.1 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:54:29 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92.1 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.7 -> 1.152.2.8) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.7 SPECS/gnome-applets.spec:1.152.2.8 --- SPECS/gnome-applets.spec:1.152.2.7 Tue Aug 23 14:04:08 2005 +++ SPECS/gnome-applets.spec Wed Aug 24 08:54:24 2005 @@ -7,13 +7,13 @@ Summary(ru): ????????? ?????????, ?????????????? ? ?????? GNOME Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets -Version: 2.11.92 +Version: 2.11.92.1 Release: 1 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 2b78a6c5d59aa889979dbb54a301bf4e +# Source0-md5: 035684af82060eb19af881d70a822478 Patch0: %{name}-stickynotes-title-size.patch Patch1: %{name}-m4_fix.patch Patch2: %{name}-pangoxft_fix.patch @@ -34,7 +34,7 @@ BuildRequires: intltool >= 0.33 BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgtop-devel >= 1:2.10.0 +BuildRequires: libgtop-devel >= 1:2.11.92 BuildRequires: libtool BuildRequires: libwnck-devel >= 2.11.91 BuildRequires: libxml2-devel >= 1:2.6.19 @@ -748,6 +748,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.8 2005/08/24 06:54:24 paladine +- updated to 2.11.92.1 + Revision 1.152.2.7 2005/08/23 12:04:08 paladine - updated to 2.11.92 - updated %%files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.7&r2=1.152.2.8&f=u From paladine at pld-linux.org Wed Aug 24 08:54:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gnome-applets-2.11.92.1.tar.bz2 Message-ID: <2520.1124866476@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.11/gnome-applets-2.11.92.1.tar.bz2 035684af82060eb19af881d70a822478 gnome-applets-2.11.92.1.tar.bz2 Size: 3786672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gnome-backgrounds-2.11.92.tar.bz2 Message-ID: <4125.1124866647@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/gnome-backgrounds-2.11.92.tar.bz2 580d2feea8f522ffaa77f71d53dcbcc9 gnome-backgrounds-2.11.92.tar.bz2 Size: 1767324 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 08:57:24 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-backgrounds.spec - updated to 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 06:57:24 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 ---- Files affected: SPECS: gnome-backgrounds.spec (1.8 -> 1.8.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-backgrounds.spec diff -u SPECS/gnome-backgrounds.spec:1.8 SPECS/gnome-backgrounds.spec:1.8.2.1 --- SPECS/gnome-backgrounds.spec:1.8 Fri Jul 8 16:29:08 2005 +++ SPECS/gnome-backgrounds.spec Wed Aug 24 08:57:18 2005 @@ -2,12 +2,12 @@ Summary: Set of backgrounds for GNOME desktop Summary(pl): Zestaw tapet dla ?rodowiska GNOME Name: gnome-backgrounds -Version: 2.10.2 +Version: 2.11.92 Release: 1 License: GPL v2 Group: Themes -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 20b6cf2ed37c4b6ef4982dee0a5d9226 +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-backgrounds/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 580d2feea8f522ffaa77f71d53dcbcc9 URL: http://www.gnome.org/ BuildRequires: intltool >= 0.33 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8.2.1 2005/08/24 06:57:18 paladine +- updated to 2.11.92 + Revision 1.8 2005/07/08 14:29:08 freetz - 2.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-backgrounds.spec?r1=1.8&r2=1.8.2.1&f=u From glen at pld-linux.org Wed Aug 24 09:11:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: qemu-ifup.patch (NEW) - patch to override qemu-ifup path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:11:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch to override qemu-ifup path ---- Files affected: SOURCES: qemu-ifup.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/qemu-ifup.patch diff -u /dev/null SOURCES/qemu-ifup.patch:1.1 --- /dev/null Wed Aug 24 09:11:48 2005 +++ SOURCES/qemu-ifup.patch Wed Aug 24 09:11:43 2005 @@ -0,0 +1,11 @@ +--- ./vl.c~ 2005-08-20 16:14:48.000000000 +0300 ++++ ./vl.c 2005-08-21 14:05:26.000000000 +0300 +@@ -85,7 +85,7 @@ + + //#define DO_TB_FLUSH + +-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" ++#define DEFAULT_NETWORK_SCRIPT "/sbin/qemu-ifup" + + //#define DEBUG_UNUSED_IOPORT + //#define DEBUG_IOPORT ================================================================ From glen at pld-linux.org Wed Aug 24 09:12:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: qemu.spec - supply /sbin/qemu-ifup script In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 07:12:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - supply /sbin/qemu-ifup script ---- Files affected: SPECS: qemu.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/qemu.spec diff -u SPECS/qemu.spec:1.33 SPECS/qemu.spec:1.34 --- SPECS/qemu.spec:1.33 Sat Aug 20 07:54:55 2005 +++ SPECS/qemu.spec Wed Aug 24 09:12:17 2005 @@ -16,7 +16,7 @@ Summary(pl): QEMU - emulator procesora Name: qemu Version: 0.7.1 -%define _rel 1 +%define _rel 1.4 Release: %{_rel}%{?with_kqemu:k} License: GPL Group: Applications/Emulators @@ -37,6 +37,7 @@ Patch6: %{name}-gcc4_ppc.patch Patch7: %{name}-parallel.patch Patch8: %{name}-nosdlgui.patch +Patch9: %{name}-ifup.patch URL: http://fabrice.bellard.free.fr/qemu/ BuildRequires: SDL-devel >= 1.2.1 %if %{with kqemu} && %{with dist_kernel} @@ -127,6 +128,7 @@ %patch6 -p1 %patch7 -p1 %{?with_nosdlgui:%patch8 -p1} +%patch9 -p1 %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure %{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile @@ -181,6 +183,16 @@ %if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/sbin +cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup +#!/bin/sh +if [ -f /etc/sysconfig/qemu ]; then + . /etc/sysconfig/qemu +fi +# of course this will work only for one interface. a lot possible to involve +sudo /sbin/ifconfig $1 ${INTERFACE_ADDR:-172.20.0.1} +EOF %endif %if %{with kernel} @@ -217,11 +229,11 @@ %postun -n kernel-smp-misc-kqemu %depmod %{_kernel_ver}smp - %if %{with userspace} %files %defattr(644,root,root,755) %doc README qemu-doc.html qemu-tech.html +%attr(755,root,root) /sbin/qemu-ifup %attr(755,root,root) %{_bindir}/* %{_datadir}/qemu %{_mandir}/man1/qemu.1* @@ -250,6 +262,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/24 07:12:17 glen +- supply /sbin/qemu-ifup script + Revision 1.33 2005/08/20 05:54:55 charles - separated kernel modules + bconds - updated BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.33&r2=1.34&f=u From paladine at pld-linux.org Wed Aug 24 09:12:48 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gtk-engines-2.6.5.tar.bz2 Message-ID: <12768.1124867568@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-2.6.5.tar.bz2 28469a797ba1e6aaa3f7eea4c9f5f9b7 gtk-engines-2.6.5.tar.bz2 Size: 477897 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:12:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: gtk2-engines.spec - updated to 2.6.5 - sorted and fixed %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:12:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.5 - sorted and fixed %%files ---- Files affected: SPECS: gtk2-engines.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/gtk2-engines.spec diff -u SPECS/gtk2-engines.spec:1.35 SPECS/gtk2-engines.spec:1.36 --- SPECS/gtk2-engines.spec:1.35 Wed Jul 27 21:42:55 2005 +++ SPECS/gtk2-engines.spec Wed Aug 24 09:12:40 2005 @@ -2,13 +2,13 @@ Summary: Default GTK+2 theme engines Summary(pl): Motywy do GTK+2 Name: gtk2-engines -Version: 2.6.4 +Version: 2.6.5 Release: 1 Epoch: 1 License: GPL Group: Themes/GTK+ Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-%{version}.tar.bz2 -# Source0-md5: 3389a92b62b9c8b916fbb52c4529f072 +# Source0-md5: 28469a797ba1e6aaa3f7eea4c9f5f9b7 URL: http://gtk.themes.org/ BuildRequires: autoconf BuildRequires: automake @@ -70,17 +70,17 @@ %files %defattr(644,root,root,755) %doc ChangeLog README -%dir %{_libdir}/gtk-2.0/*/engines -%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so -%{_pkgconfigdir}/* %{_datadir}/themes/Clearlooks %{_datadir}/themes/Crux -%{_datadir}/themes/Industrial +%{_datadir}/themes/Industrial/* %{_datadir}/themes/LighthouseBlue %{_datadir}/themes/Metal/* %{_datadir}/themes/Mist %{_datadir}/themes/Redmond %{_datadir}/themes/ThinIce/* +%dir %{_libdir}/gtk-2.0/*/engines +%attr(755,root,root) %{_libdir}/gtk-2.0/*/engines/*.so +%{_pkgconfigdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -88,6 +88,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:12:40 paladine +- updated to 2.6.5 +- sorted and fixed %%files + Revision 1.35 2005/07/27 19:42:55 freetz - 2.6.4, makefile path already included ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk2-engines.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: conary.spec - updated to 0.61.10 In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:23:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.61.10 ---- Files affected: SPECS: conary.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.35 SPECS/conary.spec:1.36 --- SPECS/conary.spec:1.35 Wed Aug 3 09:12:37 2005 +++ SPECS/conary.spec Wed Aug 24 09:23:12 2005 @@ -2,13 +2,14 @@ Summary: Distributed software management system for Linux distributions Summary(pl): Rozproszony system zarz?dzania oprogramowaniem dla dystrybucji Linuksa Name: conary -Version: 0.61.6 +Version: 0.61.10 Release: 0.1 License: CPL 1.0 Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 -# Source0-md5: 6d81530fe8561537a9b1d743cf207cd7 +# Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb URL: http://wiki.specifixinc.com/ +BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 Requires: python-devel-tools @@ -84,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 07:23:12 paszczus +- updated to 0.61.10 + Revision 1.35 2005/08/03 07:12:37 paszczus - updated to 0.61.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.35&r2=1.36&f=u From paszczus at pld-linux.org Wed Aug 24 09:23:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: conary-0.61.10.tar.bz2 Message-ID: <18443.1124868207@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://download.rpath.com/pub/conary/conary-0.61.10.tar.bz2 2779696b7c6b24d5dc07c348e7743dfb conary-0.61.10.tar.bz2 Size: 384469 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Wed Aug 24 09:27:26 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: conary.spec - updated URL (thx glen) In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 07:27:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL (thx glen) ---- Files affected: SPECS: conary.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/conary.spec diff -u SPECS/conary.spec:1.36 SPECS/conary.spec:1.37 --- SPECS/conary.spec:1.36 Wed Aug 24 09:23:12 2005 +++ SPECS/conary.spec Wed Aug 24 09:27:21 2005 @@ -8,7 +8,7 @@ Group: Applications/System Source0: ftp://download.rpath.com/pub/conary/%{name}-%{version}.tar.bz2 # Source0-md5: 2779696b7c6b24d5dc07c348e7743dfb -URL: http://wiki.specifixinc.com/ +URL: http://wiki.conary.com/ BuildRequires: kidc BuildRequires: python-devel BuildRequires: sqlite3-devel >= 3.0.0 @@ -85,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/24 07:27:21 paszczus +- updated URL (thx glen) + Revision 1.36 2005/08/24 07:23:12 paszczus - updated to 0.61.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/conary.spec?r1=1.36&r2=1.37&f=u From jareq at pld-linux.org Wed Aug 24 09:34:35 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: monotone.spec - updated to 0.22 - rel 1 In-Reply-To: References: Message-ID: Author: jareq Date: Wed Aug 24 07:34:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.22 - rel 1 ---- Files affected: SPECS: monotone.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/monotone.spec diff -u SPECS/monotone.spec:1.13 SPECS/monotone.spec:1.14 --- SPECS/monotone.spec:1.13 Mon Jul 25 23:18:15 2005 +++ SPECS/monotone.spec Wed Aug 24 09:34:30 2005 @@ -6,12 +6,12 @@ Summary: A free distributed version control system Summary(pl): Wolnodost?pny rozproszony system kontroli wersji Name: monotone -Version: 0.21 -Release: 3 +Version: 0.22 +Release: 1 License: GPL v2 Group: Development/Version Control Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz -# Source0-md5: c30c96b97ae56268cac567bd8837b991 +# Source0-md5: ee0f25577b8a640df3015113e67bb718 URL: http://www.venge.net/monotone/ BuildRequires: boost-date_time-devel BuildRequires: boost-devel >= 1.32.0-3 @@ -83,6 +83,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/24 07:34:30 jareq +- updated to 0.22 +- rel 1 + Revision 1.13 2005/07/25 21:18:15 arekm - add BR boost-mem_fn-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monotone.spec?r1=1.13&r2=1.14&f=u From jareq at pld-linux.org Wed Aug 24 09:35:16 2005 From: jareq at pld-linux.org (jareq) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: monotone-0.22.tar.gz Message-ID: <25417.1124868916@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.venge.net/monotone/downloads/monotone-0.22.tar.gz ee0f25577b8a640df3015113e67bb718 monotone-0.22.tar.gz Size: 5038069 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gconf-editor.spec - updated to 2.11.92 - sorted %%f... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:40:40 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: gconf-editor.spec (1.30 -> 1.30.2.1) ---- Diffs: ================================================================ Index: SPECS/gconf-editor.spec diff -u SPECS/gconf-editor.spec:1.30 SPECS/gconf-editor.spec:1.30.2.1 --- SPECS/gconf-editor.spec:1.30 Fri Apr 8 12:48:53 2005 +++ SPECS/gconf-editor.spec Wed Aug 24 09:40:33 2005 @@ -2,12 +2,12 @@ Summary: An editor for the GConf configuration system Summary(pl): Edytor do systemu konfiguracji GConf Name: gconf-editor -Version: 2.10.0 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: 651a18f7eb5af91761521aa4f04ccc07 +Source0: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: afbc07a3d861e1b43a5c2592419cc47d Patch0: %{name}-desktop.patch BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf @@ -69,12 +69,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_desktopdir}/* -%{_pixmapsdir}/* +%{_iconsdir}/*/*/apps/*.png %{_mandir}/man1/* %{_omf_dest_dir}/%{name} -%{_iconsdir}/*/*/apps/*.png +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/gconf-editor.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -82,6 +82,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30.2.1 2005/08/24 07:40:33 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.30 2005/04/08 10:48:53 paladine - new style macros - rel. 3, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gconf-editor.spec?r1=1.30&r2=1.30.2.1&f=u From paladine at pld-linux.org Wed Aug 24 09:40:40 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gconf-editor-2.11.92.tar.bz2 Message-ID: <29238.1124869240@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.11/gconf-editor-2.11.92.tar.bz2 afbc07a3d861e1b43a5c2592419cc47d gconf-editor-2.11.92.tar.bz2 Size: 477844 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: bug-buddy-2.11.92.tar.bz2 Message-ID: <31679.1124869523@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/bug-buddy-2.11.92.tar.bz2 fd6affcdb1a205b2acfc866eb4844c4a bug-buddy-2.11.92.tar.bz2 Size: 561719 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:45:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): bug-buddy.spec - updated to 2.11.92 - sorted %%file... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:45:25 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - sorted %%files - itemize schemas ---- Files affected: SPECS: bug-buddy.spec (1.37.2.3 -> 1.37.2.4) ---- Diffs: ================================================================ Index: SPECS/bug-buddy.spec diff -u SPECS/bug-buddy.spec:1.37.2.3 SPECS/bug-buddy.spec:1.37.2.4 --- SPECS/bug-buddy.spec:1.37.2.3 Thu Aug 18 07:52:41 2005 +++ SPECS/bug-buddy.spec Wed Aug 24 09:45:20 2005 @@ -2,12 +2,12 @@ Summary: Utility to ease the reporting of bugs within the GNOME Summary(pl): Narz?dzie u?atwiaj?ce zg?aszanie b??d?w w ?rodowisku GNOME Name: bug-buddy -Version: 2.11.1 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: 490f9b8f63119bafd19a37a0f0719b65 +# Source0-md5: fd6affcdb1a205b2acfc866eb4844c4a Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.11.90-2 @@ -92,12 +92,12 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO docs/multiple_bts.txt %attr(755,root,root) %{_bindir}/* -%{_mandir}/man1/* %{_datadir}/%{name} %{_desktopdir}/* -%{_pixmapsdir}/* +%{_mandir}/man1/* %{_omf_dest_dir}/* -%{_sysconfdir}/gconf/schemas/* +%{_pixmapsdir}/* +%{_sysconfdir}/gconf/schemas/bug-buddy.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -105,6 +105,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.4 2005/08/24 07:45:20 paladine +- updated to 2.11.92 +- sorted %%files +- itemize schemas + Revision 1.37.2.3 2005/08/18 05:52:41 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bug-buddy.spec?r1=1.37.2.3&r2=1.37.2.4&f=u From paladine at pld-linux.org Wed Aug 24 09:48:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gnome-themes-2.11.92.tar.bz2 Message-ID: <1446.1124869702@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/gnome-themes-2.11.92.tar.bz2 89be15b82ac0561553356f537bb3686b gnome-themes-2.11.92.tar.bz2 Size: 2574494 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Wed Aug 24 09:48:23 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-themes.spec - updated to 2.11.92 - small fix ... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 07:48:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - small fix in Clearlooks subpackage %%files - require new gtk2-engines - removed redundant R: gtk2-engines from subpackages ---- Files affected: SPECS: gnome-themes.spec (1.46.4.3 -> 1.46.4.4) ---- Diffs: ================================================================ Index: SPECS/gnome-themes.spec diff -u SPECS/gnome-themes.spec:1.46.4.3 SPECS/gnome-themes.spec:1.46.4.4 --- SPECS/gnome-themes.spec:1.46.4.3 Mon Aug 8 16:47:36 2005 +++ SPECS/gnome-themes.spec Wed Aug 24 09:48:18 2005 @@ -2,20 +2,20 @@ Summary: Default themes for GNOME2 enviroment Summary(pl): Domy?lne motywy dla ?rodowiska GNOME2 Name: gnome-themes -Version: 2.11.91 +Version: 2.11.92 Release: 1 License: LGPL Group: Themes Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: c040ffaf01d644bfba22e0835fdac7b0 +# Source0-md5: 89be15b82ac0561553356f537bb3686b URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake -BuildRequires: gtk2-engines >= 1:2.6.2-1 +BuildRequires: gtk2-engines >= 1:2.6.5 BuildRequires: libtool BuildRequires: intltool >= 0.28 BuildRequires: rpmbuild(macros) >= 1.197 -Requires: gtk2-engines >= 1:2.6.2-1 +Requires: gtk2-engines >= 1:2.6.5 Conflicts: crux-engine Conflicts: crux-theme BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +71,6 @@ Group: Themes Requires: %{name} = %{version}-%{release} Requires: gnome-icon-theme >= 2.10.0 -Requires: gtk2-engines >= 2.6.2 %description Glider Glider theme for GNOME 2 enviroment. @@ -208,7 +207,6 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-Sandwish = %{version}-%{release} Requires: %{name}-Sandy = %{version}-%{release} -Requires: gtk2-engines >= 2.6.2 %description Ocean-Dream Ocean-Dream theme for GNOME 2 enviroment. @@ -344,7 +342,7 @@ %files Clearlooks %defattr(644,root,root,755) -%{_datadir}/themes/Clearlooks +%{_datadir}/themes/Clearlooks/* %files Crux %defattr(644,root,root,755) @@ -442,6 +440,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.4.4 2005/08/24 07:48:18 paladine +- updated to 2.11.92 +- small fix in Clearlooks subpackage %%files +- require new gtk2-engines +- removed redundant R: gtk2-engines from subpackages + Revision 1.46.4.3 2005/08/08 14:47:36 paladine - updated to 2.11.91 - new Clearlooks theme subpackage :) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-themes.spec?r1=1.46.4.3&r2=1.46.4.4&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:16 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:00:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.1 ---- Files affected: SPECS: gtk+2.spec (1.179.2.8 -> 1.179.2.9) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.8 SPECS/gtk+2.spec:1.179.2.9 --- SPECS/gtk+2.spec:1.179.2.8 Wed Aug 17 22:18:52 2005 +++ SPECS/gtk+2.spec Wed Aug 24 10:00:08 2005 @@ -14,17 +14,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.0 +Version: 2.8.1 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: e169d35239bf9d23bdd84c473e3c4917 +# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version -Patch2: %{name}-colormap.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -35,7 +34,7 @@ BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.8.0 +BuildRequires: glib2-devel >= 1:2.8.1 %{?with_doc:BuildRequires: gtk-doc >= 1.0} %{?with_xlibs:BuildRequires: libXfixes-devel} %{?with_xlibs:BuildRequires: libXi-devel} @@ -145,7 +144,6 @@ %setup -q -n gtk+-%{version} %patch0 -p1 %{?with_xlibs:%patch1 -p1} -%patch2 -p0 %build %{__gtkdocize} @@ -277,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.9 2005/08/24 08:00:08 aflinta +- 2.8.1 + Revision 1.179.2.8 2005/08/17 20:18:52 aflinta - require official releases ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.8&r2=1.179.2.9&f=u From aflinta at pld-linux.org Wed Aug 24 10:00:55 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gtk+-2.8.1.tar.bz2 Message-ID: <8359.1124870455@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.1.tar.bz2 62ffb0e555dcc4eee3eba5e3214897e3 gtk+-2.8.1.tar.bz2 Size: 11802868 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: DISTFILES: gnome-nettool-1.3.92.tar.bz2 Message-ID: <21586.1124871734@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/gnome-nettool-1.3.92.tar.bz2 fae4671363b0a10608e07c2b02601000 gnome-nettool-1.3.92.tar.bz2 Size: 472700 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 10:22:04 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - 1.3.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:22:04 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.3.92 ---- Files affected: SPECS: gnome-nettool.spec (1.9 -> 1.9.2.1) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9 SPECS/gnome-nettool.spec:1.9.2.1 --- SPECS/gnome-nettool.spec:1.9 Tue Jun 14 21:25:31 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:21:57 2005 @@ -2,12 +2,12 @@ Summary: GNOME interface for networking tools Summary(pl): Interfejs dla narz?dzi sieciowych dla GNOME Name: gnome-nettool -Version: 1.2.0 -Release: 2 +Version: 1.3.92 +Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 277338cf5d54ae9941260dd993a14f7a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-nettool/1.3/%{name}-%{version}.tar.bz2 +# Source0-md5: fae4671363b0a10608e07c2b02601000 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel @@ -18,7 +18,6 @@ BuildRequires: gtk+2-devel >= 2:2.6.3 BuildRequires: intltool >= 0.11 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgnomeui-devel >= 2.10.0-2 BuildRequires: libtool BuildRequires: pkgconfig Requires: gtk+2 >= 2:2.6.3 @@ -57,6 +56,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +%banner %{name} -e << EOF +For full functionality, you need to install various networking command-line +tools, like ping, netstat, ifconfig, whois, traceroute, finger +EOF + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO @@ -71,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.1 2005/08/24 08:21:57 aflinta +- 1.3.92 + Revision 1.9 2005/06/14 19:25:31 zbyniu - BR: gettext-devel, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9&r2=1.9.2.1&f=u From aflinta at pld-linux.org Wed Aug 24 10:24:44 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-nettool.spec - missing dot i banner In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:24:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dot i banner ---- Files affected: SPECS: gnome-nettool.spec (1.9.2.1 -> 1.9.2.2) ---- Diffs: ================================================================ Index: SPECS/gnome-nettool.spec diff -u SPECS/gnome-nettool.spec:1.9.2.1 SPECS/gnome-nettool.spec:1.9.2.2 --- SPECS/gnome-nettool.spec:1.9.2.1 Wed Aug 24 10:21:57 2005 +++ SPECS/gnome-nettool.spec Wed Aug 24 10:24:39 2005 @@ -59,7 +59,7 @@ %post %banner %{name} -e << EOF For full functionality, you need to install various networking command-line -tools, like ping, netstat, ifconfig, whois, traceroute, finger +tools, like ping, netstat, ifconfig, whois, traceroute, finger. EOF %files -f %{name}.lang @@ -76,6 +76,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9.2.2 2005/08/24 08:24:39 aflinta +- missing dot i banner + Revision 1.9.2.1 2005/08/24 08:21:57 aflinta - 1.3.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-nettool.spec?r1=1.9.2.1&r2=1.9.2.2&f=u From aflinta at pld-linux.org Wed Aug 24 10:26:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS (DEVEL): gnome-system-tools.spec - fixed schema name in post In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 08:26:34 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fixed schema name in post ---- Files affected: SPECS: gnome-system-tools.spec (1.46.2.5 -> 1.46.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-system-tools.spec diff -u SPECS/gnome-system-tools.spec:1.46.2.5 SPECS/gnome-system-tools.spec:1.46.2.6 --- SPECS/gnome-system-tools.spec:1.46.2.5 Tue Aug 23 16:50:22 2005 +++ SPECS/gnome-system-tools.spec Wed Aug 24 10:26:29 2005 @@ -5,7 +5,7 @@ Summary(pl): GNOME System Tools - narz?dzia systemowe GNOME Name: gnome-system-tools Version: 1.3.92 -Release: 1 +Release: 2 License: GPL v2 Group: Applications/System Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.3/%{name}-%{version}.tar.bz2 @@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install gnome-system-tools-schemas +%gconf_schema_install gnome-system-tools.schemas %scrollkeeper_update_post %preun @@ -114,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.6 2005/08/24 08:26:29 aflinta +- fixed schema name in post + Revision 1.46.2.5 2005/08/23 14:50:22 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46.2.5&r2=1.46.2.6&f=u From glen at pld-linux.org Wed Aug 24 10:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: eventum-hl-quot-fix.patch (NEW) - fix quote code (bryan a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:28:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix quote code (bryan also sent patch to upstream) ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u /dev/null SOURCES/eventum-hl-quot-fix.patch:1.1 --- /dev/null Wed Aug 24 10:28:30 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:28:25 2005 @@ -0,0 +1,120 @@ +Only in /tmp/: .channels +Only in /tmp/: .config +Only in /tmp/: .depdb +Only in /tmp/: .depdblock +Only in /tmp/: .filemap +Only in /tmp/: .lock +Only in /tmp/: .registry +Only in /tmp/: .siegerc +Only in /tmp/: .ssh-auth +Only in /tmp/: StartSession.php +Only in /tmp/: a +Only in /tmp/: apache-tinymce.conf +Only in /tmp/: audio +Only in .: block.textformat.php +Only in /tmp/: browser-plugins.spec +Only in .: compiler.assign.php +Only in /tmp/: configure.in +Only in .: function.assign_debug_info.php +Only in .: function.calendar.php +Only in .: function.config_load.php +Only in .: function.counter.php +Only in .: function.cycle.php +Only in .: function.debug.php +Only in .: function.eval.php +Only in .: function.fetch.php +Only in .: function.get_display_style.php +Only in .: function.get_innerhtml.php +Only in .: function.get_textarea_size.php +Only in .: function.html_checkboxes.php +Only in .: function.html_image.php +Only in .: function.html_options.php +Only in .: function.html_radios.php +Only in .: function.html_select_date.php +Only in .: function.html_select_time.php +Only in .: function.html_table.php +Only in .: function.mailto.php +Only in .: function.math.php +Only in .: function.popup.php +Only in .: function.popup_init.php +Only in /tmp/: glibc-2.3.5-2.i686.rpm +Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm +Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm +Only in /tmp/: gollem.spec +Only in /tmp/: horde-passwd-hook-misconf.patch +Only in /tmp/: hsperfdata_builder +Only in /tmp/: iconv-2.3.5-3.1.i686.rpm +Only in /tmp/: issue +Only in /tmp/: jama +Only in /tmp/: jserv +Only in /tmp/: jserv.conf +Only in /tmp/: junk +Only in /tmp/: l +Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm +Only in /tmp/: m.patch +Only in /tmp/: macromedia-flash.install +Only in /tmp/: main.php +Only in .: modifier.capitalize.php +Only in .: modifier.cat.php +Only in .: modifier.count_characters.php +Only in .: modifier.count_paragraphs.php +Only in .: modifier.count_sentences.php +Only in .: modifier.count_words.php +Only in .: modifier.date_format.php +Only in .: modifier.debug_print_var.php +Only in .: modifier.default.php +Only in .: modifier.escape.php +diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php +--- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +@@ -56,18 +56,19 @@ + if ($escape) { + $match[2] = htmlspecialchars($match[2]); + } +- if(trim($match[2]) != "") { ++ $line = trim($match[2]); ++ if ($line) { + $indent = strlen(preg_replace('/[\s]*/','',$match[1])); + $color = $indent % count($colors); + + $ret .= ''; + $ret .= htmlspecialchars($match[1])." "; +- $ret .= $match[2]; +- $ret .= ""; ++ $ret .= $line; ++ $ret .= "\n"; + } else { +- $ret .= $match[2]; ++ $ret .= "\n"; + } + } + return $ret; + } +-?> +\ No newline at end of file ++?> +Only in .: modifier.indent.php +Only in .: modifier.lower.php +Only in .: modifier.nl2br.php +Only in .: modifier.regex_replace.php +Only in .: modifier.replace.php +Only in .: modifier.spacify.php +Only in .: modifier.string_format.php +Only in .: modifier.strip.php +Only in .: modifier.strip_tags.php +Only in .: modifier.truncate.php +Only in .: modifier.upper.php +Only in .: modifier.wordwrap.php +Only in .: outputfilter.trimwhitespace.php +Only in /tmp/: poldek.conf.rpmnew +Only in /tmp/: poldek.conf.rpmsave +Only in /tmp/: posttrans +Only in /tmp/: pretrans +Only in /tmp/: rc-script +Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm +Only in /tmp/: rpm.groups +Only in /tmp/: rpm.patch +Only in /tmp/: rpm.spec +Only in /tmp/: settings.php +Only in .: shared.escape_special_chars.php +Only in .: shared.make_timestamp.php ================================================================ From glen at pld-linux.org Wed Aug 24 10:29:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - remove junk In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:29:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove junk ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.1 SOURCES/eventum-hl-quot-fix.patch:1.2 --- SOURCES/eventum-hl-quot-fix.patch:1.1 Wed Aug 24 10:28:25 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:29:00 2005 @@ -1,69 +1,3 @@ -Only in /tmp/: .channels -Only in /tmp/: .config -Only in /tmp/: .depdb -Only in /tmp/: .depdblock -Only in /tmp/: .filemap -Only in /tmp/: .lock -Only in /tmp/: .registry -Only in /tmp/: .siegerc -Only in /tmp/: .ssh-auth -Only in /tmp/: StartSession.php -Only in /tmp/: a -Only in /tmp/: apache-tinymce.conf -Only in /tmp/: audio -Only in .: block.textformat.php -Only in /tmp/: browser-plugins.spec -Only in .: compiler.assign.php -Only in /tmp/: configure.in -Only in .: function.assign_debug_info.php -Only in .: function.calendar.php -Only in .: function.config_load.php -Only in .: function.counter.php -Only in .: function.cycle.php -Only in .: function.debug.php -Only in .: function.eval.php -Only in .: function.fetch.php -Only in .: function.get_display_style.php -Only in .: function.get_innerhtml.php -Only in .: function.get_textarea_size.php -Only in .: function.html_checkboxes.php -Only in .: function.html_image.php -Only in .: function.html_options.php -Only in .: function.html_radios.php -Only in .: function.html_select_date.php -Only in .: function.html_select_time.php -Only in .: function.html_table.php -Only in .: function.mailto.php -Only in .: function.math.php -Only in .: function.popup.php -Only in .: function.popup_init.php -Only in /tmp/: glibc-2.3.5-2.i686.rpm -Only in /tmp/: glibc-devel-2.3.5-2.i686.rpm -Only in /tmp/: glibc-misc-2.3.5-2.i686.rpm -Only in /tmp/: gollem.spec -Only in /tmp/: horde-passwd-hook-misconf.patch -Only in /tmp/: hsperfdata_builder -Only in /tmp/: iconv-2.3.5-3.1.i686.rpm -Only in /tmp/: issue -Only in /tmp/: jama -Only in /tmp/: jserv -Only in /tmp/: jserv.conf -Only in /tmp/: junk -Only in /tmp/: l -Only in /tmp/: linux-libc-headers-2.6.11.2-3.i686.rpm -Only in /tmp/: m.patch -Only in /tmp/: macromedia-flash.install -Only in /tmp/: main.php -Only in .: modifier.capitalize.php -Only in .: modifier.cat.php -Only in .: modifier.count_characters.php -Only in .: modifier.count_paragraphs.php -Only in .: modifier.count_sentences.php -Only in .: modifier.count_words.php -Only in .: modifier.date_format.php -Only in .: modifier.debug_print_var.php -Only in .: modifier.default.php -Only in .: modifier.escape.php diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php --- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 +++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -93,28 +27,3 @@ -?> \ No newline at end of file +?> -Only in .: modifier.indent.php -Only in .: modifier.lower.php -Only in .: modifier.nl2br.php -Only in .: modifier.regex_replace.php -Only in .: modifier.replace.php -Only in .: modifier.spacify.php -Only in .: modifier.string_format.php -Only in .: modifier.strip.php -Only in .: modifier.strip_tags.php -Only in .: modifier.truncate.php -Only in .: modifier.upper.php -Only in .: modifier.wordwrap.php -Only in .: outputfilter.trimwhitespace.php -Only in /tmp/: poldek.conf.rpmnew -Only in /tmp/: poldek.conf.rpmsave -Only in /tmp/: posttrans -Only in /tmp/: pretrans -Only in /tmp/: rc-script -Only in /tmp/: rpm-build-4.4.1-7.1.i686.rpm -Only in /tmp/: rpm.groups -Only in /tmp/: rpm.patch -Only in /tmp/: rpm.spec -Only in /tmp/: settings.php -Only in .: shared.escape_special_chars.php -Only in .: shared.make_timestamp.php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 10:31:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: eventum-hl-quot-fix.patch - fix path In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:31:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix path ---- Files affected: SOURCES: eventum-hl-quot-fix.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/eventum-hl-quot-fix.patch diff -u SOURCES/eventum-hl-quot-fix.patch:1.2 SOURCES/eventum-hl-quot-fix.patch:1.3 --- SOURCES/eventum-hl-quot-fix.patch:1.2 Wed Aug 24 10:29:00 2005 +++ SOURCES/eventum-hl-quot-fix.patch Wed Aug 24 10:31:16 2005 @@ -1,6 +1,6 @@ diff -u ./modifier.highlight_quoted.php /tmp/modifier.highlight_quoted.php ---- ./modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 -+++ /tmp/modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 +--- ./include/Smarty/plugins/modifier.highlight_quoted.php 2005-08-24 11:27:20.000000000 +0300 ++++ ./modifier.highlight_quoted.php 2005-08-24 11:26:33.000000000 +0300 @@ -56,18 +56,19 @@ if ($escape) { $match[2] = htmlspecialchars($match[2]); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/eventum-hl-quot-fix.patch?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Wed Aug 24 10:34:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: eventum.spec - fix hilite quoting for routed emails. rel 3 In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 08:34:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix hilite quoting for routed emails. rel 3 ---- Files affected: SPECS: eventum.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.113 SPECS/eventum.spec:1.114 --- SPECS/eventum.spec:1.113 Tue Aug 23 12:01:01 2005 +++ SPECS/eventum.spec Wed Aug 24 10:33:59 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 2 +%define _rel 3 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -64,6 +64,7 @@ Patch6: http://glen.alkohol.ee/pld/%{name}-maq-subject.patch Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch +Patch10: %{name}-hl-quot-fix.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -451,6 +452,7 @@ %patch6 -p1 %patch7 -p1 %patch9 -p1 +%patch10 -p1 %patch22 -p1 # replace in remaining scripts config.inc.php to system one @@ -855,6 +857,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/24 08:33:59 glen +- fix hilite quoting for routed emails. rel 3 + Revision 1.113 2005/08/23 10:01:01 glen - add missing smarty modifier, rel 2, STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.113&r2=1.114&f=u From paszczus at pld-linux.org Wed Aug 24 10:37:57 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:33 2005 Subject: SPECS: horde-passwd.spec - ok, it is not a fake dep In-Reply-To: References: Message-ID: Author: paszczus Date: Wed Aug 24 08:37:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - ok, it is not a fake dep ---- Files affected: SPECS: horde-passwd.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.20 SPECS/horde-passwd.spec:1.21 --- SPECS/horde-passwd.spec:1.20 Tue Aug 23 23:51:45 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 10:37:51 2005 @@ -31,7 +31,7 @@ # horde accesses it directly in help->about %define _noautocompressdoc CREDITS -%define _noautoreq 'pear(Horde/.*)' 'pear(Crypt/CHAP.php)' +%define _noautoreq 'pear(Horde/.*)' %define hordedir /usr/share/horde %define _sysconfdir /etc/horde.org @@ -142,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 08:37:51 paszczus +- ok, it is not a fake dep + Revision 1.20 2005/08/23 21:51:45 paszczus - added one more noautoreq - please do not remove it... ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.20&r2=1.21&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:02 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: web-cyradm-locale.patch - fixed. In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed. ---- Files affected: SOURCES: web-cyradm-locale.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-locale.patch diff -u SOURCES/web-cyradm-locale.patch:1.1 SOURCES/web-cyradm-locale.patch:1.2 --- SOURCES/web-cyradm-locale.patch:1.1 Tue Aug 23 16:01:43 2005 +++ SOURCES/web-cyradm-locale.patch Wed Aug 24 11:02:56 2005 @@ -1,13 +1,13 @@ diff -ur web-cyradm-0.5.4-1.orig/index.php web-cyradm-0.5.4-1/index.php --- web-cyradm-0.5.4-1.orig/index.php 2004-03-15 23:53:02.000000000 +0100 +++ web-cyradm-0.5.4-1/index.php 2005-08-23 14:55:24.000000000 +0200 -@@ -70,9 +70,6 @@ +@@ -70,8 +70,8 @@ putenv("LANG=" . $LANG); putenv("LANGUAGE=" . $LANG); -- // Specify location of translation tables + // Specify location of translation tables - bindtextdomain("web-cyradm", "./locale"); -- ++ bindtextdomain("web-cyradm", "/usr/share/locale"); + // Choose domain textdomain("web-cyradm"); - require_once WC_BASE . "/session.php"; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/web-cyradm-locale.patch?r1=1.1&r2=1.2&f=u From kosmo at pld-linux.org Wed Aug 24 11:03:30 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:33 2005 Subject: SOURCES: web-cyradm-apache.conf (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:03:30 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: web-cyradm-apache.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/web-cyradm-apache.conf diff -u /dev/null SOURCES/web-cyradm-apache.conf:1.1 --- /dev/null Wed Aug 24 11:03:30 2005 +++ SOURCES/web-cyradm-apache.conf Wed Aug 24 11:03:25 2005 @@ -0,0 +1,22 @@ +Alias /web-cyradm /usr/share/web-cyradm + + + Options None + AllowOverride None + Order allow,deny + Allow from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + + + + Options None + AllowOverride None + Order deny,allow + Deny from all + ================================================================ From kosmo at pld-linux.org Wed Aug 24 11:11:25 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: web-cyradm.spec - R & BR changes - better /etc/httpd/web-cy... In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 09:11:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - R & BR changes - better /etc/httpd/web-cyradm.conf - added %ghost for logfile ---- Files affected: SPECS: web-cyradm.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.2 SPECS/web-cyradm.spec:1.3 --- SPECS/web-cyradm.spec:1.2 Tue Aug 23 22:48:55 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 11:11:20 2005 @@ -2,8 +2,6 @@ # # TODO: # - R: & BR: -# - better /etc/httpd/web-cyradm.conf -# - many more # %define version_major 0.5.4 %define version_minor 1 @@ -17,13 +15,14 @@ License: GPL Group: Applications Source0: http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz +Source1: %{name}-apache.conf Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ -Requires: mysql +Requires: apache Requires: php Requires: php-gettext -Requires: webserver +Requires: php-pear-DB BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -79,8 +78,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib} install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} -install config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -echo "Alias /%{name} %{_datadir}/%{name}" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +install config/conf.php.dist \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php + +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf install *.php $RPM_BUILD_ROOT%{_datadir}/%{name} install css/* $RPM_BUILD_ROOT%{_datadir}/%{name}/css @@ -94,6 +95,8 @@ install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES done +touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}/%{name}-login.log + %find_lang %{name} %clean @@ -104,7 +107,7 @@ ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi @@ -115,7 +118,7 @@ rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf if [ -f /var/lock/subsys/httpd ]; then - %service httpd restart + %service -q httpd restart fi fi fi @@ -126,6 +129,7 @@ %dir %{_sysconfdir}/%{name} %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/%{name}.conf +%ghost %{_localstatedir}/log/%{name}/*.log %{_datadir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -134,6 +138,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 09:11:20 kosmo +- R & BR changes +- better /etc/httpd/web-cyradm.conf +- added %ghost for logfile + Revision 1.2 2005/08/23 20:48:55 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Wed Aug 24 11:18:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:34 2005 Subject: test: plik cia test1 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:07 2005 GMT Module: test Tag: HEAD ---- Log message: cia test1 ---- Files affected: test: plik (1.20 -> 1.21) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.20 test/plik:1.21 --- test/plik:1.20 Tue Aug 23 19:27:15 2005 +++ test/plik Wed Aug 24 11:18:01 2005 @@ -4,6 +4,7 @@ test4 test5 test6 +cia-test1 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Wed Aug 24 11:18:48 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:34 2005 Subject: test: plik cia test2 In-Reply-To: References: Message-ID: Author: arekm Date: Wed Aug 24 09:18:48 2005 GMT Module: test Tag: HEAD ---- Log message: cia test2 ---- Files affected: test: plik (1.21 -> 1.22) ---- Diffs: ================================================================ Index: test/plik diff -u test/plik:1.21 test/plik:1.22 --- test/plik:1.21 Wed Aug 24 11:18:01 2005 +++ test/plik Wed Aug 24 11:18:42 2005 @@ -4,7 +4,7 @@ test4 test5 test6 -cia-test1 +cia-test2 alala 1112 4682 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/test/plik?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 11:31:35 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: eventum.spec - htmloptions truncate patch In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 09:31:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - htmloptions truncate patch ---- Files affected: SPECS: eventum.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.114 SPECS/eventum.spec:1.115 --- SPECS/eventum.spec:1.114 Wed Aug 24 10:33:59 2005 +++ SPECS/eventum.spec Wed Aug 24 11:31:29 2005 @@ -19,7 +19,7 @@ # release candidate #define _rc RC1 -%define _rel 3 +%define _rel 3.2 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -65,6 +65,7 @@ Patch7: %{name}-bot-reconnect.patch Patch9: http://glen.alkohol.ee/pld/eventum-httpclient-clientside.patch Patch10: %{name}-hl-quot-fix.patch +Patch11: http://glen.alkohol.ee/pld/eventum-htmloptions-truncate.patch Patch22: eventum-cli-wr-separated.patch URL: http://dev.mysql.com/downloads/other/eventum/ BuildRequires: rpmbuild(macros) >= 1.223 @@ -857,6 +858,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/24 09:31:29 glen +- htmloptions truncate patch + Revision 1.114 2005/08/24 08:33:59 glen - fix hilite quoting for routed emails. rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.114&r2=1.115&f=u From kosmo at pld-linux.org Wed Aug 24 12:04:29 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: cyrus-sasl-md5sum-passwords.patch (NEW) - initial release In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - initial release ---- Files affected: SOURCES: cyrus-sasl-md5sum-passwords.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cyrus-sasl-md5sum-passwords.patch diff -u /dev/null SOURCES/cyrus-sasl-md5sum-passwords.patch:1.1 --- /dev/null Wed Aug 24 12:04:29 2005 +++ SOURCES/cyrus-sasl-md5sum-passwords.patch Wed Aug 24 12:04:23 2005 @@ -0,0 +1,73 @@ +diff -urN cyrus-sasl-2.1.21.orig/lib/checkpw.c cyrus-sasl-2.1.21/lib/checkpw.c +--- cyrus-sasl-2.1.21.orig/lib/checkpw.c 2005-08-24 11:36:23.000000000 +0200 ++++ cyrus-sasl-2.1.21/lib/checkpw.c 2005-08-24 11:36:07.000000000 +0200 +@@ -103,10 +103,12 @@ + #define PASSWORD_FORMAT_CLEARTEXT 1 + #define PASSWORD_FORMAT_CRYPT 2 + #define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_FORMAT_MD5 4 + #define PASSWORD_SALT_BUF_LEN 22 + + /* weeds out crypt(3) password's salt */ + int _sasl_get_salt (char *dest, char *src, int format); ++const char *_sasl_md5sum(const char *src); + + /****************************** + * crypt(3) patch stop * +@@ -192,6 +194,9 @@ + /* traditional crypt(3) */ + else if (strncmp(p, "crypt_trad", 11) == 0) + password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* md5sum like hash */ ++ else if (strncmp(p, "md5", 11) == 0) ++ password_format = PASSWORD_FORMAT_MD5; + /* cleartext password */ + else + password_format = PASSWORD_FORMAT_CLEARTEXT; +@@ -250,13 +255,20 @@ + _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); + + /* crypt(3)-ed password? */ +- if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ if (password_format == PASSWORD_FORMAT_CRYPT || password_format == PASSWORD_FORMAT_CRYPTTRAD) { + /* compare password */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) + return SASL_OK; + else + ret = SASL_BADAUTH; + } ++ /* md5 hash password */ ++ else if (password_format == PASSWORD_FORMAT_MD5) { ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcasecmp(auxprop_values[0].values[0], _sasl_md5sum(passwd)) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } + else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { + /* compare passwords */ + if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) +@@ -1087,3 +1099,24 @@ + return 1; + } + ++ ++const char *_sasl_md5sum(const char *src) { ++ static char md5sum[33]; ++ const char hex[] = "0123456789abcdef"; ++ char md5[16]; ++ MD5_CTX ctx; ++ int i = 0; ++ int j = 0; ++ ++ _sasl_MD5Init(&ctx); ++ _sasl_MD5Update(&ctx, src, strlen(src)); ++ _sasl_MD5Final(&md5, &ctx); ++ ++ for(i=0; i<16; i++) { ++ md5sum[j++] = hex[md5[i] >> 4]; ++ md5sum[j++] = hex[md5[i] & 0x0F]; ++ } ++ ++ md5sum[j] = 0; ++ return(md5sum); ++} ================================================================ From kosmo at pld-linux.org Wed Aug 24 12:04:57 2005 From: kosmo at pld-linux.org (kosmo) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: cyrus-sasl.spec - added cyrus-sasl-md5sum-passwords.patch In-Reply-To: References: Message-ID: Author: kosmo Date: Wed Aug 24 10:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added cyrus-sasl-md5sum-passwords.patch ---- Files affected: SPECS: cyrus-sasl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/cyrus-sasl.spec diff -u SPECS/cyrus-sasl.spec:1.140 SPECS/cyrus-sasl.spec:1.141 --- SPECS/cyrus-sasl.spec:1.140 Thu Jul 21 00:35:47 2005 +++ SPECS/cyrus-sasl.spec Wed Aug 24 12:04:51 2005 @@ -42,6 +42,7 @@ Patch5: %{name}-gcc4.patch # Adapted from http://frost.ath.cx/software/cyrus-sasl-patches/dist/2.1.19/cyrus-sasl-2.1.19-checkpw.c+sql.c.patch Patch6: %{name}-cryptedpw.patch +Patch7: %{name}-md5sum-passwords.patch URL: http://asg.web.cmu.edu/sasl/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -424,6 +425,7 @@ %patch5 -p1 %if %{with cryptedpw} %patch6 -p1 +%patch7 -p1 %endif cd doc @@ -649,6 +651,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/24 10:04:51 kosmo +- added cyrus-sasl-md5sum-passwords.patch + Revision 1.140 2005/07/20 22:35:47 romke - added bcond cryptedpw allowing storing crypted passwd in database (mysql or pgsql) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.140&r2=1.141&f=u From glen at pld-linux.org Wed Aug 24 12:25:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php4-eaccelerator.spec - use .ini file in conf.d directory In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use .ini file in conf.d directory ---- Files affected: SPECS: php4-eaccelerator.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.6 SPECS/php4-eaccelerator.spec:1.7 --- SPECS/php4-eaccelerator.spec:1.6 Mon Jun 13 08:54:58 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 12:25:10 2005 @@ -1,13 +1,13 @@ # $Revision$, $Date$ %define _name eaccelerator %define _pkgname eaccelerator -%define php_ver %(rpm -q --qf '%%{epoch}:%%{version}' php4-devel) +%define _sysconfdir /etc/php4 Summary: eAccelerator module for PHP Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1 +Release: 1.1 Epoch: 0 License: GPL Vendor: Turck Software @@ -17,15 +17,14 @@ URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool -BuildRequires: php4-devel >= 4.1 -Requires: php4 = %{php_ver} +BuildRequires: php4-devel >= 3:4.1 +%requires_eq_to php4 php4-devel Requires: php4-zlib -Requires(post,preun): php4-common >= 4.1 +Requires: %{_sysconfdir}/conf.d Conflicts: php-mmcache BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description eAccelerator is a further development from mmcache PHP Accelerator & @@ -52,26 +51,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_name} extension module +extension=%{_name}.so +EOF + %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install eaccelerator %{_sysconfdir}/php.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove eaccelerator %{_sysconfdir}/php.ini -fi +%postun +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %files %defattr(644,root,root,755) %doc README +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so %attr(755,root,root) %{_bindir}/encoder.php @@ -81,6 +85,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 10:25:10 glen +- use .ini file in conf.d directory + Revision 1.6 2005/06/13 06:54:58 prism - up to 0.9.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 12:28:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: php4-eaccelerator.ini (NEW) - original from eaccelerator-... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:28:29 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - original from eaccelerator-0.9.3 sources ---- Files affected: SOURCES: php4-eaccelerator.ini (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u /dev/null SOURCES/php4-eaccelerator.ini:1.1 --- /dev/null Wed Aug 24 12:28:29 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:28:24 2005 @@ -0,0 +1,114 @@ +[eaccelerator] + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; +; eAccelerator is compatible with Zend Optimizer's loader. Zend Optimizer +; must be installed after eAccelerator in php.ini. If you don't use scripts +; encoded with Zend Encoder then we do not recommend you install Zend Optimizer +; with eAccelerator. + + +; You must uncomment one (and only one) line from the following to load +; eAccelerator extension. +;extension="eaccelerator.so" +zend_extension="/usr/lib/php4/eaccelerator.so" +;zend_extension_ts="/usr/lib/php4/eaccelerator.so" +;extension="eaccelerator.dll" +;zend_extension_ts="c:\php4\eaccelerator.dll" +;zend_extension="c:\php4\eaccelerator.dll" + +; The amount of shared memory (in megabytes) that eAccelerator will use. +; "0" means OS default. Default value is "0". +eaccelerator.shm_size = "64" + +; The directory that is used for disk cache. eAccelerator stores precompiled +; code, session data, content and user entries here. The same data can be +; stored in shared memory also (for more quick access). Default value is +; "/tmp/eaccelerator". +eaccelerator.cache_dir = "/tmp/eaccelerator" + +; Enables or disables eAccelerator. Should be "1" for enabling or +; "0" for disabling. Default value is "1". +eaccelerator.enable = "1" + +; Enables or disables internal peephole optimizer which may speed up code +; execution. Should be "1" for enabling or "0" for disabling. +; Default value is "1". +eaccelerator.optimizer = "1" + +; Enables or disables debug logging. Should be "1" for enabling or +; "0" for disabling. Default value is "0". +eaccelerator.debug = "0" + +; Enables or disables PHP file modification checking. Should be "1" +; for enabling or "0" for disabling. You should set it to "1" if you want +; to recompile PHP files after modification. Default value is "1". +eaccelerator.check_mtime = "1" + +; Determine which PHP files must be cached. You may specify the number of +; patterns (for example "*.php *.phtml") which specifies to cache or +; not to cache. If pattern starts with the character "!", it means to ignore +; files which are matched by the following pattern. Default value is "" that +; means - all PHP scripts will be cached. +eaccelerator.filter = "" + +; Disables putting large values into shared memory by "eaccelerator_put()" +; function. +; It indicates the largest allowed size in bytes (10240, 10K, 1M). The "0" +; disables the limit. Default value is "0". +eaccelerator.shm_max = "0" + +; When eAccelerator fails to get shared memory for new script it removes +; all scripts which were not accessed at last "shm_ttl" seconds from shared +; memory. Default value is "0" that means - don't remove any files from +; shared memory. +eaccelerator.shm_ttl = "0" + +; When eAccelerator fails to get shared memory for new script it tryes to +; remove old script if the previous try was made more then "shm_prune_period" +; seconds ago. Default value is "0" that means - don't try to remove any +; files from shared memory. +eaccelerator.shm_prune_period = "0" + +; Enables or disables caching of compiled scripts on disk. It has no effect +; on session data and content caching. +; Default value is "0" that means - use disk and shared memory for caching. +eaccelerator.shm_only = "0" + +; Enables or disables cached content compression. Default value is "1" that +; means enable compression. +eaccelerator.compress = "1" + +; Compression level used for content caching. Default value is "9" which i +; is the maximum compression level +eaccelerator.compress_level = "9" + +; Determine where keys, session data and content will be cached. The possible +; values are: +; "shm_and_disk" - cache data in shared memory and on disk (default value) +; "shm" - cache data in shared memory or on disk if shared memory +; is full or data size greater then "eaccelerator.shm_max" +; "shm_only" - cache data in shared memory +; "disk_only" - cache data on disk +; "none" - don't cache data +eaccelerator.keys = "shm_and_disk" +eaccelerator.sessions = "shm_and_disk" +eaccelerator.content = "shm_and_disk" + +; eAccelerator can be managed through web interface script eaccelerator.php. So +; you need to put this file on your web site. For security reasons it is +; recommended to restrict the usage of this script by your local IP. +; +; To create the eAccelerator password type +; +; php -q eaccelerator_password.php +; Changing password for eAccelerator Web Interface (eaccelerator.php) +; +; Enter admin name: admin +; New admin password: eaccelerator +; Retype new admin password: eaccelerator + +eaccelerator.admin.name="yourusername" +eaccelerator.admin.password="yourpassword" ================================================================ From glen at pld-linux.org Wed Aug 24 12:32:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: php4-eaccelerator.ini - configured. NOTE: compression dis... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:32:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - configured. NOTE: compression disabled, as it will take more cpu, but what this accelerator is then about than accelerating? ---- Files affected: SOURCES: php4-eaccelerator.ini (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.1 SOURCES/php4-eaccelerator.ini:1.2 --- SOURCES/php4-eaccelerator.ini:1.1 Wed Aug 24 12:28:24 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:32:22 2005 @@ -12,12 +12,9 @@ ; You must uncomment one (and only one) line from the following to load ; eAccelerator extension. -;extension="eaccelerator.so" -zend_extension="/usr/lib/php4/eaccelerator.so" +extension="eaccelerator.so" +;zend_extension="/usr/lib/php4/eaccelerator.so" ;zend_extension_ts="/usr/lib/php4/eaccelerator.so" -;extension="eaccelerator.dll" -;zend_extension_ts="c:\php4\eaccelerator.dll" -;zend_extension="c:\php4\eaccelerator.dll" ; The amount of shared memory (in megabytes) that eAccelerator will use. ; "0" means OS default. Default value is "0". @@ -27,7 +24,7 @@ ; code, session data, content and user entries here. The same data can be ; stored in shared memory also (for more quick access). Default value is ; "/tmp/eaccelerator". -eaccelerator.cache_dir = "/tmp/eaccelerator" +eaccelerator.cache_dir = "/var/cache/eaccelerator" ; Enables or disables eAccelerator. Should be "1" for enabling or ; "0" for disabling. Default value is "1". @@ -79,7 +76,7 @@ ; Enables or disables cached content compression. Default value is "1" that ; means enable compression. -eaccelerator.compress = "1" +eaccelerator.compress = "0" ; Compression level used for content caching. Default value is "9" which i ; is the maximum compression level @@ -103,7 +100,7 @@ ; ; To create the eAccelerator password type ; -; php -q eaccelerator_password.php +; php4 -q eaccelerator_password.php ; Changing password for eAccelerator Web Interface (eaccelerator.php) ; ; Enter admin name: admin ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.1&r2=1.2&f=u From agaran at pld-linux.org Wed Aug 24 12:40:03 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec (NEW) - initial, for me ... In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, for me works rel 0.1 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u /dev/null SPECS/perl-POE-Component-DebugShell.spec:1.1 --- /dev/null Wed Aug 24 12:40:03 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:39:57 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DebugShell +Summary: POE::Component::DebugShell +Name: perl-POE-Component-DebugShell +Version: 1.0411 +Release: 0.1 +License: other, see LICENSE +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +perl-POE-Component-DebugShell module, see poe.perl.org + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc LICENSE +%{perl_vendorlib}/POE/Component/DebugShell.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:39:57 agaran +- initial, for me works rel 0.1 + ================================================================ From agaran at pld-linux.org Wed Aug 24 12:48:01 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - missing buildreq In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - missing buildreq ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.1 SPECS/perl-POE-Component-DebugShell.spec:1.2 --- SPECS/perl-POE-Component-DebugShell.spec:1.1 Wed Aug 24 12:39:57 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Wed Aug 24 12:47:55 2005 @@ -17,6 +17,7 @@ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: perl-POE +BuildRequires: perl-POE-API-Peek BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 10:47:55 agaran +- missing buildreq + Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Wed Aug 24 12:51:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: php4-eaccelerator.ini - use shm and fallback to disk for ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:51:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - use shm and fallback to disk for speed ---- Files affected: SOURCES: php4-eaccelerator.ini (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.2 SOURCES/php4-eaccelerator.ini:1.3 --- SOURCES/php4-eaccelerator.ini:1.2 Wed Aug 24 12:32:22 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:51:43 2005 @@ -90,9 +90,9 @@ ; "shm_only" - cache data in shared memory ; "disk_only" - cache data on disk ; "none" - don't cache data -eaccelerator.keys = "shm_and_disk" -eaccelerator.sessions = "shm_and_disk" -eaccelerator.content = "shm_and_disk" +eaccelerator.keys = "shm" +eaccelerator.sessions = "shm" +eaccelerator.content = "shm" ; eAccelerator can be managed through web interface script eaccelerator.php. So ; you need to put this file on your web site. For security reasons it is ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.2&r2=1.3&f=u From agaran at pld-linux.org Wed Aug 24 12:53:35 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:53:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u /dev/null SPECS/perl-POE-Component-DirWatch.spec:1.1 --- /dev/null Wed Aug 24 12:53:35 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Wed Aug 24 12:53:29 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-DirWatch +Summary: POE::Component::DirWatch +Name: perl-POE-Component-DirWatch +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +#BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback +as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as +an FTP upload directory. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/DirWatch.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:53:29 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 12:58:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: php4-eaccelerator.ini - kill trailing spaces In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 10:58:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - kill trailing spaces ---- Files affected: SOURCES: php4-eaccelerator.ini (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/php4-eaccelerator.ini diff -u SOURCES/php4-eaccelerator.ini:1.3 SOURCES/php4-eaccelerator.ini:1.4 --- SOURCES/php4-eaccelerator.ini:1.3 Wed Aug 24 12:51:43 2005 +++ SOURCES/php4-eaccelerator.ini Wed Aug 24 12:58:19 2005 @@ -57,13 +57,13 @@ ; disables the limit. Default value is "0". eaccelerator.shm_max = "0" -; When eAccelerator fails to get shared memory for new script it removes +; When eAccelerator fails to get shared memory for new script it removes ; all scripts which were not accessed at last "shm_ttl" seconds from shared ; memory. Default value is "0" that means - don't remove any files from ; shared memory. eaccelerator.shm_ttl = "0" -; When eAccelerator fails to get shared memory for new script it tryes to +; When eAccelerator fails to get shared memory for new script it tryes to ; remove old script if the previous try was made more then "shm_prune_period" ; seconds ago. Default value is "0" that means - don't try to remove any ; files from shared memory. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php4-eaccelerator.ini?r1=1.3&r2=1.4&f=u From agaran at pld-linux.org Wed Aug 24 12:58:37 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: perl-POE-Component-Logger.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 10:58:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-Logger.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u /dev/null SPECS/perl-POE-Component-Logger.spec:1.1 --- /dev/null Wed Aug 24 12:58:37 2005 +++ SPECS/perl-POE-Component-Logger.spec Wed Aug 24 12:58:32 2005 @@ -0,0 +1,65 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-Logger +Summary: perl(POE::Component::Logger) +Name: perl-POE-Component-Logger +Version: 1.00 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-Log-Dispatch-Config +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _noautoreq 'perl(anything_fake_or_conditional)' + +%description +POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/Logger.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 10:58:32 agaran +- initial, works for me + ================================================================ From glen at pld-linux.org Wed Aug 24 13:00:29 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php4-eaccelerator.spec - add eaccelerator.ini - add cachedi... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add eaccelerator.ini - add cachedir - add more utility scripts ---- Files affected: SPECS: php4-eaccelerator.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/php4-eaccelerator.spec diff -u SPECS/php4-eaccelerator.spec:1.7 SPECS/php4-eaccelerator.spec:1.8 --- SPECS/php4-eaccelerator.spec:1.7 Wed Aug 24 12:25:10 2005 +++ SPECS/php4-eaccelerator.spec Wed Aug 24 13:00:24 2005 @@ -7,13 +7,14 @@ Summary(pl): Modu? eAccelerator dla PHP Name: php4-%{_name} Version: 0.9.3 -Release: 1.1 +Release: 1.5 Epoch: 0 License: GPL Vendor: Turck Software Group: Libraries Source0: http://dl.sourceforge.net/eaccelerator/%{_pkgname}-%{version}.tar.gz # Source0-md5: b17ddf953f18ee6df5c2c24ffccb37d9 +Source1: %{name}.ini URL: http://eaccelerator.sourceforge.net/ BuildRequires: automake BuildRequires: libtool @@ -51,15 +52,13 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d} +install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d,/var/cache/%{_name}} install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir} install ./encoder.php $RPM_BUILD_ROOT%{_bindir} - -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini -; Enable %{_name} extension module -extension=%{_name}.so -EOF +install ./eaccelerator_password.php $RPM_BUILD_ROOT%{_bindir} +install ./eaccelerator.php $RPM_BUILD_ROOT%{_bindir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini %clean rm -rf $RPM_BUILD_ROOT @@ -69,15 +68,24 @@ [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart %postun -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +fi + +%preun +if [ "$1" = 0 ]; then + # remove last pieces of cache + rm -f /var/cache/%{_name}/* +fi %files %defattr(644,root,root,755) %doc README %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_name}.ini %attr(755,root,root) %{extensionsdir}/eaccelerator.so -%attr(755,root,root) %{_bindir}/encoder.php +%attr(755,root,root) %{_bindir}/* +%attr(770,root,http) /var/cache/%{_name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -85,6 +93,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 11:00:24 glen +- add eaccelerator.ini +- add cachedir +- add more utility scripts + Revision 1.7 2005/08/24 10:25:10 glen - use .ini file in conf.d directory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-eaccelerator.spec?r1=1.7&r2=1.8&f=u From agaran at pld-linux.org Wed Aug 24 13:00:53 2005 From: agaran at pld-linux.org (agaran) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: perl-POE-Component-TSTP.spec (NEW) - initial, works for me In-Reply-To: References: Message-ID: Author: agaran Date: Wed Aug 24 11:00:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initial, works for me ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u /dev/null SPECS/perl-POE-Component-TSTP.spec:1.1 --- /dev/null Wed Aug 24 13:00:53 2005 +++ SPECS/perl-POE-Component-TSTP.spec Wed Aug 24 13:00:47 2005 @@ -0,0 +1,63 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # do not perform "make test" +# +%include /usr/lib/rpm/macros.perl +%define pdir POE +%define pnam Component-TSTP +Summary: POE::Component::TSTP - perl module +Name: perl-POE-Component-TSTP +Version: 0.02 +Release: 0.1 +License: same as perl +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz +URL: poe.perl.org +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: perl-POE +%if %{with tests} +BuildRequires: perl-POE +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +POE component handling SIGTSTP, ctrl-z usually. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor + +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/POE/Component/TSTP.pm +%{_mandir}/man3/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 11:00:47 agaran +- initial, works for me + ================================================================ From paladine at pld-linux.org Wed Aug 24 13:02:35 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: hal.spec - changed pid file - commentedout pld_policy patch In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:02:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed pid file - commentedout pld_policy patch ---- Files affected: SPECS: hal.spec (1.81 -> 1.82) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.81 SPECS/hal.spec:1.82 --- SPECS/hal.spec:1.81 Tue Aug 23 16:58:25 2005 +++ SPECS/hal.spec Wed Aug 24 13:02:29 2005 @@ -114,7 +114,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build %{__libtoolize} @@ -129,7 +129,8 @@ --enable-selinux \ --with-hwdata=%{_sysconfdir} \ --enable-fstab-sync \ - --enable-verbose-mode + --enable-verbose-mode \ + --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install @@ -230,6 +231,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.82 2005/08/24 11:02:29 paladine +- changed pid file +- commentedout pld_policy patch + Revision 1.81 2005/08/23 14:58:25 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.81&r2=1.82&f=u From glen at pld-linux.org Wed Aug 24 13:16:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: web-cyradm.spec - %service requires rpmbuild(macros) >= 1.2... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:16:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ---- Files affected: SPECS: web-cyradm.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.3 SPECS/web-cyradm.spec:1.4 --- SPECS/web-cyradm.spec:1.3 Wed Aug 24 11:11:20 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:16:17 2005 @@ -19,6 +19,7 @@ Patch0: %{name}-locale.patch # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ +BuildRequires: rpmbuild(macros) >= 1.228 Requires: apache Requires: php Requires: php-gettext @@ -106,9 +107,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi %preun @@ -117,9 +116,7 @@ if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - %service -q httpd restart - fi + %service -q httpd reload fi fi @@ -138,6 +135,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 11:16:17 glen +- %service requires rpmbuild(macros) >= 1.228 +- %service already includes check for sybsys lock + Revision 1.3 2005/08/24 09:11:20 kosmo - R & BR changes - better /etc/httpd/web-cyradm.conf ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Wed Aug 24 13:17:08 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: web-cyradm.spec - use %service reload, as it's only config ... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:17:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service reload, as it's only config change (ie not modules update) ---- Files affected: SPECS: web-cyradm.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.4 SPECS/web-cyradm.spec:1.5 --- SPECS/web-cyradm.spec:1.4 Wed Aug 24 13:16:17 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:17:03 2005 @@ -135,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 11:17:03 glen +- use %service reload, as it's only config change (ie not modules update) + Revision 1.4 2005/08/24 11:16:17 glen - %service requires rpmbuild(macros) >= 1.228 - %service already includes check for sybsys lock ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 13:17:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: gnome-volume-manager-nonmountable_media.patch (NEW), gnom... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patches from ubuntu ---- Files affected: SOURCES: gnome-volume-manager-nonmountable_media.patch (NONE -> 1.1) (NEW), gnome-volume-manager-reconnect.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-volume-manager-nonmountable_media.patch diff -u /dev/null SOURCES/gnome-volume-manager-nonmountable_media.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-nonmountable_media.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:26:10.095406344 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:27:02.929374360 +0200 +@@ -1204,7 +1204,7 @@ + * Does this device support removable media? Note that we + * check storage_device and not our own UDI + */ +- if (mountable && libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { ++ if (libhal_device_get_property_bool (hal_ctx, storage_device, "storage.removable", NULL)) { + /* we handle media change events separately */ + dbg ("Changed: %s\n", device); + gvm_media_changed (udi, storage_device, device); ================================================================ Index: SOURCES/gnome-volume-manager-reconnect.patch diff -u /dev/null SOURCES/gnome-volume-manager-reconnect.patch:1.1 --- /dev/null Wed Aug 24 13:17:27 2005 +++ SOURCES/gnome-volume-manager-reconnect.patch Wed Aug 24 13:17:22 2005 @@ -0,0 +1,118 @@ +diff -urN gnome-volume-manager-1.3.2.orig/src/manager.c gnome-volume-manager-1.3.2/src/manager.c +--- gnome-volume-manager-1.3.2.orig/src/manager.c 2005-08-24 12:27:33.904665400 +0200 ++++ gnome-volume-manager-1.3.2/src/manager.c 2005-08-24 12:34:21.984627816 +0200 +@@ -72,7 +72,8 @@ + #define NAUTILUS_COMMAND BIN_NAUTILUS" -n --no-desktop %m" + + static struct gvm_configuration config; +-static LibHalContext *hal_ctx; ++static LibHalContext *hal_ctx = NULL; ++static DBusConnection *dbus_connection = NULL; + + #ifndef ASSUME_SUBMOUNT + /** List of UDI's for volumes mounted by g-v-m that we need to apply policy to*/ +@@ -1356,6 +1357,75 @@ + { + } + ++static LibHalContext * gvm_do_hal_init (); ++ ++/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event. ++ * ++ * @param data Context pointer ++ * @return true if it should be tried again, false if success or failure. ++ */ ++static gboolean ++gvm_reconnect_to_hal (gpointer data __attribute__((__unused__))) ++{ ++ static unsigned int retries = 0; ++ DBusError error; ++ ++ dbg ("Trying a reconnect ...\n"); ++ hal_ctx = gvm_do_hal_init (); ++ if (hal_ctx != NULL) { ++ dbg ("Reconnected OK.\n"); ++ retries = 0; ++ return FALSE; ++ } else if (dbus_connection){ ++ /* shut down dbus connection to try it again */ ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ } ++ ++ /* Retry later if it failed. */ ++ if (retries++ < 6000) ++ return TRUE; ++ ++ /* Too many retries; clean up and bail. */ ++ warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n"); ++ if (hal_ctx) { ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ } ++ gtk_main_quit (); ++ return FALSE; ++} ++ ++/** Invoked by D-BUS to filter messages. ++ * ++ * @param connection D-BUS connection ++ * @param message D-BUS message ++ * @param user_data Context pointer ++ */ ++static DBusHandlerResult ++gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)), ++ DBusMessage *message, ++ void *user_data __attribute__((__unused__))) ++{ ++ DBusError error; ++ ++ if (dbus_message_is_signal (message, ++ DBUS_INTERFACE_LOCAL, ++ "Disconnected")) { ++ dbg("gvm_do_filter_dbus_msg: received Disconnected message\n"); ++ g_timeout_add(1000, gvm_reconnect_to_hal, NULL); ++ libhal_ctx_shutdown (hal_ctx, &error); ++ libhal_ctx_free (hal_ctx); ++ hal_ctx = NULL; ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ else ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} ++ + /** Integrate a dbus mainloop. + * + * @param ctx LibHal context +@@ -1366,14 +1436,15 @@ + static dbus_bool_t + hal_mainloop_integration (LibHalContext *ctx, DBusError *error) + { +- DBusConnection *dbus_connection; +- + dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error); + + if (dbus_error_is_set (error)) + return FALSE; ++ ++ dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE); + + dbus_connection_setup_with_g_main (dbus_connection, NULL); ++ dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL); + + libhal_ctx_set_dbus_connection (ctx, dbus_connection); + +@@ -1516,6 +1587,10 @@ + DBusError error; + GSList *l; + ++ if (ctx == NULL) { ++ warn("unmount_all: No hal connection! can't unmount volumes\n"); ++ return; ++ } + dbg ("unmounting all volumes that we saw mounted in our life\n"); + dbus_error_init (&error); + for (l = all_mounted_volumes; l != NULL; l = g_slist_next (l)) { ================================================================ From paladine at pld-linux.org Wed Aug 24 13:17:54 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: gnome-volume-manager.spec - added 2 patches from ubuntu - r... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 11:17:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added 2 patches from ubuntu - rel. 2 ---- Files affected: SPECS: gnome-volume-manager.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/gnome-volume-manager.spec diff -u SPECS/gnome-volume-manager.spec:1.30 SPECS/gnome-volume-manager.spec:1.31 --- SPECS/gnome-volume-manager.spec:1.30 Tue Aug 23 16:55:56 2005 +++ SPECS/gnome-volume-manager.spec Wed Aug 24 13:17:47 2005 @@ -3,13 +3,15 @@ Summary(pl): Zarz?dca wolumin?w dla GNOME Name: gnome-volume-manager Version: 1.3.2 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-volume-manager/1.3/%{name}-%{version}.tar.gz # Source0-md5: 85582b7bae862cffc72fa69098d5053c Patch0: %{name}-desktop.patch Patch1: %{name}-less_verbose.patch +Patch2: %{name}-nonmountable_media.patch +Patch3: %{name}-reconnect_on_dbus_exit.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel BuildRequires: autoconf >= 2.52 @@ -49,6 +51,8 @@ %patch0 -p1 # patch1 disabled until stable release #%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__glib_gettextize} @@ -59,7 +63,7 @@ %{__autoconf} %{__automake} %configure \ - --disable-schemas-install \ + --disable-schemas-install %{__make} %install @@ -96,6 +100,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/24 11:17:47 paladine +- added 2 patches from ubuntu +- rel. 2 + Revision 1.30 2005/08/23 14:55:56 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.30&r2=1.31&f=u From glen at pld-linux.org Wed Aug 24 13:18:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: web-cyradm.spec - use %apache_config triggers for linking a... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:18:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %apache_config triggers for linking apache config ---- Files affected: SPECS: web-cyradm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.5 SPECS/web-cyradm.spec:1.6 --- SPECS/web-cyradm.spec:1.5 Wed Aug 24 13:17:03 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:18:46 2005 @@ -103,22 +103,11 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - ln -sf %{_sysconfdir}/httpd/%{name}.conf %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/httpd/%{name}.conf - %service -q httpd reload -fi - -%preun -if [ "$1" = "0" ]; then - umask 027 - if [ -d %{_sysconfdir}/httpd/httpd.conf ]; then - rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf - - %service -q httpd reload - fi -fi +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 %files -f %{name}.lang %defattr(644,root,root,755) @@ -135,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 11:18:46 glen +- use %apache_config triggers for linking apache config + Revision 1.5 2005/08/24 11:17:03 glen - use %service reload, as it's only config change (ie not modules update) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 13:19:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: web-cyradm.spec - require apache2 as the .spec doesn't supp... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:19:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - require apache2 as the .spec doesn't support more ---- Files affected: SPECS: web-cyradm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/web-cyradm.spec diff -u SPECS/web-cyradm.spec:1.6 SPECS/web-cyradm.spec:1.7 --- SPECS/web-cyradm.spec:1.6 Wed Aug 24 13:18:46 2005 +++ SPECS/web-cyradm.spec Wed Aug 24 13:19:49 2005 @@ -20,7 +20,7 @@ # Source0-md5: d06dc16899680c29b94a5460709b5fe0 URL: http://www.web-cyradm.org/ BuildRequires: rpmbuild(macros) >= 1.228 -Requires: apache +Requires: apache >= 2.0 Requires: php Requires: php-gettext Requires: php-pear-DB @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 11:19:49 glen +- require apache2 as the .spec doesn't support more + Revision 1.6 2005/08/24 11:18:46 glen - use %apache_config triggers for linking apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/web-cyradm.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Wed Aug 24 13:26:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS (AC-branch): rpm.spec, rpm-macros.spec, rpm.spec - rpm_macro... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:26:47 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - rpm_macros_rev 1.235 ---- Files affected: SPECS: rpm.spec (1.555.2.97 -> 1.555.2.98) SPECS: rpm-macros.spec (1.19 -> 1.20) , rpm.spec (1.684 -> 1.685) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.97 SPECS/rpm.spec:1.555.2.98 --- SPECS/rpm.spec:1.555.2.97 Sat Aug 20 21:03:55 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:41 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.2.52-10 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1113,6 +1113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.555.2.98 2005/08/24 11:26:41 glen +- rpm_macros_rev 1.235 + Revision 1.555.2.97 2005/08/20 19:03:55 glen - remove arch dependant %install macros from noarch macros file @@ -1613,7 +1616,7 @@ - current macros rev is 1.153 Revision 1.551 2004/05/27 20:30:13 pluto -- %%{_target_base_arch} macro added. +- %{_target_base_arch} macro added. - release 0.snap.23. Revision 1.550 2004/05/23 14:50:52 qboosh ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.19 SPECS/rpm-macros.spec:1.20 --- SPECS/rpm-macros.spec:1.19 Tue Aug 23 20:19:49 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:26:42 2005 @@ -6,7 +6,7 @@ # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. # - commit debuginfo.patch to rpm.macros -%define rpm_macros_rev 1.233 +%define rpm_macros_rev 1.235 Summary: PLD Linux RPM Macros Summary(pl): Makra RPM dla Linuksa PLD Name: rpm-macros @@ -60,6 +60,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.19 2005/08/23 18:19:49 glen - rpm macros 1.233 ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.684 SPECS/rpm.spec:1.685 --- SPECS/rpm.spec:1.684 Tue Aug 16 01:26:22 2005 +++ SPECS/rpm.spec Wed Aug 24 13:26:42 2005 @@ -22,7 +22,7 @@ %define reqdb_ver 4.3.27-1 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.231 +%define rpm_macros_rev 1.235 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -1104,6 +1104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.685 2005/08/24 11:26:42 glen +- rpm_macros_rev 1.235 + Revision 1.684 2005/08/15 23:26:22 glen - add posttrans debug patch, rel 2 (to be greater than ac) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.97&r2=1.555.2.98&f=u http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.19&r2=1.20&f=u http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.684&r2=1.685&f=u From glen at pld-linux.org Wed Aug 24 13:27:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: rpm-macros.spec - add builder help how to build for Ac In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:27:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add builder help how to build for Ac ---- Files affected: SPECS: rpm-macros.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/rpm-macros.spec diff -u SPECS/rpm-macros.spec:1.20 SPECS/rpm-macros.spec:1.21 --- SPECS/rpm-macros.spec:1.20 Wed Aug 24 13:26:42 2005 +++ SPECS/rpm-macros.spec Wed Aug 24 13:27:11 2005 @@ -2,6 +2,7 @@ # NOTE # - AC-branch is TAG. please move the tag if rebuild needed: # $ cvs tag -F AC-branch rpm-macros.spec +# $ ./builder -r AC-branch -bb rpm-macros.spec # TODO # - move macros.pld to /usr/lib/rpm, but first need to change rpmmrc # for it to search the macrofile from there. @@ -60,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/24 11:27:11 glen +- add builder help how to build for Ac + Revision 1.20 2005/08/24 11:26:42 glen - rpm_macros_rev 1.235 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.20&r2=1.21&f=u From glen at pld-linux.org Wed Aug 24 13:35:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: macromedia-flash.spec - split version to major and minor ve... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 11:35:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - split version to major and minor vers - macros not needed for installer package ---- Files affected: SPECS: macromedia-flash.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/macromedia-flash.spec diff -u SPECS/macromedia-flash.spec:1.35 SPECS/macromedia-flash.spec:1.36 --- SPECS/macromedia-flash.spec:1.35 Tue Aug 23 22:41:27 2005 +++ SPECS/macromedia-flash.spec Wed Aug 24 13:35:04 2005 @@ -1,8 +1,10 @@ # $Revision$, $Date$ -# # Conditional build: %bcond_with license_agreement # generates package -# + +%define _ver_major 7 +%define _ver_minor 0 +%define _ver_patch 25 Summary: Flash plugin for Netscape-compatible WWW browsers Summary(pl): Wtyczka Flash dla przegl?darek WWW zgodnych z Netscape %define base_name macromedia-flash @@ -11,18 +13,20 @@ %else Name: %{base_name}-installer %endif -Version: 7.0r25 -Release: 2.26%{?with_license_agreement:wla} +Version: %{_ver_major}.%{_ver_minor}.%{_ver_patch} +Release: 2.29%{?with_license_agreement:wla} License: Free to use, non-distributable Group: X11/Applications/Multimedia %if %{with license_agreement} -Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz +Source0: http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{_ver_major}.%{_ver_minor}r%{_ver_patch}/install_flash_player_%{_ver_major}_linux.tar.gz # NoSource0-md5: 79c59a5ea29347e01c8e6575dd054cd1 %else Source0: license-installer.sh %endif URL: http://www.macromedia.com/software/flashplayer/ +%if %{with license_agreement} BuildRequires: rpmbuild(macros) >= 1.235 +%endif Requires: browser-plugins(%{_target_cpu}) %if %{without license_agreement} Requires: cpio @@ -146,6 +150,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/24 11:35:04 glen +- split version to major and minor vers +- macros not needed for installer package + Revision 1.35 2005/08/23 20:41:27 qboosh - updated pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.35&r2=1.36&f=u From aflinta at pld-linux.org Wed Aug 24 14:56:14 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: gnome-vfs-2.11.92.tar.bz2 Message-ID: <5472.1124888174@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-2.11.92.tar.bz2 18c8c5127d1eebfd51c8b6d631f3c949 gnome-vfs-2.11.92.tar.bz2 Size: 1705543 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 14:56:07 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 12:56:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.11.92 ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.12 -> 1.157.2.13) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.12 SPECS/gnome-vfs2.spec:1.157.2.13 --- SPECS/gnome-vfs2.spec:1.157.2.12 Tue Aug 23 16:51:55 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 14:56:00 2005 @@ -2,12 +2,12 @@ Summary: GNOME2 - virtual file system Summary(pl): GNOME2 - wirtualny system plik?w Name: gnome-vfs2 -Version: 2.11.90 -Release: 4 +Version: 2.11.92 +Release: 1 License: LGPL v2+ Group: Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.11/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: e6c55660c8190eb3c58c90c1a6988044 +# Source0-md5: 18c8c5127d1eebfd51c8b6d631f3c949 Source1: %{name}-defaults.list Patch0: %{name}-defaults-path.patch Patch1: %{name}-no_g_mime.patch @@ -98,7 +98,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p0 +#%patch4 -p0 %build # force rebuild @@ -195,6 +195,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.13 2005/08/24 12:56:00 aflinta +- 2.11.92 + Revision 1.157.2.12 2005/08/23 14:51:55 paladine - added missing commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.12&r2=1.157.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:22 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS (DEVEL): totem.spec - 1.1.5 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 13:22:22 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 1.1.5 ---- Files affected: SPECS: totem.spec (1.46.2.12 -> 1.46.2.13) ---- Diffs: ================================================================ Index: SPECS/totem.spec diff -u SPECS/totem.spec:1.46.2.12 SPECS/totem.spec:1.46.2.13 --- SPECS/totem.spec:1.46.2.12 Thu Aug 18 14:03:46 2005 +++ SPECS/totem.spec Wed Aug 24 15:22:15 2005 @@ -10,12 +10,12 @@ Summary: Movie player for GNOME 2 based on the gstreamer engine Summary(pl): Odtwarzacz film?w dla GNOME 2 oparty na silniku gstreamer Name: totem -Version: 1.1.4 -Release: 2 +Version: 1.1.5 +Release: 1 License: GPL Group: Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/%{name}-%{version}.tar.bz2 -# Source0-md5: 5b4e5216c2dc1fe06c8b7d83bae89a13 +# Source0-md5: cc203683cc2cf7e3585cd0b25de55c7f Patch0: %{name}-desktop.patch URL: http://www.hadess.net/totem.php3 BuildRequires: GConf2-devel @@ -204,6 +204,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.13 2005/08/24 13:22:15 aflinta +- 1.1.5 + Revision 1.46.2.12 2005/08/18 12:03:46 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/totem.spec?r1=1.46.2.12&r2=1.46.2.13&f=u From aflinta at pld-linux.org Wed Aug 24 15:22:29 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: totem-1.1.5.tar.bz2 Message-ID: <22535.1124889749@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/totem/1.1/totem-1.1.5.tar.bz2 cc203683cc2cf7e3585cd0b25de55c7f totem-1.1.5.tar.bz2 Size: 1623055 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 16:52:34 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES (DEVEL): gnome-vfs2-defaults-path.patch - up for 2.11.92 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 14:52:34 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 2.11.92 ---- Files affected: SOURCES: gnome-vfs2-defaults-path.patch (1.2 -> 1.2.2.1) ---- Diffs: ================================================================ Index: SOURCES/gnome-vfs2-defaults-path.patch diff -u SOURCES/gnome-vfs2-defaults-path.patch:1.2 SOURCES/gnome-vfs2-defaults-path.patch:1.2.2.1 --- SOURCES/gnome-vfs2-defaults-path.patch:1.2 Mon Mar 7 23:21:11 2005 +++ SOURCES/gnome-vfs2-defaults-path.patch Wed Aug 24 16:52:29 2005 @@ -1,19 +1,7 @@ -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2004-12-14 16:30:29.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/gnome-vfs-mime-info.c 2005-02-06 22:33:14.677240592 +0100 -@@ -150,7 +150,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/:/usr/share/gnome/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); -diff -urN aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c gnome-vfs-2.9.90/libgnomevfs/xdgmime.c ---- aa/gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2004-12-14 16:30:30.000000000 +0100 -+++ gnome-vfs-2.9.90/libgnomevfs/xdgmime.c 2005-02-06 22:33:25.327621488 +0100 -@@ -207,7 +207,7 @@ +diff -urN gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c gnome-vfs-2.11.92/libgnomevfs/xdgmime.c +--- gnome-vfs-2.11.92.orig/libgnomevfs/xdgmime.c 2005-08-24 14:42:16.910606480 +0200 ++++ gnome-vfs-2.11.92/libgnomevfs/xdgmime.c 2005-08-24 14:42:50.795455200 +0200 +@@ -234,7 +234,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-vfs2-defaults-path.patch?r1=1.2&r2=1.2.2.1&f=u From paladine at pld-linux.org Wed Aug 24 17:00:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES (DEVEL): gnome-vfs2-handle-drives-without-media-detection.... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:27 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed in sources ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:00:59 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS (DEVEL): gnome-vfs2.spec - removed handle-drives-without-med... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:00:59 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - removed handle-drives-without-media-detection ---- Files affected: SPECS: gnome-vfs2.spec (1.157.2.13 -> 1.157.2.14) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.157.2.13 SPECS/gnome-vfs2.spec:1.157.2.14 --- SPECS/gnome-vfs2.spec:1.157.2.13 Wed Aug 24 14:56:00 2005 +++ SPECS/gnome-vfs2.spec Wed Aug 24 17:00:54 2005 @@ -13,7 +13,6 @@ Patch1: %{name}-no_g_mime.patch Patch2: %{name}-fstab_edit_crash.patch Patch3: %{name}-disable_cdda.patch -Patch4: %{name}-handle-drives-without-media-detection.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -98,7 +97,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p0 %build # force rebuild @@ -195,6 +193,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.157.2.14 2005/08/24 15:00:54 paladine +- removed handle-drives-without-media-detection + Revision 1.157.2.13 2005/08/24 12:56:00 aflinta - 2.11.92 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.157.2.13&r2=1.157.2.14&f=u From paladine at pld-linux.org Wed Aug 24 17:02:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (R... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:02:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - remove it! ---- Files affected: SOURCES: gnome-vfs2-handle-drives-without-media-detection.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:09 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: dbus-python_types.patch (REMOVED) - fixed in sources In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed in sources ---- Files affected: SOURCES: dbus-python_types.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Wed Aug 24 17:08:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: dbus.spec - updated to 0.36 - removed python_types patch (a... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 15:08:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36 - removed python_types patch (already in sources) ---- Files affected: SPECS: dbus.spec (1.92 -> 1.93) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.92 SPECS/dbus.spec:1.93 --- SPECS/dbus.spec:1.92 Tue Aug 23 16:39:33 2005 +++ SPECS/dbus.spec Wed Aug 24 17:08:15 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.35.2 -Release: 0.2 +Version: 0.36 +Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: 414680dddd3dec84cc3b0c45cdfaafbc +# Source0-md5: c969d0a11599e5950fb28eeed8b353ba Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -37,7 +37,6 @@ Patch2: %{name}-config.patch Patch3: %{name}-mint.patch Patch4: %{name}-python_fixes.patch -Patch5: %{name}-python_types.patch URL: http://www.freedesktop.org/Software/dbus BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.52 @@ -316,7 +315,6 @@ %patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in} %build @@ -537,6 +535,7 @@ %defattr(644,root,root,755) %dir %{py_sitedir}/%{name}/ %attr(755,root,root) %{py_sitedir}/%{name}/*.so +%{py_sitedir}/dbus.pth %{py_sitedir}/%{name}/*.py[co] %endif @@ -546,6 +545,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.93 2005/08/24 15:08:15 paladine +- updated to 0.36 +- removed python_types patch (already in sources) + Revision 1.92 2005/08/23 14:39:33 paladine - added missing commit log - added BR: libselinux-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.92&r2=1.93&f=u From paladine at pld-linux.org Wed Aug 24 17:08:25 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: dbus-0.36.tar.gz Message-ID: <2655.1124896105@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.tar.gz c969d0a11599e5950fb28eeed8b353ba dbus-0.36.tar.gz Size: 1600854 bytes -- Virtually Yours: distfiles. From pascalek at pld-linux.org Wed Aug 24 17:17:25 2005 From: pascalek at pld-linux.org (pascalek) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: qt4.spec - typo In-Reply-To: References: Message-ID: Author: pascalek Date: Wed Aug 24 15:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo ---- Files affected: SPECS: qt4.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.38 SPECS/qt4.spec:1.39 --- SPECS/qt4.spec:1.38 Tue Aug 23 12:46:45 2005 +++ SPECS/qt4.spec Wed Aug 24 17:17:17 2005 @@ -753,7 +753,7 @@ sub-examples-all-ordered %{?with_ibase: %{__make} -C src/plugins/sqldrivers/ibase} -#{?with_mysql: #{__make} -C src/plugins/sqldrivers/mysql} +%{?with_mysql: %{__make} -C src/plugins/sqldrivers/mysql} %{?with_odbc: %{__make} -C src/plugins/sqldrivers/odbc} %{?with_pgsql: %{__make} -C src/plugins/sqldrivers/psql} %{?with_sqlite: %{__make} -C src/plugins/sqldrivers/sqlite2} @@ -1131,6 +1131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/24 15:17:17 pascalek +- typo + Revision 1.38 2005/08/23 10:46:45 pluto - missed %dir %{_libdir}/qt4 added. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.38&r2=1.39&f=u From paladine at pld-linux.org Wed Aug 24 18:15:34 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NEW) - change c... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change cosmos theme dir ---- Files affected: SOURCES: gnome-screensaver-cosmos_theme_dir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-screensaver-cosmos_theme_dir.patch diff -u /dev/null SOURCES/gnome-screensaver-cosmos_theme_dir.patch:1.1 --- /dev/null Wed Aug 24 18:15:34 2005 +++ SOURCES/gnome-screensaver-cosmos_theme_dir.patch Wed Aug 24 18:15:28 2005 @@ -0,0 +1,12 @@ +diff -urN gnome-screensaver-0.0.9.orig/configure.ac gnome-screensaver-0.0.9/configure.ac +--- gnome-screensaver-0.0.9.orig/configure.ac 2005-08-24 17:44:41.294062536 +0200 ++++ gnome-screensaver-0.0.9/configure.ac 2005-08-24 17:44:55.933836952 +0200 +@@ -1372,7 +1372,7 @@ + AC_SUBST(LDFLAGS) + + # Saver engine stuff +-SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/pixmaps/backgrounds/cosmos" ++SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/gnome-screensaver/themes/cosmos" + + AC_SUBST(SLIDESHOW_COSMOS_DIR) + ================================================================ From paladine at pld-linux.org Wed Aug 24 18:15:46 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: gnome-screensaver.spec - updated to 0.0.9 (new themes) - ad... In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 16:15:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.9 (new themes) - added cosmos_theme_dir patch - sorted %%files - itemize schemas ---- Files affected: SPECS: gnome-screensaver.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/gnome-screensaver.spec diff -u SPECS/gnome-screensaver.spec:1.4 SPECS/gnome-screensaver.spec:1.5 --- SPECS/gnome-screensaver.spec:1.4 Wed Jul 27 22:04:54 2005 +++ SPECS/gnome-screensaver.spec Wed Aug 24 18:15:41 2005 @@ -2,14 +2,15 @@ Summary: GNOME screensaver Summary(pl): Wygaszacz ekranu GNOME Name: gnome-screensaver -Version: 0.0.8 +Version: 0.0.9 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/%{name}-%{version}.tar.gz -# Source0-md5: 7f5b63f61aa7019dfd411054cf53916a +# Source0-md5: 3cd0458bfb1ae1bc96820157560042cc Source1: %{name}.pamd Patch0: %{name}-desktop.patch +Patch1: %{name}-cosmos_theme_dir.patch BuildRequires: GConf2-devel >= 2.6.1 BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -82,11 +84,11 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gnome-screensaver -%{_sysconfdir}/gconf/schemas/* %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/* %{_datadir}/%{name} %{_desktopdir}/*.desktop +%attr(755,root,root) %{_libdir}/* +%{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -94,6 +96,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 16:15:41 paladine +- updated to 0.0.9 (new themes) +- added cosmos_theme_dir patch +- sorted %%files +- itemize schemas + Revision 1.4 2005/07/27 20:04:54 qboosh - sorted verify() flags, no need for default attr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Wed Aug 24 18:15:47 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: gnome-screensaver-0.0.9.tar.gz Message-ID: <3170.1124900147@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/0.0/gnome-screensaver-0.0.9.tar.gz 3cd0458bfb1ae1bc96820157560042cc gnome-screensaver-0.0.9.tar.gz Size: 1878783 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:19:03 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: lkcp.spec (NEW) - new In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 16:19:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: lkcp.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u /dev/null SPECS/lkcp.spec:1.1 --- /dev/null Wed Aug 24 18:19:03 2005 +++ SPECS/lkcp.spec Wed Aug 24 18:18:58 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +Summary: Live Kernel Configuration Panel +Name: lkcp +Version: 0.5.3 +Release: 1 +License: GPL v2 +Group: Applications +Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +# Source0-md5: 020f788b8c9ac52636b357e8929f7e30 +URL: http://webspace.utexas.edu/~hyoussef/ +BuildRequires: glib-devel +BuildRequires: ncurses-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Live Kernel Configuration Panel (LKCP) is an ncurses interface to the +run-time Linux kernel configuration data that can be accessed through +the /proc filesystem. It also generates a bash script of your recently +committed changes to the /proc/sys filesystem. + +%description -l pl +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do +konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy +ostatnie zmiany dokonane w systemie plik?w /proc/sys. + +%prep +%setup -q + +%build +%{__make} -C src \ + CC="%{__cc}" \ + FLAGS="%{rpmcflags} -I/usr/include/ncurses" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_bindir} +install src/lkcp $RPM_BUILD_ROOT%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc AUTHORS CREDITS Changelog README TODO Documentation/ +%attr(755,root,root) %{_bindir}/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/24 16:18:58 adamg +- new + + ================================================================ From adamg at pld-linux.org Wed Aug 24 18:19:00 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <5161.1124900340@distfiles.pld-linux.org> wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/1b30a1ca-d99d-46e3-842f-296aa54a923e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 18:23:32 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: ERRORS: lkcp-0.5.3.tar.bz2 Message-ID: <7632.1124900612@distfiles.pld-linux.org> wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. FATAL: http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2 (020f788b8c9ac52636b357e8929f7e30) was not fetched (wget -nv -O ./tmp/29b9c60d-8565-4518-969e-95516b37d96e/020f788b8c9ac52636b357e8929f7e30/lkcp-0.5.3.tar.bz2 "http://webspace.utexas.edu/hyoussef/www/lkcp-0.5.3.tar.bz2": ERROR: Certificate verification error for webspace.utexas.edu: unable to get local issuer certificate To connect to webspace.utexas.edu insecurely, use `--no-check-certificate'. Unable to establish SSL connection. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:17 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-24 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 snap ---- Files affected: SPECS: horde-passwd.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.21 SPECS/horde-passwd.spec:1.22 --- SPECS/horde-passwd.spec:1.21 Wed Aug 24 10:37:51 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:12 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-23 -%define _rel 2 +%define _snap 2005-08-24 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -9,14 +9,13 @@ Name: horde-passwd Version: 3.0 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: LGPL +License: ASL Vendor: The Horde Project Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz -# Source0-md5: 15944d881c02ce24379d58a4bb613ab1 +# Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-hook-misconf.patch URL: http://www.horde.org/passwd/ BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 @@ -49,8 +48,8 @@ modu?. %prep -%setup -q -n %{?_snap:%{_hordeapp}}%{!?_snap:%{_hordeapp}-h3-%{version}%{?_rc:-%{_rc}}} -%patch0 -p1 +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 16:58:12 glen +- updated to 2005-08-24 snap + Revision 1.21 2005/08/24 08:37:51 paszczus - ok, it is not a fake dep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 18:58:20 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: passwd-HEAD-2005-08-24.tar.gz Message-ID: <28419.1124902700@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.horde.org/pub/snaps/2005-08-24/passwd-HEAD-2005-08-24.tar.gz 6638fad5170d5421bacf7e44868a7964 passwd-HEAD-2005-08-24.tar.gz Size: 903605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 18:58:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: horde-passwd.spec - license ASL In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 16:58:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license ASL ---- Files affected: SPECS: horde-passwd.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.22 SPECS/horde-passwd.spec:1.23 --- SPECS/horde-passwd.spec:1.22 Wed Aug 24 18:58:12 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 18:58:53 2005 @@ -141,6 +141,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 16:58:53 glen +- license ASL + Revision 1.22 2005/08/24 16:58:12 glen - updated to 2005-08-24 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.22&r2=1.23&f=u From glen at pld-linux.org Wed Aug 24 19:04:37 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: horde-passwd.spec - cosmetics In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:04:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: horde-passwd.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.23 SPECS/horde-passwd.spec:1.24 --- SPECS/horde-passwd.spec:1.23 Wed Aug 24 18:58:53 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 19:04:32 2005 @@ -12,13 +12,14 @@ License: ASL Vendor: The Horde Project Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/passwd/passwd-h3-%{version}-beta.tar.gz -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/passwd-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf URL: http://www.horde.org/passwd/ -BuildRequires: rpmbuild(macros) >= 1.226 BuildRequires: rpm-php-pearprov >= 4.0.2-98 +BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires(post): sed >= 4.0 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) @@ -124,7 +125,7 @@ %attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php %attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/*.xml +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -141,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/24 17:04:32 glen +- cosmetics + Revision 1.23 2005/08/24 16:58:53 glen - license ASL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Wed Aug 24 19:05:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: template-horde.spec - %{_hordeapp} macro, unify In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:05:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - %{_hordeapp} macro, unify ---- Files affected: SPECS: template-horde.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/template-horde.spec diff -u SPECS/template-horde.spec:1.3 SPECS/template-horde.spec:1.4 --- SPECS/template-horde.spec:1.3 Wed Aug 3 19:49:12 2005 +++ SPECS/template-horde.spec Wed Aug 24 19:05:14 2005 @@ -8,23 +8,27 @@ # FIND .htaccess FILES AND MAKE SURE APACHE CONF DISABLES ACCESS TO # THOSE DIRS: find -name '.??*' IS EASY TO LOCATE. +%define _hordeapp skeleton %include /usr/lib/rpm/macros.php Summary: Template for horde projects Name: skeleton Version: 0.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL v2 (CHECK IT FIRST) +License: GPL v2 (CHECK IT FIRST, could be ASL) Group: Applications/WWW -#Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}.tar.gz +#Source0: ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}.tar.gz #Source0: ftp://ftp.horde.org/pub/skeleton/%{name}-h3-%{version}-%{_rc}.tar.gz -#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +#Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: - # COPY IN SOURCES ../SOURCES/ingo.conf AS SOURCE1 HERE: # cp ../SOURCES/{ingo,skeleton}.conf # DON'T FORGET TO :%s#ingo#skeleton#g in that file Source1: %{name}.conf +Patch0: %{name}-prefs.patch URL: http://www.horde.org/skeleton/ +BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) Requires: horde >= 3.0 @@ -35,9 +39,9 @@ %define _noautocompressdoc CREDITS %define _noautoreq 'pear(Horde.*)' -%define hordedir /usr/share/horde -%define _sysconfdir /etc/horde.org -%define _appdir %{hordedir}/%{name} +%define hordedir /usr/share/horde +%define _sysconfdir /etc/horde.org +%define _appdir %{hordedir}/%{_hordeapp} # GET DESCRIPTION FROM PROJECT URL %description @@ -55,40 +59,41 @@ Skeleton) mo?na znale?? na stronie . %prep -%setup -q -n %{?_snap:%{name}}%{!?_snap:%{name}-h3-%{version}%{?_rc:-%{_rc}}} +%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} +tar zxf %{SOURCE0} --strip-components=1 # considered harmful (horde/docs/SECURITY) rm -f test.php %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name}} \ +install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \ $RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do - cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist) + cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist) done -echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak +echo "" > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php +install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config -ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs +ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config +ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf %clean rm -rf $RPM_BUILD_ROOT %post -if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then - install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak +if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then + install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak fi # CHECK FIRST DOES IT HAVE SQL AND FILE THERE. @@ -102,13 +107,13 @@ fi %triggerin -- apache1 >= 1.3.33-2 -%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache1 >= 1.3.33-2 %apache_config_uninstall -v 1 %triggerin -- apache >= 2.0.0 -%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf +%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf %triggerun -- apache >= 2.0.0 %apache_config_uninstall -v 2 @@ -116,12 +121,12 @@ %files %defattr(644,root,root,755) %doc README docs/* scripts -%attr(750,root,http) %dir %{_sysconfdir}/%{name} -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf -%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php -%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak -%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php -%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp} +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php +%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php +%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml %dir %{_appdir} %{_appdir}/*.php @@ -138,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 17:05:14 glen +- %{_hordeapp} macro, unify + Revision 1.3 2005/08/03 17:49:12 qboosh - pl desc skeleton ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.3&r2=1.4&f=u From adamg at pld-linux.org Wed Aug 24 19:07:05 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: Mail-1.1.8.tgz Message-ID: <1667.1124903225@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Mail-1.1.8.tgz 69b1941019b686227123a879090241ab Mail-1.1.8.tgz Size: 16196 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:07 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php-pear-Mail.spec - updated to 1.1.8 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1.8 ---- Files affected: SPECS: php-pear-Mail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/php-pear-Mail.spec diff -u SPECS/php-pear-Mail.spec:1.22 SPECS/php-pear-Mail.spec:1.23 --- SPECS/php-pear-Mail.spec:1.22 Mon Aug 22 06:29:44 2005 +++ SPECS/php-pear-Mail.spec Wed Aug 24 19:07:02 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - Class that provides multiple interfaces for sending emails Summary(pl): %{_pearname} - Klasa daj?ca interfejsy do wysy?ania poczty Name: php-pear-%{_pearname} -Version: 1.1.7 +Version: 1.1.8 Release: 1 License: PHP/BSD Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: f6307041810d18da6c6d04acdcc9b72a +# Source0-md5: 69b1941019b686227123a879090241ab URL: http://pear.php.net/package/Mail/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -62,6 +62,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/24 17:07:02 adamg +- updated to 1.1.8 + Revision 1.22 2005/08/22 04:29:44 adamg - updated to 1.1.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Mail.spec?r1=1.22&r2=1.23&f=u From adamg at pld-linux.org Wed Aug 24 19:07:56 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: DB_DataObject_FormBuilder-0.18.1.tgz Message-ID: <2104.1124903276@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/DB_DataObject_FormBuilder-0.18.1.tgz 865fc02c5d596192e117e39a946719ca DB_DataObject_FormBuilder-0.18.1.tgz Size: 58383 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:07:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php-pear-DB_DataObject_FormBuilder.spec - updated to 0.18.1 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:07:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.18.1 ---- Files affected: SPECS: php-pear-DB_DataObject_FormBuilder.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/php-pear-DB_DataObject_FormBuilder.spec diff -u SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.17 --- SPECS/php-pear-DB_DataObject_FormBuilder.spec:1.16 Wed May 4 22:52:35 2005 +++ SPECS/php-pear-DB_DataObject_FormBuilder.spec Wed Aug 24 19:07:49 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - automatically build HTML_QuickForm object from a DB_DataObject derived class Summary(pl): %{_pearname} - automatyczne budowanie obiektu HTML_QuickForm pochodz?cego z DB_DataObject Name: php-pear-%{_pearname} -Version: 0.14.0 +Version: 0.18.1 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 830d1ef268f3e84f608be61ac12f194e +# Source0-md5: 865fc02c5d596192e117e39a946719ca URL: http://pear.php.net/package/DB_DataObject_FormBuilder/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -82,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/24 17:07:49 adamg +- updated to 0.18.1 + Revision 1.16 2005/05/04 20:52:35 adamg - updated to 0.14.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-DB_DataObject_FormBuilder.spec?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Wed Aug 24 19:09:49 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php-pear-Net_Curl.spec - updated to 1.2.2 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:09:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.2 ---- Files affected: SPECS: php-pear-Net_Curl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/php-pear-Net_Curl.spec diff -u SPECS/php-pear-Net_Curl.spec:1.19 SPECS/php-pear-Net_Curl.spec:1.20 --- SPECS/php-pear-Net_Curl.spec:1.19 Sun Aug 21 20:10:26 2005 +++ SPECS/php-pear-Net_Curl.spec Wed Aug 24 19:09:44 2005 @@ -8,12 +8,12 @@ Summary: %{_pearname} - an OO interface to the cURL extension Summary(pl): %{_pearname} - obiektowy interfejs do rozszerzenia cURL Name: php-pear-%{_pearname} -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 184d23b7054483dcb61fee5d1d6cc692 +# Source0-md5: 8b207ccf47795495b788034ef1049140 URL: http://pear.php.net/package/Net_Curl/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/24 17:09:44 adamg +- updated to 1.2.2 + Revision 1.19 2005/08/21 18:10:26 adamg - updated to 1.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Net_Curl.spec?r1=1.19&r2=1.20&f=u From adamg at pld-linux.org Wed Aug 24 19:09:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: Net_Curl-1.2.2.tgz Message-ID: <2977.1124903387@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/Net_Curl-1.2.2.tgz 8b207ccf47795495b788034ef1049140 Net_Curl-1.2.2.tgz Size: 6729 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: PHPUnit-1.3.0.tgz Message-ID: <4469.1124903537@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/PHPUnit-1.3.0.tgz cd72efac3afe64c2499e643d53f3aba9 PHPUnit-1.3.0.tgz Size: 20898 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:12:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: php-pear-PHPUnit.spec - updated to 1.3.0 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:12:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.0 ---- Files affected: SPECS: php-pear-PHPUnit.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/php-pear-PHPUnit.spec diff -u SPECS/php-pear-PHPUnit.spec:1.24 SPECS/php-pear-PHPUnit.spec:1.25 --- SPECS/php-pear-PHPUnit.spec:1.24 Sat May 14 15:42:57 2005 +++ SPECS/php-pear-PHPUnit.spec Wed Aug 24 19:12:14 2005 @@ -7,12 +7,12 @@ Summary: %{_pearname} - regression testing framework for unit tests Summary(pl): %{_pearname} - zestaw test?w regresyjnych Name: php-pear-%{_pearname} -Version: 1.2.3 +Version: 1.3.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 774238a3865f2c348c7450fa2df98ebb +# Source0-md5: cd72efac3afe64c2499e643d53f3aba9 URL: http://pear.php.net/package/PHPUnit/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 17:12:14 adamg +- updated to 1.3.0 + Revision 1.24 2005/05/14 13:42:57 adamg - updated to 1.2.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PHPUnit.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Wed Aug 24 19:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: ApacheJServ.spec - pl updates and fixes In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:27:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl updates and fixes ---- Files affected: SPECS: ApacheJServ.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.39 SPECS/ApacheJServ.spec:1.40 --- SPECS/ApacheJServ.spec:1.39 Tue Aug 23 11:28:28 2005 +++ SPECS/ApacheJServ.spec Wed Aug 24 19:27:15 2005 @@ -53,8 +53,8 @@ in 100pc Java application, and listens for servlet requests using the Apache Java protocol (AJp). Typically, these requests will originate from the mod_jserv Apache module (DSO included). This package contains -a LGPL'ed implementation of sun's java servlet api version 2.0 by Paul -Siegmann +a LGPL'ed implementation of Sun's Java Servlet API version 2.0 by Paul +Siegmann . %description -l pl Apache JServ jest silnikiem serwletowym, rozwijanym przez Java Apache @@ -62,15 +62,15 @@ zosta? napisany od pocz?tku do ko?ca w Javie; nas?uchuje wywo?a? serwletu wykorzystuj?c protok?? Apache Java (AJp). Zazwyczaj wywo?ania te pochodz? z modu?u Apache mod_jservmodule (??cznie z DSO). Pakiet -ten zawiera sunowsk? implementacj? api serlet?w w javie w wersji 2.0 -(na licencji LGPL) napisana przez Paula Siegmanna - +ten zawiera implementacj? Java Servlet API Suna w wersji 2.0 napisan? +przez Paula Siegmanna (na licencji LGPL) +. %package init Summary: ApacheJServ initscript +Summary(pl): Skrypt startowy ApacheJServ Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} -BuildRequires: rpmbuild(macros) >= 1.202 Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/useradd @@ -79,13 +79,20 @@ %description init JServ initscript for standalone mode. +%description init -l pl +Skrypt startowy JServ dla trybu samodzielnego. + %package doc Summary: ApacheJServ documentation +Summary(pl): Dokumentacja do ApacheJServ Group: Development/Languages/Java %description doc ApacheJserv documentation. +%description doc -l pl +Dokumentacja do ApacheJServ. + %prep %setup -q -a1 %patch0 -p0 @@ -254,6 +261,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/24 17:27:15 qboosh +- pl updates and fixes + Revision 1.39 2005/08/23 09:28:28 glen - user/groupadd to init package - secret.key fill simplified ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.39&r2=1.40&f=u From adamg at pld-linux.org Wed Aug 24 19:37:31 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: cgdb-0.5.3.tar.gz Message-ID: <22441.1124905051@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/cgdb/cgdb-0.5.3.tar.gz 51adf1db0307adaba24336ef3a18e0c3 cgdb-0.5.3.tar.gz Size: 527341 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 19:37:29 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: cgdb.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 17:37:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: cgdb.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.11 SPECS/cgdb.spec:1.12 --- SPECS/cgdb.spec:1.11 Sat Jul 23 16:52:22 2005 +++ SPECS/cgdb.spec Wed Aug 24 19:37:24 2005 @@ -2,12 +2,12 @@ Summary: A lightweight, but fully functional curses frontend to gdb Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb -Version: 0.5.2 +Version: 0.5.3 Release: 1 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz -# Source0-md5: 275be939017a3e2f24442dbe498c1de7 +# Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch URL: http://cgdb.sourceforge.net/ BuildRequires: automake @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/24 17:37:24 adamg +- updated to 0.5.3 + Revision 1.11 2005/07/23 14:52:22 jareq - updated to 0.5.2 - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.11&r2=1.12&f=u From glen at pld-linux.org Wed Aug 24 19:39:07 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: initng.spec - initng-0.1.9 codenamed "Hopefully Rebooting" In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 17:39:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initng-0.1.9 codenamed "Hopefully Rebooting" ---- Files affected: SPECS: initng.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/initng.spec diff -u SPECS/initng.spec:1.21 SPECS/initng.spec:1.22 --- SPECS/initng.spec:1.21 Sat Aug 13 12:11:17 2005 +++ SPECS/initng.spec Wed Aug 24 19:39:02 2005 @@ -1,19 +1,16 @@ # $Revision$, $Date$ -# TODO -# - plugins build doesn't pass CFLAGS Summary: A next generation init replacement Summary(pl): Zamiennik inita nast?pnej generacji Name: initng -Version: 0.1.8 +Version: 0.1.9 Release: 0.1 Epoch: 0 License: GPL v2 Group: Base Source0: http://initng.thinktux.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: c4a18ebc8d31875abffac3b5552c242e -Patch0: %{name}-PLD.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-utmpx.patch +# Source0-md5: b8c2117da50a1417deb3f3d4a3a1ab7f +Patch0: %{name}-lib64.patch +#Patch2: %{name}-utmpx.patch URL: http://jw.dyndns.org/initng/ BuildRequires: sed >= 4.0 BuildRequires: /etc/pld-release @@ -78,11 +75,11 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 #%patch2 -p1 %build %configure \ + --%{?debug:en}%{!?debug:dis}able-debug \ --sysconfdir=/etc \ --libdir=/%{_lib} \ @@ -121,18 +118,18 @@ %doc doc/empty.conf doc/hard.conf %doc doc/gentoo-chart.png doc/initng-chart.png %dir %{_sysconfdir} -%dir %{_sysconfdir}/conf +#%dir %{_sysconfdir}/conf %dir %{_sysconfdir}/daemon %dir %{_sysconfdir}/debug %dir %{_sysconfdir}/net %dir %{_sysconfdir}/system -%dir %{_sysconfdir}/plugin +#%dir %{_sysconfdir}/plugin %dir %{_libdir} %dir %{_libdir}/scripts %dir %{_libdir}/scripts/net -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin/readahead.i %attr(755,root,root) /%{_lib}/libinitng.so.*.*.* -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/lib*.so %attr(755,root,root) %{_sbindir}/install_service %attr(755,root,root) %{_sbindir}/initng %attr(755,root,root) %{_sbindir}/ng-update @@ -166,9 +163,11 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/net/*.i %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.runlevel -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf/test.xml +#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xmltest.xml %attr(755,root,root) %{_sbindir}/gen_system_runlevel +%attr(755,root,root) %{_sbindir}/shutdown_script +%attr(755,root,root) %{_sbindir}/test_pidfile %attr(755,root,root) %{_libdir}/scripts/net/dhclient-wrapper %attr(755,root,root) %{_libdir}/scripts/net/dhcp %attr(755,root,root) %{_libdir}/scripts/net/dhcpcd-backgrounder @@ -189,6 +188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/24 17:39:02 glen +- initng-0.1.9 codenamed "Hopefully Rebooting" + Revision 1.21 2005/08/13 10:11:17 glen - updated to 0.1.8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng.spec?r1=1.21&r2=1.22&f=u From glen at pld-linux.org Wed Aug 24 19:39:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: initng-0.1.9.tar.bz2 Message-ID: <23480.1124905152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://initng.thinktux.net/download/initng-0.1.9.tar.bz2 b8c2117da50a1417deb3f3d4a3a1ab7f initng-0.1.9.tar.bz2 Size: 603927 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Wed Aug 24 19:50:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: Sman.spec - pl, missing dir In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 17:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing dir ---- Files affected: SPECS: Sman.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.1 SPECS/Sman.spec:1.2 --- SPECS/Sman.spec:1.1 Sun Aug 21 13:00:10 2005 +++ SPECS/Sman.spec Wed Aug 24 19:50:07 2005 @@ -5,6 +5,7 @@ # %include /usr/lib/rpm/macros.perl Summary: Searcher for Man pages +Summary(pl): Wyszukiwarka stron Man Name: Sman Version: 0.95 Release: 0.1 @@ -14,19 +15,15 @@ Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz # Source0-md5: b786338eba068a4a110bf2bbda51e695 URL: http://joshr.com/src/sman/ -BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib BuildRequires: perl-FreezeThaw +BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: swish-e-perl -%if %{with tests} -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -#%%define _noautoreq 'perl(anything_fake_or_conditional)' - %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -52,6 +49,30 @@ - Performs 'stemming' so that a search for "searches" will match a document with the word "searching" +%description -l pl +Sman to wyszukiwarka stron Man. Jest to rozszerzona wersja 'apropos' i +'man -k' oparta na przyk?adzie o tej samej nazwie z artyku?u Josha +Rabinowitza "How To Index Anything" ("Jak indeksowa? cokolwiek") w +numerze Linux Journal z czerwca 2003 +. Sman dodaje kilka +kluczowych mo?liwo?ci, kt?rych nie maj? poprzednicy: + +- obs?uguje z?o?one wyszukiwania tekstu w j?zyku naturalnym, takie jak + "(linux and kernel) or (mach and microkernel)" + +- pokazuje wyniki w kolejno?ci punktacji i opcjonalnie wyci?g ze + strony (przy u?yciu -e) z pod?wietleniem wyszukiwanego tekstu + +- pozwala na wyszukiwanie po sekcji, tytule, ciele i nazwie pliku + strony (przy u?yciu 'nazwa-meta=szukane-s?owo') + +- indeksuje ca?? zawarto?? stron man, a nie tylko tytu? i opis + +- u?ywa wcze?niej zbudowanego indeksu w celu szybszego wyszukiwania + +- wykonuje "stemming", przez co np. wyszukiwanie s?owa "searches" + znajdzie dokument ze s?owem "searching" + %prep %setup -q @@ -83,6 +104,7 @@ %{perl_vendorlib}/Sman/Config.pm %dir %{perl_vendorlib}/Sman/Man %{perl_vendorlib}/Sman/Man/Cache.pm +%dir %{perl_vendorlib}/Sman/Man/Cache %{perl_vendorlib}/Sman/Man/Cache/DB_File.pm %{perl_vendorlib}/Sman/Man/Cache/FileCache.pm %{perl_vendorlib}/Sman/Man/Convert.pm @@ -99,6 +121,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 17:50:07 qboosh +- pl, missing dir + Revision 1.1 2005/08/21 11:00:10 twittner - added, not tested - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Wed Aug 24 20:04:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: X11-driver-evdev.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 18:04:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: X11-driver-evdev.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/X11-driver-evdev.spec diff -u SPECS/X11-driver-evdev.spec:1.1 SPECS/X11-driver-evdev.spec:1.2 --- SPECS/X11-driver-evdev.spec:1.1 Sun Aug 21 16:32:08 2005 +++ SPECS/X11-driver-evdev.spec Wed Aug 24 20:04:06 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: An input device driver for X +Summary(pl): Sterownik urz?dze? wej?ciowych dla X Name: X11-driver-evdev Version: 0.2 Release: 1 @@ -22,10 +23,16 @@ %define _prefix /usr/X11R6 %description -This driver uses the linux input layer directly and can handle both +This driver uses the Linux input layer directly and can handle both mice and keyboards. Please read and comment at: https://bugs.freedesktop.org/show_bug.cgi?id=968 +%description -l pl +Ten sterownik u?ywa bezpo?rednio warstwy wej?ciowej Linuksa i mo?e +obs?u?y? zar?wno myszy jak i klawiatury. Mo?na o nim przeczyta? i +napisa? komentarz pod adresem: +https://bugs.freedesktop.org/show_bug.cgi?id=968 + %prep %setup -q -n evdev-driver-%{version} %patch0 @@ -54,7 +61,7 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog README -%attr(644,root,root) %{_libdir}/modules/input/evdev_drv.o +%{_libdir}/modules/input/evdev_drv.o %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -62,5 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:04:06 qboosh +- pl + Revision 1.1 2005/08/21 14:32:08 pluto - evdev driver for input devices. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-evdev.spec?r1=1.1&r2=1.2&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: phpPgAdmin.spec - updated to 3.5.5 In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.5.5 ---- Files affected: SPECS: phpPgAdmin.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/phpPgAdmin.spec diff -u SPECS/phpPgAdmin.spec:1.45 SPECS/phpPgAdmin.spec:1.46 --- SPECS/phpPgAdmin.spec:1.45 Sat Apr 16 15:36:29 2005 +++ SPECS/phpPgAdmin.spec Wed Aug 24 20:17:13 2005 @@ -2,12 +2,12 @@ Summary: phpPgAdmin - web-based PostgreSQL administration Summary(pl): phpPgAdmin - administracja bazami PostgreSQL przez WWW Name: phpPgAdmin -Version: 3.5.3 +Version: 3.5.5 Release: 1 License: GPL v2+ Group: Applications/Databases/Interfaces Source0: http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2 -# Source0-md5: 91a9e6bce537422febedc5666ad296d6 +# Source0-md5: 26ff10b0bc1c4a313ddcf6e679cb4adf Source1: %{name}.conf URL: http://sourceforge.net/projects/phppgadmin/ Requires: php >= 4.1 @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/24 18:17:13 adamg +- updated to 3.5.5 + Revision 1.45 2005/04/16 13:36:29 charles - updated to 3.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/phpPgAdmin.spec?r1=1.45&r2=1.46&f=u From adamg at pld-linux.org Wed Aug 24 20:17:19 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: phpPgAdmin-3.5.5.tar.bz2 Message-ID: <15638.1124907439@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/phppgadmin/phpPgAdmin-3.5.5.tar.bz2 26ff10b0bc1c4a313ddcf6e679cb4adf phpPgAdmin-3.5.5.tar.bz2 Size: 457450 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:19:45 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS (DEVEL): edb.spec - updated to 1.0.5.004 - new Source0 ("off... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:19:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.0.5.004 - new Source0 ("official" snapshots) - updated -ac_fix.patch ---- Files affected: SPECS: edb.spec (1.21.2.2 -> 1.21.2.3) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.2 SPECS/edb.spec:1.21.2.3 --- SPECS/edb.spec:1.21.2.2 Sat Jul 9 15:03:42 2005 +++ SPECS/edb.spec Wed Aug 24 20:19:40 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Database Access Library Summary(pl): Biblioteka Enlightementa dost?pu do baz danych Name: edb -Version: 1.0.5.003 -%define _snap 20050701 -Release: 1.%{_snap}.0.1 +Version: 1.0.5.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 870592c7ef67ae31abfe5f37861a689e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch URL: http://www.enlightement.org/ BuildRequires: autoconf @@ -64,13 +62,13 @@ Edytor baz danych w GTK+. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"; export CFLAGS %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -122,6 +120,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.3 2005/08/24 18:19:40 charles +- updated to 1.0.5.004 +- new Source0 ("official" snapshots) +- updated -ac_fix.patch + Revision 1.21.2.2 2005/07/09 13:03:42 sparky - new snapshot - correct license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.2&r2=1.21.2.3&f=u From charles at pld-linux.org Wed Aug 24 20:19:48 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: edb-1.0.5.004.tar.gz Message-ID: <17162.1124907588@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edb-1.0.5.004.tar.gz 2565467041d770240f93969c6055e35f edb-1.0.5.004.tar.gz Size: 631960 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:48 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: lkcp-0.5.3.tar.bz2 Message-ID: <18052.1124907648@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://lkcp-0.5.3.tar.bz2 020f788b8c9ac52636b357e8929f7e30 lkcp-0.5.3.tar.bz2 Size: 104394 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Wed Aug 24 20:20:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: lkcp.spec - distfiles workaround In-Reply-To: References: Message-ID: Author: adamg Date: Wed Aug 24 18:20:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - distfiles workaround ---- Files affected: SPECS: lkcp.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.1 SPECS/lkcp.spec:1.2 --- SPECS/lkcp.spec:1.1 Wed Aug 24 18:18:58 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:20:46 2005 @@ -5,7 +5,8 @@ Release: 1 License: GPL v2 Group: Applications -Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +#Source0: http://webspace.utexas.edu/hyoussef/www/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 # Source0-md5: 020f788b8c9ac52636b357e8929f7e30 URL: http://webspace.utexas.edu/~hyoussef/ BuildRequires: glib-devel @@ -19,8 +20,8 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs do -konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu +Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -51,7 +52,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/24 18:20:46 adamg +- distfiles workaround + Revision 1.1 2005/08/24 16:18:58 adamg - new - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.1&r2=1.2&f=u From charles at pld-linux.org Wed Aug 24 20:22:29 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SOURCES (DEVEL): edb-ac_fix.patch - updated to 1.0.5.004 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:22:29 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated to 1.0.5.004 ---- Files affected: SOURCES: edb-ac_fix.patch (1.3.2.1 -> 1.3.2.2) ---- Diffs: ================================================================ Index: SOURCES/edb-ac_fix.patch diff -u SOURCES/edb-ac_fix.patch:1.3.2.1 SOURCES/edb-ac_fix.patch:1.3.2.2 --- SOURCES/edb-ac_fix.patch:1.3.2.1 Thu Mar 31 00:01:54 2005 +++ SOURCES/edb-ac_fix.patch Wed Aug 24 20:22:24 2005 @@ -1,6 +1,6 @@ ---- edb/configure.in~ 2005-03-04 01:11:17.000000000 +0100 -+++ edb/configure.in 2005-03-30 17:05:38.000000000 +0200 -@@ -25,55 +25,6 @@ +--- edb-1.0.5.004/configure.in.orig 2005-07-30 08:03:20.000000000 +0200 ++++ edb-1.0.5.004/configure.in 2005-08-24 13:54:09.000000000 +0200 +@@ -24,55 +24,6 @@ dnl AC_PROG_INSTALL() dnl AC_ARG_PROGRAM() @@ -56,7 +56,16 @@ dnl There are additional libraries we need for some compiler/architecture dnl combinations. AC_SUBST(LIBS) -@@ -457,7 +408,6 @@ +@@ -404,7 +355,7 @@ + ncurses_ok=no + gtk_ok=no + +-GTK_CONFIG=`which gtk-config` ++GTK_CONFIG=/usr/bin/gtk-config + if test -x "$GTK_CONFIG"; then + AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) + fi +@@ -456,7 +407,6 @@ edb-native.oe edb.bb edbXnative.bb ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/edb-ac_fix.patch?r1=1.3.2.1&r2=1.3.2.2&f=u From charles at pld-linux.org Wed Aug 24 20:25:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: ERRORS: eet-0.9.10.013.tar.gz Message-ID: <21647.1124907927@distfiles.pld-linux.org> FATAL: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz md5 mismatch, needed 82a7680c4eedf3c4a073fcdf7134cc91, got 875802e243e37e2eb954d3580cb19678 Files fetched: 0 -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:25:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: eet.spec - updated to 0.9.10.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.10.013 - new Source0 ("official" snapshots) - -devel R: libjpeg-devel, zlib-devel ---- Files affected: SPECS: eet.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.5 SPECS/eet.spec:1.6 --- SPECS/eet.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/eet.spec Wed Aug 24 20:25:23 2005 @@ -2,13 +2,11 @@ Summary: Library for speedy data storage, retrieval, and compression Summary(pl): Biblioteka do szybkiego zapisywania, odtwarzania i kompresji danych Name: eet -Version: 0.9.10.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.9 +Version: 0.9.10.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 URL: http://enlightenment.org/ BuildRequires: autoconf @@ -50,6 +48,8 @@ Summary(pl): Pliki nag??wkowe biblioteki Eet Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libjpeg-devel +Requires: zlib-devel %description devel Header files for Eet library. @@ -70,11 +70,11 @@ Statyczna biblioteka Eet. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -118,6 +118,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:25:23 charles +- updated to 0.9.10.013 +- new Source0 ("official" snapshots) +- -devel R: libjpeg-devel, zlib-devel + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:28:04 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: ecore-0.9.9.013.tar.gz Message-ID: <23249.1124908084@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ecore-0.9.9.013.tar.gz ef3dcedf00e18c6449e744edf4a50c50 ecore-0.9.9.013.tar.gz Size: 1074990 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:28:03 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: ecore.spec - updated to 0.9.9.013 - new Source0 ("official"... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:28:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ecore.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.5 SPECS/ecore.spec:1.6 --- SPECS/ecore.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ecore.spec Wed Aug 24 20:27:57 2005 @@ -2,20 +2,19 @@ Summary: Enlightened Core X interface library Summary(pl): Biblioteka interfejsu X Enlightened Core Name: ecore -Version: 0.9.9.010 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: dda96a94cab2fd5d485757b76f0c4775 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel BuildRequires: libtool BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,12 +57,22 @@ Statyczne biblioteki Ecore. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -123,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:27:57 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Wed Aug 24 20:29:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: lkcp.spec - disable "tset -Q -r", fixes build on my amd64 c... In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 18:29:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable "tset -Q -r", fixes build on my amd64 chroot under screen ---- Files affected: SPECS: lkcp.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.2 SPECS/lkcp.spec:1.3 --- SPECS/lkcp.spec:1.2 Wed Aug 24 20:20:46 2005 +++ SPECS/lkcp.spec Wed Aug 24 20:29:34 2005 @@ -30,6 +30,7 @@ %build %{__make} -C src \ + RESET=true \ CC="%{__cc}" \ FLAGS="%{rpmcflags} -I/usr/include/ncurses" @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 18:29:34 glen +- disable "tset -Q -r", fixes build on my amd64 chroot under screen + Revision 1.2 2005/08/24 18:20:46 adamg - distfiles workaround ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.2&r2=1.3&f=u From charles at pld-linux.org Wed Aug 24 20:30:15 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: edje.spec - updated to 0.5.0.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:30:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.0.013 - new Source0 ("official" snapshots) - BR/R imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: edje.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.7 SPECS/edje.spec:1.8 --- SPECS/edje.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/edje.spec Wed Aug 24 20:30:10 2005 @@ -2,21 +2,18 @@ Summary: Complex Graphical Design/Layout Engine Summary(pl): Z?o?ony silnik graficznego projektowania/planowania Name: edje -Version: 0.5.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.5.0.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 94cd1aabb9fc7785123fb4d92255f85e +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 1e5829e8c784770da2ccbd57ef55714c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: embryo-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -60,7 +57,7 @@ Requires: %{name} = %{version}-%{release} Requires: ecore-devel Requires: embryo-devel -Requires: imlib2-devel +Requires: imlib2-devel >= 1.2.1 %description devel Header files for Edje. @@ -81,11 +78,11 @@ Statyczna biblioteka Edje. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -131,6 +128,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:30:10 charles +- updated to 0.5.0.013 +- new Source0 ("official" snapshots) +- BR/R imlib2-devel up to >= 1.2.1 + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:30:23 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: edje-0.5.0.013.tar.gz Message-ID: <24704.1124908223@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/edje-0.5.0.013.tar.gz 1e5829e8c784770da2ccbd57ef55714c edje-0.5.0.013.tar.gz Size: 3161902 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:32:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: SPECS: eet.spec - updated md5 In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:32:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated md5 ---- Files affected: SPECS: eet.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.6 SPECS/eet.spec:1.7 --- SPECS/eet.spec:1.6 Wed Aug 24 20:25:23 2005 +++ SPECS/eet.spec Wed Aug 24 20:32:54 2005 @@ -7,7 +7,7 @@ License: BSD Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz -# Source0-md5: 82a7680c4eedf3c4a073fcdf7134cc91 +# Source0-md5: 875802e243e37e2eb954d3580cb19678 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:32:54 charles +- updated md5 + Revision 1.6 2005/08/24 18:25:23 charles - updated to 0.9.10.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:33:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: eet-0.9.10.013.tar.gz Message-ID: <26416.1124908382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/eet-0.9.10.013.tar.gz 875802e243e37e2eb954d3580cb19678 eet-0.9.10.013.tar.gz Size: 317271 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:57 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:34 2005 Subject: DISTFILES: embryo-0.9.1.013.tar.gz Message-ID: <26952.1124908437@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/embryo-0.9.1.013.tar.gz e1140446f243445ad8b987becb975d3d embryo-0.9.1.013.tar.gz Size: 436231 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:33:56 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: embryo.spec - updated to 0.9.1.013 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:33:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.1.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: embryo.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.5 SPECS/embryo.spec:1.6 --- SPECS/embryo.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/embryo.spec Wed Aug 24 20:33:50 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Embryo Summary(pl): Podstawowe biblioteki Enlightenmenta - Embryo Name: embryo -Version: 0.9.1.010 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.1.013 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: d28dd1aadd155d78c42d2bbde48405e9 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: e1140446f243445ad8b987becb975d3d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -49,11 +47,11 @@ Statyczna biblioteka Embryo. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -98,6 +96,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:33:50 charles +- updated to 0.9.1.013 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: emotion-0.0.1.004.tar.gz Message-ID: <27629.1124908499@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/emotion-0.0.1.004.tar.gz 3be5850cf23afeff8976e45a9861b7c4 emotion-0.0.1.004.tar.gz Size: 410793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:34:59 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: emotion.spec - updated to 0.0.1.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:34:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.1.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: emotion.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.5 SPECS/emotion.spec:1.6 --- SPECS/emotion.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/emotion.spec Wed Aug 24 20:34:53 2005 @@ -2,14 +2,12 @@ Summary: Enlightenment Fundation Libraries - Emotion Summary(pl): Podstawowe biblioteki Enlightenmenta - Emotion Name: emotion -Version: 0.0.1.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.0.1.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b93da3ce3da37483ad4721facb050744 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Emotion. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -105,6 +103,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:34:53 charles +- updated to 0.0.1.004 +- new Source0 ("official" snapshots) + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:36:01 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: epeg.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:36:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: epeg.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.4 SPECS/epeg.spec:1.5 --- SPECS/epeg.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epeg.spec Wed Aug 24 20:35:56 2005 @@ -2,14 +2,12 @@ Summary: JPEG Scaling Library Summary(pl): Biblioteka do skalowania JPEG-?w Name: epeg -Version: 0.9.0.003 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 2d7073b33eb39d447d2c3cb6db5c1391 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ad8505bed8deb7049dfa6322ce908f99 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake @@ -50,11 +48,11 @@ Statyczna biblioteka Epeg. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -96,6 +94,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:35:56 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:36:07 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: epeg-0.9.0.004.tar.gz Message-ID: <28437.1124908567@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epeg-0.9.0.004.tar.gz ad8505bed8deb7049dfa6322ce908f99 epeg-0.9.0.004.tar.gz Size: 2363701 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:37:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: epsilon.spec - updated to 0.3.0.004 - new Source0 ("officia... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:37:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.3.0.004 - new Source0 ("official" snapshots) - updates BRs ---- Files affected: SPECS: epsilon.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.4 SPECS/epsilon.spec:1.5 --- SPECS/epsilon.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/epsilon.spec Wed Aug 24 20:37:42 2005 @@ -2,22 +2,17 @@ Summary: Enlightened Thumbnail Generator Summary(pl): O?wiecony generator miniaturek obraz?w Name: epsilon -Version: 0.3.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.3.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: b86833bb0c6190b93b99234d9d3a5311 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 10118c712b42d00b332c6fe1d9257661 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: edje-devel BuildRequires: epeg-devel -BuildRequires: freetype-devel -BuildRequires: imlib2-devel -BuildRequires: libltdl-devel -BuildRequires: libpng-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -71,7 +66,7 @@ Statyczna biblioteka Epsilon. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -117,6 +112,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:37:42 charles +- updated to 0.3.0.004 +- new Source0 ("official" snapshots) +- updates BRs + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:37:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: epsilon-0.3.0.004.tar.gz Message-ID: <29465.1124908666@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/epsilon-0.3.0.004.tar.gz 10118c712b42d00b332c6fe1d9257661 epsilon-0.3.0.004.tar.gz Size: 335128 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:27 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: esmart-0.9.0.004.tar.gz Message-ID: <30925.1124908827@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/esmart-0.9.0.004.tar.gz 23605a2ff7e90c8b28e934f6a1fbfc4d esmart-0.9.0.004.tar.gz Size: 374791 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:40:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: esmart.spec - updated to 0.9.0.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:40:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR libltdl-devel ---- Files affected: SPECS: esmart.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/esmart.spec diff -u SPECS/esmart.spec:1.4 SPECS/esmart.spec:1.5 --- SPECS/esmart.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/esmart.spec Wed Aug 24 20:40:23 2005 @@ -2,21 +2,18 @@ Summary: Evas "smart objects" Summary(pl): "Inteligentne obiekty" Evas Name: esmart -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: fd426d6d36dc57c857f5e91f8950b5d7 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 23605a2ff7e90c8b28e934f6a1fbfc4d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: epeg-devel BuildRequires: epsilon-devel -BuildRequires: libltdl-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,7 +53,7 @@ Statyczne biblioteki Esmart. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:40:23 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR libltdl-devel + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/esmart.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:37 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: etox.spec - updated to 0.9.0.004 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:41:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) - removed redundant BR pkgconfig ---- Files affected: SPECS: etox.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.4 SPECS/etox.spec:1.5 --- SPECS/etox.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/etox.spec Wed Aug 24 20:41:32 2005 @@ -2,20 +2,17 @@ Summary: Enlightened Text Object Library Summary(pl): O?wiecona biblioteka obiekt?w tekstowych (Enlightened Text Object Library) Name: etox -Version: 0.9.0 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 6f0241bb8021744f8e081e3739441644 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: ffb6de465dfc9a9b2802b414dd432932 URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel BuildRequires: libtool -BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -61,7 +58,7 @@ Statyczna biblioteka Etox. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -111,6 +108,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:41:32 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) +- removed redundant BR pkgconfig + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:41:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: etox-0.9.0.004.tar.gz Message-ID: <31771.1124908900@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/etox-0.9.0.004.tar.gz ffb6de465dfc9a9b2802b414dd432932 etox-0.9.0.004.tar.gz Size: 1046396 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: evas-0.9.9.013.tar.gz Message-ID: <32597.1124908963@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/evas-0.9.9.013.tar.gz 6d888cc6427d783ae517185c1e446e38 evas-0.9.9.013.tar.gz Size: 1404665 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:42:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: evas.spec - updated to 0.9.9.013 - new Source0 ("official" ... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:42:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.9.013 - new Source0 ("official" snapshots) ---- Files affected: SPECS: evas.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.7 SPECS/evas.spec:1.8 --- SPECS/evas.spec:1.7 Sun Jul 10 09:17:59 2005 +++ SPECS/evas.spec Wed Aug 24 20:42:34 2005 @@ -17,14 +17,12 @@ Summary: Multi-platform Canvas Library Summary(pl): Wieloplatformowa biblioteka do rysowania Name: evas -Version: 0.9.9.010 -%define _snap 20050706 -Release: 0.%{_snap}.0.1 +Version: 0.9.9.013 +Release: 1 License: BSD Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}_%{_pre}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: a798480eacc9437d84ed12d64f789fc5 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 6d888cc6427d783ae517185c1e446e38 URL: http://enlightenment.org/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel @@ -82,12 +80,11 @@ Statyczna biblioteka Evas. %prep -#%%setup -q -n %{name}-%{version}_%{_pre} -%setup -q -n %{name} +%setup -q %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -167,6 +164,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/24 18:42:34 charles +- updated to 0.9.9.013 +- new Source0 ("official" snapshots) + Revision 1.7 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.7&r2=1.8&f=u From charles at pld-linux.org Wed Aug 24 20:44:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: ewl.spec - updated to 0.0.4.004 - new Source0 ("official" s... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:44:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.4.004 - new Source0 ("official" snapshots) - removed redundant BR etox-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: ewl.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.5 SPECS/ewl.spec:1.6 --- SPECS/ewl.spec:1.5 Sun Jul 10 09:17:59 2005 +++ SPECS/ewl.spec Wed Aug 24 20:44:33 2005 @@ -2,20 +2,17 @@ Summary: Enlightenment Widget Library Summary(pl): Biblioteka widget?w Enlightenmenta (Enlightenment Widget Library) Name: ewl -Version: 0.0.4.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.1 +Version: 0.0.4.004 +Release: 1 License: BSD Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: 008c998c511e424165abdfbf319eaa00 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel BuildRequires: emotion-devel -BuildRequires: etox-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,11 +48,22 @@ Statyczna biblioteka EWL. %prep -%setup -q -n %{name} +%setup -q +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -107,6 +115,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:44:33 charles +- updated to 0.0.4.004 +- new Source0 ("official" snapshots) +- removed redundant BR etox-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:44:40 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: ewl-0.0.4.004.tar.gz Message-ID: <1355.1124909080@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/ewl-0.0.4.004.tar.gz aed8f9eaf06ed5f0120d6f9ce2dc985c ewl-0.0.4.004.tar.gz Size: 1222523 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:45:50 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: enlightenmentDR17.spec - updated to 0.16.999.013 - new Sour... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:45:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.16.999.013 - new Source0 ("official" snapshots) - BR gettext-devel - fixed missing AC_C___ATTRIBUTE__ macro ---- Files affected: SPECS: enlightenmentDR17.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.5 SPECS/enlightenmentDR17.spec:1.6 --- SPECS/enlightenmentDR17.spec:1.5 Thu Aug 4 13:06:18 2005 +++ SPECS/enlightenmentDR17.spec Wed Aug 24 20:45:44 2005 @@ -1,20 +1,20 @@ # $Revision$, $Date$ +%define _src_name enlightenment Summary: Enlightenment Window Manager Summary(pl): Zarz?dca okien X - Enlightenment Name: enlightenmentDR17 -Version: 0.16.999.010 -%define _snap 20050708 -Release: 0.%{_snap}.0.1 +Version: 0.16.999.013 +Release: 1 License: BSD Group: X11/Window Managers -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/e-%{_snap}.tar.gz -# Source0-md5: 66f01dd81c2cc2b06e47fd11cc4c6d29 +Source0: http://enlightenment.freedesktop.org/files/%{_src_name}-%{version}.tar.gz +# Source0-md5: d8dd1ab454cc08e33905bb03f6d480cf Source1: %{name}-xsession.desktop URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel +BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,7 +41,19 @@ Pliki nag??wkowe dla Enlightenmenta. %prep -%setup -q -n e +%setup -q -n %{_src_name}-%{version} +echo 'AC_DEFUN([AC_C___ATTRIBUTE__], + [ + AC_MSG_CHECKING(for __attribute__) + AC_CACHE_VAL(ac_cv___attribute__, [ + AC_TRY_COMPILE([#include ], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + ac_cv___attribute__=yes, ac_cv___attribute__=no)]) + if test "$ac_cv___attribute__" = "yes"; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if compiler has __attribute__]) + fi + AC_MSG_RESULT($ac_cv___attribute__)])' > acinclude.m4 + #name change: sed -e '/AM_INIT_AUTOMAKE/s/enlightenment/%{name}/' \ -i configure.in @@ -55,7 +67,7 @@ %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -108,6 +120,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/24 18:45:44 charles +- updated to 0.16.999.013 +- new Source0 ("official" snapshots) +- BR gettext-devel +- fixed missing AC_C___ATTRIBUTE__ macro + Revision 1.5 2005/08/04 11:06:18 darekr - BR: sed 4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.5&r2=1.6&f=u From charles at pld-linux.org Wed Aug 24 20:46:53 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: entice.spec - updated to 0.9.3.004 - new Source0 ("official... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:46:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.3.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entice.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/entice.spec diff -u SPECS/entice.spec:1.4 SPECS/entice.spec:1.5 --- SPECS/entice.spec:1.4 Sun Jul 10 09:17:59 2005 +++ SPECS/entice.spec Wed Aug 24 20:46:47 2005 @@ -2,14 +2,12 @@ Summary: Image viewer using Enlightenment libraries Summary(pl): Przegl?darka obrazk?w u?ywaj?ca bibliotek Enlightenmenta Name: entice -Version: 0.9.1 -%define _snap 20050701 -Release: 0.%{_snap}.0.1 +Version: 0.9.3.004 +Release: 1 License: BSD Group: X11/Window Managers/Tools -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 3b1d9e40558ebc803efc7b2fd9e7df42 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: c5ffa01f6327b59b4fbbb3729e1e0867 Patch0: %{name}-no_buildtime_gimp.patch URL: http://enlightenment.org/ BuildRequires: autoconf @@ -37,12 +35,12 @@ z tego katalogu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -70,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 18:46:47 charles +- updated to 0.9.3.004 +- new Source0 ("official" snapshots) + Revision 1.4 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entice.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 20:46:54 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: entice-0.9.3.004.tar.gz Message-ID: <2835.1124909213@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entice-0.9.3.004.tar.gz c5ffa01f6327b59b4fbbb3729e1e0867 entice-0.9.3.004.tar.gz Size: 881544 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:38 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: enlightenment-0.16.999.013.tar.gz Message-ID: <2106.1124909258@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/enlightenment-0.16.999.013.tar.gz d8dd1ab454cc08e33905bb03f6d480cf enlightenment-0.16.999.013.tar.gz Size: 41558793 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 20:47:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: entrance.spec - updated to 0.9.0.004 - new Source0 ("offici... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 18:47:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.0.004 - new Source0 ("official" snapshots) ---- Files affected: SPECS: entrance.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/entrance.spec diff -u SPECS/entrance.spec:1.6 SPECS/entrance.spec:1.7 --- SPECS/entrance.spec:1.6 Sun Jul 10 09:17:59 2005 +++ SPECS/entrance.spec Wed Aug 24 20:47:34 2005 @@ -2,14 +2,12 @@ Summary: Enlightened display manager Summary(pl): O?wiecony zarz?dca ekranu Name: entrance -Version: 0.9.0.003 -%define _snap 20050707 -Release: 0.%{_snap}.0.2 +Version: 0.9.0.004 +Release: 1 License: BSD Group: X11/Applications -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/apps/%{name}-%{_snap}.tar.gz -# Source0-md5: 4f1747d588dcb4ed1f0f613966519ca4 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 48d8999a5be31e4b089e0faf40bf9fd9 Source1: %{name}.init Source2: %{name}.Xsession Source3: %{name}.gen-conf @@ -44,7 +42,7 @@ jakich KDM czy GDM mog? tylko pomarzy?... i to bez narzutu. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 sed '/PACKAGE_CFG_DIR/s@"${sysconfdir}"@"${localstatedir}/lib/${PACKAGE}"@' \ @@ -119,6 +117,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 18:47:34 charles +- updated to 0.9.0.004 +- new Source0 ("official" snapshots) + Revision 1.6 2005/07/10 07:17:59 sparky - Source0: ftp -> http ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/entrance.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 20:48:24 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: entrance-0.9.0.004.tar.gz Message-ID: <3393.1124909304@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/entrance-0.9.0.004.tar.gz 48d8999a5be31e4b089e0faf40bf9fd9 entrance-0.9.0.004.tar.gz Size: 16901820 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Wed Aug 24 21:01:08 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS (DEVEL): gtk+2.spec - 2.8.2 In-Reply-To: References: Message-ID: Author: aflinta Date: Wed Aug 24 19:01:07 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - 2.8.2 ---- Files affected: SPECS: gtk+2.spec (1.179.2.9 -> 1.179.2.10) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.179.2.9 SPECS/gtk+2.spec:1.179.2.10 --- SPECS/gtk+2.spec:1.179.2.9 Wed Aug 24 10:00:08 2005 +++ SPECS/gtk+2.spec Wed Aug 24 21:01:00 2005 @@ -14,13 +14,13 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.8.1 +Version: 2.8.2 Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 -# Source0-md5: 62ffb0e555dcc4eee3eba5e3214897e3 +# Source0-md5: 5b8b6d24f9f24469f96934b6efcc34b9 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version @@ -275,6 +275,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.179.2.10 2005/08/24 19:01:00 aflinta +- 2.8.2 + Revision 1.179.2.9 2005/08/24 08:00:08 aflinta - 2.8.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.179.2.9&r2=1.179.2.10&f=u From aflinta at pld-linux.org Wed Aug 24 21:01:47 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: gtk+-2.8.2.tar.bz2 Message-ID: <12173.1124910107@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.2.tar.bz2 5b8b6d24f9f24469f96934b6efcc34b9 gtk+-2.8.2.tar.bz2 Size: 11802646 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 21:08:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: horde-passwd.spec - fix for broken ldap::_userDN() In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 19:08:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for broken ldap::_userDN() ---- Files affected: SPECS: horde-passwd.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.24 SPECS/horde-passwd.spec:1.25 --- SPECS/horde-passwd.spec:1.24 Wed Aug 24 19:04:32 2005 +++ SPECS/horde-passwd.spec Wed Aug 24 21:08:52 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ %define _snap 2005-08-24 -%define _rel 1 +%define _rel 2 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -16,6 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf +Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -51,6 +52,7 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 +%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -142,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/24 19:08:52 glen +- fix for broken ldap::_userDN() + Revision 1.24 2005/08/24 17:04:32 glen - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.24&r2=1.25&f=u From charles at pld-linux.org Wed Aug 24 21:12:46 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: imlib2_loaders-1.2.1.004.tar.gz Message-ID: <19449.1124910766@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2_loaders-1.2.1.004.tar.gz 554e93eefef26a00bc63aec15d0f913d imlib2_loaders-1.2.1.004.tar.gz Size: 309782 bytes -- Virtually Yours: distfiles. From charles at pld-linux.org Wed Aug 24 21:12:43 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: imlib2_loaders.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 19:12:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 ---- Files affected: SPECS: imlib2_loaders.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/imlib2_loaders.spec diff -u SPECS/imlib2_loaders.spec:1.3 SPECS/imlib2_loaders.spec:1.4 --- SPECS/imlib2_loaders.spec:1.3 Tue Jul 12 21:08:41 2005 +++ SPECS/imlib2_loaders.spec Wed Aug 24 21:12:37 2005 @@ -2,20 +2,18 @@ Summary: Additional Loaders for Imlib2 Summary(pl): Dodatkowe biblioteki wczytuj?ce dla Imlib2 Name: imlib2_loaders -Version: 1.2.1.001 -%define _snap 20050704 -Release: 0.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: Mixed (BSD and GPL) Group: Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: http://sparky.homelinux.org/snaps/enli/e17/libs/%{name}-%{_snap}.tar.gz -# Source0-md5: ff63cea4860ae7c085895ab452cac179 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 554e93eefef26a00bc63aec15d0f913d URL: http://enlightenment.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: edb-devel +BuildRequires: edb-devel >= 1.0.5 BuildRequires: eet-devel -BuildRequires: imlib2-devel +BuildRequires: imlib2-devel >= 1.2.1 BuildRequires: libtool Requires: imlib2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,7 +29,7 @@ rozprowadzane bezpo?rednio z bibliotek? Imlib2. %prep -%setup -q -n %{name} +%setup -q %build %{__libtoolize} @@ -66,6 +64,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 19:12:37 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- BR edb-devel up to >= 1.0.5, imlib2-devel up to >= 1.2.1 + Revision 1.3 2005/07/12 19:08:41 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2_loaders.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Wed Aug 24 22:17:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: lkcp.spec - typo, pl summary In-Reply-To: References: Message-ID: Author: qboosh Date: Wed Aug 24 20:17:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, pl summary ---- Files affected: SPECS: lkcp.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/lkcp.spec diff -u SPECS/lkcp.spec:1.3 SPECS/lkcp.spec:1.4 --- SPECS/lkcp.spec:1.3 Wed Aug 24 20:29:34 2005 +++ SPECS/lkcp.spec Wed Aug 24 22:17:29 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Live Kernel Configuration Panel +Summary(pl): Live Kernel Configuration Panel - panel do konfiguracji j?dra w czasie pracy Name: lkcp Version: 0.5.3 Release: 1 @@ -20,7 +21,7 @@ committed changes to the /proc/sys filesystem. %description -l pl -Live Kernel Configuration Panel (LKCP) to opraty na ncurses interfejs +Live Kernel Configuration Panel (LKCP) to oparty na ncurses interfejs do konfiguracji j?dra systemu Linux w trakcie pracy (za pomoc? systemu plik?w /proc). Program ten generuje tak?e skrypt w bashu zawieraj?cy ostatnie zmiany dokonane w systemie plik?w /proc/sys. @@ -53,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/24 20:17:29 qboosh +- typo, pl summary + Revision 1.3 2005/08/24 18:29:34 glen - disable "tset -Q -r", fixes build on my amd64 chroot under screen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lkcp.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Wed Aug 24 22:52:02 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: confdir.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 20:52:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: confdir.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/confdir.spec diff -u SPECS/confdir.spec:1.12 SPECS/confdir.spec:1.13 --- SPECS/confdir.spec:1.12 Wed Nov 10 14:32:59 2004 +++ SPECS/confdir.spec Wed Aug 24 22:51:57 2005 @@ -30,7 +30,7 @@ Summary: Header files for confdir library Summary(pl): Pliki nag??wkowe biblioteki confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description devel Header files for confdir library. @@ -42,7 +42,7 @@ Summary: Static confdir library Summary(pl): Biblioteka statyczna confdir Group: Development/Libraries -Requires: confdir = %{version} +Requires: %{name} = %{version}-%{release} %description static Static confdir library. @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 20:51:57 darekr +- strict deps + Revision 1.12 2004/11/10 13:32:59 paladine - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/confdir.spec?r1=1.12&r2=1.13&f=u From darekr at pld-linux.org Wed Aug 24 23:08:00 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gpppkill.spec - cosmetics In-Reply-To: References: Message-ID: Author: darekr Date: Wed Aug 24 21:08:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: gpppkill.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.17 SPECS/gpppkill.spec:1.18 --- SPECS/gpppkill.spec:1.17 Tue Aug 31 11:00:58 2004 +++ SPECS/gpppkill.spec Wed Aug 24 23:07:55 2005 @@ -14,8 +14,8 @@ Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba URL: http://www.pla.net.py/home/oliver/gpppkill/ -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Provides: gpppkill +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,16 +39,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -install -d ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin -%{__make} install DESTDIR=${RPM_BUILD_ROOT} +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README CHANGELOG +%doc CHANGELOG README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/24 21:07:55 darekr +- cosmetics + Revision 1.17 2004/08/31 09:00:58 snurf - typos / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.17&r2=1.18&f=u From glen at pld-linux.org Wed Aug 24 23:24:04 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: initng-initscripts-20050825.tar.bz2 Message-ID: <2600.1124918644@distfiles.pld-linux.org> Files fetched: 1 STORED: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-20050825.tar.bz2 8aee8e9866b90b2910d06027767a6a5a initng-initscripts-20050825.tar.bz2 Size: 6870 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Wed Aug 24 23:24:05 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: initng-pld.spec - 20050825 snap In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 21:24:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 20050825 snap ---- Files affected: SPECS: initng-pld.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/initng-pld.spec diff -u SPECS/initng-pld.spec:1.4 SPECS/initng-pld.spec:1.5 --- SPECS/initng-pld.spec:1.4 Wed Aug 3 12:09:38 2005 +++ SPECS/initng-pld.spec Wed Aug 24 23:24:00 2005 @@ -3,12 +3,12 @@ Summary(pl): Skrypty inicjalizuj?ce initng dla PLD Name: initng-pld Version: 0.0.1 -%define _snap 20050803 +%define _snap 20050825 Release: 0.%{_snap}.1 License: GPL Group: Base Source0: http://glen.alkohol.ee/pld/initng/initscripts/initng-initscripts-%{_snap}.tar.bz2 -# Source0-md5: 17a08c9107517ef4ba034df472bbac4a +# Source0-md5: 8aee8e9866b90b2910d06027767a6a5a Requires: initng Requires: module-init-tools Requires: mount @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/24 21:24:00 glen +- 20050825 snap + Revision 1.4 2005/08/03 10:09:38 glen - fix md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/initng-pld.spec?r1=1.4&r2=1.5&f=u From charles at pld-linux.org Wed Aug 24 23:35:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: mkvtoolnix.spec - fixed help files, added -help.patch In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:35:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed help files, added -help.patch ---- Files affected: SPECS: mkvtoolnix.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/mkvtoolnix.spec diff -u SPECS/mkvtoolnix.spec:1.6 SPECS/mkvtoolnix.spec:1.7 --- SPECS/mkvtoolnix.spec:1.6 Wed Aug 24 02:00:08 2005 +++ SPECS/mkvtoolnix.spec Wed Aug 24 23:35:42 2005 @@ -6,11 +6,12 @@ Summary(pl): Narz?dzia do film?w w formacie Matroska Name: mkvtoolnix Version: 1.5.5 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 # Source0-md5: f86b4b8e3ae07a3d8d2fd69a1f2dd3d5 +Patch0: %{name}-help.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -32,26 +33,34 @@ %prep %setup -q +%patch0 -p1 %build %{__sed} -i 's,wx-config,wx-gtk2-ansi-config,g' configure -%configure +%{__sed} -i 's,$INSTDIR,%{_datadir}/%{name},' src/mmg/mmg.cpp +%configure %{__make} %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# help files +install doc/*.h* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc +install doc/images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/images + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO doc/*.html doc/images/* +%doc AUTHORS ChangeLog README TODO %attr(755,root,root) %{_bindir}/* +%{_datadir}/%{name} %{_mandir}/man1/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -60,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/24 21:35:42 charles +- fixed help files, added -help.patch + Revision 1.6 2005/08/24 00:00:08 charles - updated to 1.5.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkvtoolnix.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Wed Aug 24 23:36:58 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: mkvtoolnix-help.patch (NEW) - fixed path to help files In-Reply-To: References: Message-ID: Author: charles Date: Wed Aug 24 21:36:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixed path to help files ---- Files affected: SOURCES: mkvtoolnix-help.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mkvtoolnix-help.patch diff -u /dev/null SOURCES/mkvtoolnix-help.patch:1.1 --- /dev/null Wed Aug 24 23:36:58 2005 +++ SOURCES/mkvtoolnix-help.patch Wed Aug 24 23:36:53 2005 @@ -0,0 +1,10 @@ +--- mkvtoolnix-1.5.5/src/mmg/mmg.cpp.orig 2005-08-21 15:04:48.000000000 +0200 ++++ mkvtoolnix-1.5.5/src/mmg/mmg.cpp 2005-08-24 22:54:38.000000000 +0200 +@@ -2002,6 +2002,7 @@ + cfg = new wxConfig(wxT("mkvmergeGUI")); + wxConfigBase::Set(cfg); + cfg->SetPath(wxT("/GUI")); ++ cfg->Write(wxT("installation_path"), wxT("$INSTDIR")); + cfg->Read(wxT("last_directory"), &last_open_dir, wxT("")); + for (i = 0; i < 4; i++) { + k.Printf(wxT("last_settings %u"), i); ================================================================ From twittner at pld-linux.org Thu Aug 25 00:06:12 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: cgdb-am_no_debug.patch (NEW) - don't force `-g' debug flag In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:06:12 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't force `-g' debug flag ---- Files affected: SOURCES: cgdb-am_no_debug.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-am_no_debug.patch diff -u /dev/null SOURCES/cgdb-am_no_debug.patch:1.1 --- /dev/null Thu Aug 25 00:06:12 2005 +++ SOURCES/cgdb-am_no_debug.patch Thu Aug 25 00:06:07 2005 @@ -0,0 +1,90 @@ +diff -Nur cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/kui/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/Makefile.am 2005-08-24 23:58:38.751560968 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libkui.a +diff -Nur cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am +--- cgdb-0.5.3~/cgdb/lib/wm/src/Makefile.am 2005-05-21 18:05:56.000000000 +0200 ++++ cgdb-0.5.3/cgdb/lib/wm/src/Makefile.am 2005-08-24 23:58:38.758559904 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/adt/include -I$(srcdir)/../inc + + # create the input library + noinst_LIBRARIES = libwm.a +diff -Nur cgdb-0.5.3~/cgdb/src/Makefile.am cgdb-0.5.3/cgdb/src/Makefile.am +--- cgdb-0.5.3~/cgdb/src/Makefile.am 2005-08-03 04:24:11.000000000 +0200 ++++ cgdb-0.5.3/cgdb/src/Makefile.am 2005-08-24 23:58:38.761559448 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am +--- cgdb-0.5.3~/cgdb/tokenizer/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/cgdb/tokenizer/src/Makefile.am 2005-08-24 23:58:38.740562640 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include \ ++AM_CFLAGS = -Wall -I$(srcdir)/../include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/util/include + +diff -Nur cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am +--- cgdb-0.5.3~/tgdb/annotate-two/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/annotate-two/src/Makefile.am 2005-08-24 23:58:38.715566440 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/various/rlctx/include \ +diff -Nur cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am +--- cgdb-0.5.3~/tgdb/gdbmi/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/tgdb/gdbmi/src/Makefile.am 2005-08-24 23:58:38.722565376 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ +diff -Nur cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am +--- cgdb-0.5.3~/tgdb/tgdb-base/src/Makefile.am 2005-08-03 04:24:15.000000000 +0200 ++++ cgdb-0.5.3/tgdb/tgdb-base/src/Makefile.am 2005-08-24 23:58:38.730564160 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/tgdb/tgdb-base/include \ + -I$(top_srcdir)/tgdb/annotate-two/include \ + -I$(top_srcdir)/tgdb/gdbmi/include \ +diff -Nur cgdb-0.5.3~/various/adt/src/Makefile.am cgdb-0.5.3/various/adt/src/Makefile.am +--- cgdb-0.5.3~/various/adt/src/Makefile.am 2005-05-21 18:05:57.000000000 +0200 ++++ cgdb-0.5.3/various/adt/src/Makefile.am 2005-08-24 23:58:38.690570240 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(top_srcdir)/various/util/include -I$(srcdir)/../include + + noinst_LIBRARIES = libadt.a + +diff -Nur cgdb-0.5.3~/various/rlctx/src/Makefile.am cgdb-0.5.3/various/rlctx/src/Makefile.am +--- cgdb-0.5.3~/various/rlctx/src/Makefile.am 2005-08-03 04:24:16.000000000 +0200 ++++ cgdb-0.5.3/various/rlctx/src/Makefile.am 2005-08-24 23:58:38.698569024 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall \ ++AM_CFLAGS = -Wall \ + -I$(top_srcdir)/various/util/include \ + -I$(top_srcdir)/various/adt/include \ + -I$(srcdir)/../include +diff -Nur cgdb-0.5.3~/various/util/src/Makefile.am cgdb-0.5.3/various/util/src/Makefile.am +--- cgdb-0.5.3~/various/util/src/Makefile.am 2004-09-08 21:41:44.000000000 +0200 ++++ cgdb-0.5.3/various/util/src/Makefile.am 2005-08-24 23:58:38.669573432 +0200 +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -g -Wall -I$(srcdir)/../include ++AM_CFLAGS = -Wall -I$(srcdir)/../include + noinst_LIBRARIES = libutil.a + + libutil_a_SOURCES = \ ================================================================ From twittner at pld-linux.org Thu Aug 25 00:07:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: cgdb-missing_includes.patch (NEW) - add missing #include ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:07:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add missing #include (it appears after am/ac regeneration) ---- Files affected: SOURCES: cgdb-missing_includes.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/cgdb-missing_includes.patch diff -u /dev/null SOURCES/cgdb-missing_includes.patch:1.1 --- /dev/null Thu Aug 25 00:07:49 2005 +++ SOURCES/cgdb-missing_includes.patch Thu Aug 25 00:07:44 2005 @@ -0,0 +1,13 @@ +--- cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c~ 2005-08-24 23:39:47.693507928 +0200 ++++ cgdb-0.5.3/cgdb/lib/kui/src/kui_term.c 2005-08-24 23:48:35.060335984 +0200 +@@ -14,6 +14,10 @@ + #include /* for getenv */ + #endif /* HAVE_STDLIB_H */ + ++#if HAVE_STDIO_H ++#include ++#endif /* HAVE_STDIO_H */ ++ + /* term.h prototypes */ + extern int tgetent(); + extern int tgetflag(); ================================================================ From cvs at pld-linux.org Thu Aug 25 00:08:14 2005 From: cvs at pld-linux.org (arekm) Date: Tue Dec 20 10:39:35 2005 Subject: rc-scripts/trunk/rc.d/init.d: cpusets functions Message-ID: <6333@svn.pld-linux.org> Author: arekm Date: Thu Aug 25 00:08:11 2005 New Revision: 6333 Modified: rc-scripts/trunk/rc.d/init.d/cpusets rc-scripts/trunk/rc.d/init.d/functions Log: Fix is_yes in cpuset stuff. Quote file paths when doing echo > something. Modified: rc-scripts/trunk/rc.d/init.d/cpusets ============================================================================== --- rc-scripts/trunk/rc.d/init.d/cpusets (original) +++ rc-scripts/trunk/rc.d/init.d/cpusets Thu Aug 25 00:08:11 2005 @@ -18,7 +18,7 @@ # Source function library. . /etc/rc.d/init.d/functions -if is_yes ${CPUSETS} ; then +if is_yes "${CPUSETS}" ; then if ! grep -q "/dev/cpuset" /proc/mounts ; then nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 fi Modified: rc-scripts/trunk/rc.d/init.d/functions ============================================================================== --- rc-scripts/trunk/rc.d/init.d/functions (original) +++ rc-scripts/trunk/rc.d/init.d/functions Thu Aug 25 00:08:11 2005 @@ -498,7 +498,7 @@ # And start it up. busy cd / - is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks + is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then if [ -n "$waitname" -a -n "$waittime" ]; then # Save basename. @@ -690,8 +690,8 @@ if [ "$pid" != "" ]; then cpuset_msg="..." - if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then - if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then + if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then + if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") else cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") @@ -706,8 +706,8 @@ # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` # if [ "$pid" != "" ]; then # cpuset_msg="..." -# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then -# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then +# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then +# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") # else # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") From twittner at pld-linux.org Thu Aug 25 00:13:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: cgdb.spec - get rid of debug flag (-g) during normal build ... In-Reply-To: References: Message-ID: Author: twittner Date: Wed Aug 24 22:13:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - get rid of debug flag (-g) during normal build (-am_no_debug.patch) - added missing #include (build failed after am/ac regeneration, -missing_includes.patch - regenerate am/ac (CPPFLAGS hack is still needed) - rel. 2 ---- Files affected: SPECS: cgdb.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/cgdb.spec diff -u SPECS/cgdb.spec:1.12 SPECS/cgdb.spec:1.13 --- SPECS/cgdb.spec:1.12 Wed Aug 24 19:37:24 2005 +++ SPECS/cgdb.spec Thu Aug 25 00:13:11 2005 @@ -3,13 +3,16 @@ Summary(pl): Lekki, ale w pe?ni funkcjonalny frontend do gdb oparty na ncurses Name: cgdb Version: 0.5.3 -Release: 1 +Release: 2 License: GPL Group: Development/Debuggers Source0: http://dl.sourceforge.net/cgdb/%{name}-%{version}.tar.gz # Source0-md5: 51adf1db0307adaba24336ef3a18e0c3 Patch0: %{name}-home_etc.patch +Patch1: %{name}-missing_includes.patch +Patch2: %{name}-am_no_debug.patch URL: http://cgdb.sourceforge.net/ +BuildRequires: autoconf BuildRequires: automake BuildRequires: readline-devel Requires: gdb @@ -35,10 +38,16 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -CPPFLAGS="-I/usr/include/ncurses" -cp -f /usr/share/automake/config.sub config +CPPFLAGS=" -I/usr/include/ncurses " +%{__aclocal} -I config +%{__autoconf} +%{__autoheader} +%{__automake} + %configure %{__make} @@ -65,6 +74,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/24 22:13:11 twittner +- get rid of debug flag (-g) during normal build (-am_no_debug.patch) +- added missing #include (build failed after am/ac regeneration, + -missing_includes.patch +- regenerate am/ac (CPPFLAGS hack is still needed) +- rel. 2 + Revision 1.12 2005/08/24 17:37:24 adamg - updated to 0.5.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cgdb.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Thu Aug 25 00:30:07 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: syslinux.spec - 3.10 In-Reply-To: References: Message-ID: Author: areq Date: Wed Aug 24 22:30:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 3.10 ---- Files affected: SPECS: syslinux.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: SPECS/syslinux.spec diff -u SPECS/syslinux.spec:1.65 SPECS/syslinux.spec:1.66 --- SPECS/syslinux.spec:1.65 Fri Jul 8 09:52:11 2005 +++ SPECS/syslinux.spec Thu Aug 25 00:30:01 2005 @@ -4,12 +4,12 @@ Summary(pt_BR): Carregador de boot simples Summary(zh_CN): Linux???????????????????? Name: syslinux -Version: 3.09 +Version: 3.10 Release: 1 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 -# Source0-md5: dd403b15ef18bb0e5d78d3f552f822a5 +# Source0-md5: 777d868eef7619ce971bfbc0c3ad4245 URL: http://syslinux.zytor.com/ BuildRequires: perl-base BuildRequires: nasm @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66 2005/08/24 22:30:01 areq +- 3.10 + Revision 1.65 2005/07/08 07:52:11 arekm - add all readme files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslinux.spec?r1=1.65&r2=1.66&f=u From areq at pld-linux.org Thu Aug 25 00:30:13 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: syslinux-3.10.tar.bz2 Message-ID: <2652.1124922613@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.10.tar.bz2 777d868eef7619ce971bfbc0c3ad4245 syslinux-3.10.tar.bz2 Size: 1245565 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 00:50:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gnome-icons-graphite.spec - updated to 1.2 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 22:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2 ---- Files affected: SPECS: gnome-icons-graphite.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-graphite.spec diff -u SPECS/gnome-icons-graphite.spec:1.2 SPECS/gnome-icons-graphite.spec:1.3 --- SPECS/gnome-icons-graphite.spec:1.2 Thu Jul 28 14:41:30 2005 +++ SPECS/gnome-icons-graphite.spec Thu Aug 25 00:50:16 2005 @@ -4,12 +4,12 @@ Summary: Graphite GNOME Icons Summary(pl): Zestaw ikonek graphite dla GNOME Name: gnome-icons-graphite -Version: 1.1 +Version: 1.2 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/graphite/%{realname}-%{version}.tar.bz2 -# Source0-md5: 6348f0acd4ba04bf6c02cfe39cfdbbea +# Source0-md5: 7ab77bcce941fcf0f09f19d56d93811f URL: http://gnome-look.org/content/show.php?content=26757 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -101,6 +101,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 22:50:16 paladine +- updated to 1.2 + Revision 1.2 2005/07/28 12:41:30 freetz - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-graphite.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 00:51:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: graphite-1.2.tar.bz2 Message-ID: <11493.1124923865@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/graphite/graphite-1.2.tar.bz2 7ab77bcce941fcf0f09f19d56d93811f graphite-1.2.tar.bz2 Size: 3861068 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: eGroupWare-1.0.0.009.tar.bz2 Message-ID: <5986.1124924655@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/egroupware/eGroupWare-1.0.0.009.tar.bz2 2ed2f3041ab4ff235f56ed23dfa7274b eGroupWare-1.0.0.009.tar.bz2 Size: 11042609 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 01:04:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: egroupware.spec - 1.0.0.009, security fixes In-Reply-To: References: Message-ID: Author: glen Date: Wed Aug 24 23:04:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.0.0.009, security fixes ---- Files affected: SPECS: egroupware.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.2 SPECS/egroupware.spec:1.3 --- SPECS/egroupware.spec:1.2 Thu Jul 21 19:23:32 2005 +++ SPECS/egroupware.spec Thu Aug 25 01:04:00 2005 @@ -5,14 +5,13 @@ Summary: eGroupWare - a web-based groupware suite written in PHP Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware -Version: 1.0.0.008 -%define _rel 2 -Release: 0.%{_rel}.1 +Version: 1.0.0.009 +Release: 0.1 Epoch: 0 License: GPL Group: Applications/WWW -Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}-%{_rel}.tar.bz2 -# Source0-md5: 30984ed46fa064632a3f3a1137786cbd +Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 +# Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 BuildArch: noarch @@ -70,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/24 23:04:00 glen +- 1.0.0.009, security fixes + Revision 1.2 2005/07/21 17:23:32 qboosh - pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Thu Aug 25 01:10:16 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gnome-icons-gperfection2.spec - updated to 2.3 In-Reply-To: References: Message-ID: Author: paladine Date: Wed Aug 24 23:10:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3 ---- Files affected: SPECS: gnome-icons-gperfection2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/gnome-icons-gperfection2.spec diff -u SPECS/gnome-icons-gperfection2.spec:1.9 SPECS/gnome-icons-gperfection2.spec:1.10 --- SPECS/gnome-icons-gperfection2.spec:1.9 Fri Jul 29 14:33:00 2005 +++ SPECS/gnome-icons-gperfection2.spec Thu Aug 25 01:10:11 2005 @@ -5,12 +5,12 @@ Summary: Gperfection2 GNOME Icons Summary(pl): Zestaw ikonek Gperfection2 dla GNOME Name: gnome-icons-gperfection2 -Version: 2.1 +Version: 2.3 Release: 1 License: GPL Group: X11/Amusements Source0: http://members.shaw.ca/titancreations/gnome/%{realname}-%{version}.tar.bz2 -# Source0-md5: 75677c02d32c35be0fbbc653d217a966 +# Source0-md5: d986acad9835c14e5c6bcbd4e1119f62 URL: http://gnome-look.org/content/show.php?content=22989 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,6 +104,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/24 23:10:11 paladine +- updated to 2.3 + Revision 1.9 2005/07/29 12:33:00 freetz - 2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-icons-gperfection2.spec?r1=1.9&r2=1.10&f=u From paladine at pld-linux.org Thu Aug 25 01:11:19 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: gperfection2-2.3.tar.bz2 Message-ID: <8378.1124925079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://members.shaw.ca/titancreations/gnome/gperfection2-2.3.tar.bz2 d986acad9835c14e5c6bcbd4e1119f62 gperfection2-2.3.tar.bz2 Size: 3889073 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Thu Aug 25 03:51:33 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: egroupware.spec - add R In-Reply-To: References: Message-ID: Author: wolvverine Date: Thu Aug 25 01:51:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add R ---- Files affected: SPECS: egroupware.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.3 SPECS/egroupware.spec:1.4 --- SPECS/egroupware.spec:1.3 Thu Aug 25 01:04:00 2005 +++ SPECS/egroupware.spec Thu Aug 25 03:51:28 2005 @@ -14,6 +14,11 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 +Requires: php-mysql +Requires: php-pgsql +Requires: php-pcre +Requires: php-gd +Requires: php-mbstring BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 01:51:28 wolvverine +- add R + Revision 1.3 2005/08/24 23:04:00 glen - 1.0.0.009, security fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Thu Aug 25 06:55:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gpppkill.spec - fixed build, use optflags In-Reply-To: References: Message-ID: Author: qboosh Date: Thu Aug 25 04:55:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed build, use optflags ---- Files affected: SPECS: gpppkill.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/gpppkill.spec diff -u SPECS/gpppkill.spec:1.18 SPECS/gpppkill.spec:1.19 --- SPECS/gpppkill.spec:1.18 Wed Aug 24 23:07:55 2005 +++ SPECS/gpppkill.spec Thu Aug 25 06:55:11 2005 @@ -8,16 +8,16 @@ License: GPL Vendor: The gpppkill Team Group: X11/Applications/Networking -Patch0: %{name}-warning.patch # Native URL is http: only, but we prefer ftp: # Source0: http://www.pla.net.py/home/oliver/gpppkill/archive/%{name}-%{version}.tar.gz Source0: ftp://metalab.unc.edu/pub/Linux/system/network/serial/ppp/%{name}-%{version}.tar.gz # Source0-md5: 222279e531a57ff21b918d04561146ba +Patch0: %{name}-warning.patch URL: http://www.pla.net.py/home/oliver/gpppkill/ -Provides: gpppkill +BuildRequires: gtk+-devel +BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - %description gpppkill is a X11 program for Linux that finishes the ppp connection if it not receive a minimal amount of bytes during certain time. It @@ -27,7 +27,7 @@ %description -l pl gpppkill to program dla X, kt?ry ko?czy po??czenie ppp je?li w danym okresie czasu nie otrzyma minimalnej ilo?ci bajt?w. Ukazuje on r?wnie? -ruch ppp w formie grafu. Konfiguruje si? go za pomoc? GUI. Wykrywa +ruch ppp w formie wykresu. Konfiguruje si? go za pomoc? GUI. Wykrywa wszystkie pppd i pyta, kt?rego u?y?. %prep @@ -35,21 +35,22 @@ %patch0 -p1 %build -%{__make} +%{__make} \ + CC="%{__cxx}" \ + CFLAGS="%{rpmcxxflags} -Wall -Wno-unused -Wno-deprecated -fpermissive -DGTK_DISABLE_COMPAT_H" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -d $RPM_BUILD_ROOT%{_bindir} -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT +install gpppkill $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGELOG README +%doc CHANGELOG CONTRIBUTORS README %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 04:55:11 qboosh +- fixed build, use optflags + Revision 1.18 2005/08/24 21:07:55 darekr - cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpppkill.spec?r1=1.18&r2=1.19&f=u From aredridel at pld-linux.org Thu Aug 25 07:34:05 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: logjam-4.5.1.tar.bz2 Message-ID: <11975.1124948045@distfiles.pld-linux.org> Files fetched: 1 STORED: http://neugierig.org/software/logjam/download/logjam-4.5.1.tar.bz2 ccae70dc36644cd1529c581443484ebe logjam-4.5.1.tar.bz2 Size: 748283 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Thu Aug 25 07:34:01 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: logjam.spec - up to 4.5.1 In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 05:34:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.5.1 ---- Files affected: SPECS: logjam.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/logjam.spec diff -u SPECS/logjam.spec:1.19 SPECS/logjam.spec:1.20 --- SPECS/logjam.spec:1.19 Wed Jun 8 16:40:34 2005 +++ SPECS/logjam.spec Thu Aug 25 07:33:56 2005 @@ -2,14 +2,13 @@ Summary: The GTK+2-client for LiveJournal Summary(pl): Oparty na GTK+2 klient do LiveJournala Name: logjam -Version: 4.4.1 -Release: 3 +Version: 4.5.1 +Release: 1 License: GPL Group: X11/Applications -Source0: http://logjam.danga.com/download/%{name}-%{version}.tar.bz2 -# Source0-md5: f16f68a4a6b15fb5bb650614f3ff081c +Source0: http://neugierig.org/software/logjam/download/%{name}-%{version}.tar.bz2 +# Source0-md5: ccae70dc36644cd1529c581443484ebe Source1: %{name}.desktop -Patch0: %{name}-sync-url.patch Patch1: %{name}-locale_names.patch URL: http://logjam.danga.com/ BuildRequires: automake @@ -21,6 +20,7 @@ BuildRequires: intltool BuildRequires: librsvg-devel >= 2.2.3 BuildRequires: libxml2-devel >= 2.0 +BuildRequires: sqlite3-devel BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -34,7 +34,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 mv -f po/{uk_UA,uk}.po mv -f po/{ru_RU,ru}.po @@ -43,7 +42,8 @@ %build cp -f /usr/share/automake/config.sub . %configure \ - --with-xmms=runtime + --with-xmms=runtime \ + --with-sqlite3 %{__make} %install @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/25 05:33:56 aredridel +- up to 4.5.1 + Revision 1.19 2005/06/08 14:40:34 zbyniu - BR: pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/logjam.spec?r1=1.19&r2=1.20&f=u From glen at pld-linux.org Thu Aug 25 08:09:25 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: apache.spec - todo security In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 06:09:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - todo security ---- Files affected: SPECS: apache.spec (1.403 -> 1.404) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.403 SPECS/apache.spec:1.404 --- SPECS/apache.spec:1.403 Sun Jul 10 01:41:05 2005 +++ SPECS/apache.spec Thu Aug 25 08:09:20 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ # TODO: +# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -1828,6 +1829,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.404 2005/08/25 06:09:20 glen +- todo security + Revision 1.403 2005/07/09 23:41:05 glen - rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.403&r2=1.404&f=u From arekm at pld-linux.org Thu Aug 25 08:14:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: rc-scripts.spec - rel 2; fix cpuset parts In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:14:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; fix cpuset parts ---- Files affected: SPECS: rc-scripts.spec (1.197 -> 1.198) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.197 SPECS/rc-scripts.spec:1.198 --- SPECS/rc-scripts.spec:1.197 Tue Aug 23 19:55:17 2005 +++ SPECS/rc-scripts.spec Thu Aug 25 08:14:53 2005 @@ -11,7 +11,7 @@ Summary(tr): inittab ve /etc/rc.d dosyalar? Name: rc-scripts Version: 0.4.0.20 -Release: 1 +Release: 2 License: GPL Vendor: PLD rc-scripts Team Group: Base @@ -19,6 +19,7 @@ # Source0-md5: d67b427da40f42b6b2fc5f562dc9286d Patch0: %{name}-dev_alias.patch Patch1: %{name}-con_serial_sparc.patch +Patch2: %{name}-cpuset.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -99,6 +100,7 @@ %ifarch sparc sparc64 %patch1 -p1 %endif +%patch2 -p0 %build %{__aclocal} @@ -305,6 +307,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.198 2005/08/25 06:14:53 arekm +- rel 2; fix cpuset parts + Revision 1.197 2005/08/23 17:55:17 baggins - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.197&r2=1.198&f=u From arekm at pld-linux.org Thu Aug 25 08:15:14 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: rc-scripts-cpuset.patch (NEW) - new; cpuset fixes In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 06:15:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new; cpuset fixes ---- Files affected: SOURCES: rc-scripts-cpuset.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rc-scripts-cpuset.patch diff -u /dev/null SOURCES/rc-scripts-cpuset.patch:1.1 --- /dev/null Thu Aug 25 08:15:14 2005 +++ SOURCES/rc-scripts-cpuset.patch Thu Aug 25 08:15:09 2005 @@ -0,0 +1,48 @@ +Index: rc.d/init.d/cpusets +=================================================================== +--- rc.d/init.d/cpusets (wersja 6332) ++++ rc.d/init.d/cpusets (kopia robocza) +@@ -18,7 +18,7 @@ + # Source function library. + . /etc/rc.d/init.d/functions + +-if is_yes ${CPUSETS} ; then ++if is_yes "${CPUSETS}" ; then + if ! grep -q "/dev/cpuset" /proc/mounts ; then + nls "ERROR: CPUSET support not enabled in kernel or /dev/cpuset not mounted" >&2 + fi +Index: rc.d/init.d/functions +=================================================================== +--- rc.d/init.d/functions (wersja 6332) ++++ rc.d/init.d/functions (kopia robocza) +@@ -498,7 +498,7 @@ + # And start it up. + busy + cd / +- is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ] && echo $$ >/dev/cpuset/${SERVICE_CPUSET}/tasks ++ is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ] && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks" + if errors=$(umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK}; USER=root HOME=/tmp TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} initlog -c "$prog" 2>&1); then + if [ -n "$waitname" -a -n "$waittime" ]; then + # Save basename. +@@ -690,8 +690,8 @@ + + if [ "$pid" != "" ]; then + cpuset_msg="..." +- if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +- if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++ if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++ if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + else + cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") +@@ -706,8 +706,8 @@ + # ((prog ":") == $5)) { print $1 ; exit 0 } }' $1` + # if [ "$pid" != "" ]; then + # cpuset_msg="..." +-# if is_yes $CPUSETS && [ -n "$SERVICE_CPUSET" ]; then +-# if $(grep -q "$pid" /dev/cpuset/${SERVICE_CPUSET}/tasks); then ++# if is_yes "$CPUSETS" && [ -n "$SERVICE_CPUSET" ]; then ++# if $(grep -q "$pid" "/dev/cpuset/${SERVICE_CPUSET}/tasks"); then + # cpuset_msg=$(nls " in cpuset %s..." "$SERVICE_CPUSET") + # else + # cpuset_msg=$(nls " outside of configured cpuset %s..." "$SERVICE_CPUSET") ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:39:55 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: lighttpd-openssl.patch (NEW) - fixes infinite loop on slo... In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:39:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fixes infinite loop on slow connection over SSL ---- Files affected: SOURCES: lighttpd-openssl.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/lighttpd-openssl.patch diff -u /dev/null SOURCES/lighttpd-openssl.patch:1.1 --- /dev/null Thu Aug 25 08:39:54 2005 +++ SOURCES/lighttpd-openssl.patch Thu Aug 25 08:39:49 2005 @@ -0,0 +1,67 @@ +--- branches/lighttpd-merge-1.4.x/src/connections.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/connections.c (revision 621) +@@ -213,7 +213,7 @@ + + #ifdef USE_OPENSSL + if (srv_sock->is_ssl) { +- int r; ++ int r, ssl_err; + + switch ((r = SSL_get_error(con->ssl, len))) { + case SSL_ERROR_WANT_READ: +@@ -237,8 +237,15 @@ + + /* fall thourgh */ + default: +- log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", +- r, ERR_error_string(ERR_get_error(), NULL)); ++ ssl_err = ERR_get_error(); ++ switch(ssl_err) { ++ case SSL_F_SSL23_GET_CLIENT_HELLO: ++ /* a unencrypted HTTP request on a HTTPS socket. Do a redirect to the right location */ ++ default: ++ log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", ++ r, ERR_error_string(ERR_get_error(), NULL)); ++ break; ++ } + break; + } + } else { +--- branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/mod_compress.c (revision 621) +@@ -357,7 +357,7 @@ + + if (-1 == mkdir(p->b->ptr, 0700)) { + if (errno != EEXIST) { +- log_error_write(srv, __FILE__, __LINE__, "ssss", "creating cache-directory", p->b->ptr, "failed", strerror(errno)); ++ log_error_write(srv, __FILE__, __LINE__, "sbss", "creating cache-directory", p->b, "failed", strerror(errno)); + + return -1; + } +--- branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 620) ++++ branches/lighttpd-merge-1.4.x/src/network_openssl.c (revision 621) +@@ -123,6 +123,7 @@ + size_t toSend; + stat_cache_entry *sce = NULL; + int ifd; ++ int write_wait = 0; + + if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->data.file.name, &sce)) { + log_error_write(srv, __FILE__, __LINE__, "sb", +@@ -162,6 +163,7 @@ + if ((r = SSL_write(con->ssl, s, toSend)) <= 0) { + switch ((ssl_r = SSL_get_error(con->ssl, r))) { + case SSL_ERROR_WANT_WRITE: ++ write_wait = 1; + break; + case SSL_ERROR_SYSCALL: + switch(errno) { +@@ -196,7 +198,7 @@ + if (c->offset == c->data.file.length) { + chunk_finished = 1; + } +- } while(!chunk_finished); ++ } while(!chunk_finished && !write_wait); + + break; + } ================================================================ From aredridel at pld-linux.org Thu Aug 25 08:40:38 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: lighttpd.spec - add openssl fix (Changeset 621) In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 06:40:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add openssl fix (Changeset 621) ---- Files affected: SPECS: lighttpd.spec (1.122 -> 1.123) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.122 SPECS/lighttpd.spec:1.123 --- SPECS/lighttpd.spec:1.122 Mon Aug 22 17:18:39 2005 +++ SPECS/lighttpd.spec Thu Aug 25 08:40:33 2005 @@ -57,6 +57,7 @@ Patch1: %{name}-fcgi-verbose.patch Patch2: %{name}-ssl-redirect-fix.patch Patch3: %{name}-lua-pkgconfig.patch +Patch4: %{name}-openssl.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -199,6 +200,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p2 %build %{__libtoolize} @@ -350,6 +352,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.123 2005/08/25 06:40:33 aredridel +- add openssl fix (Changeset 621) + Revision 1.122 2005/08/22 15:18:39 glen - add pkgconfig support for locating lua libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.122&r2=1.123&f=u From glen at pld-linux.org Thu Aug 25 09:11:21 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: egroupware.conf (NEW) - getting started In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:11:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - getting started ---- Files affected: SOURCES: egroupware.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u /dev/null SOURCES/egroupware.conf:1.1 --- /dev/null Thu Aug 25 09:11:21 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:11:16 2005 @@ -0,0 +1,8 @@ +# vim:syn=apache + +Alias /egroupware /usr/share/egroupware + + php_value memory_limit 16M + + +# vim: filetype=apache ts=4 sw=4 et ================================================================ From glen at pld-linux.org Thu Aug 25 09:27:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: egroupware.conf - need mbstring.func_overload In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:27:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - need mbstring.func_overload ---- Files affected: SOURCES: egroupware.conf (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/egroupware.conf diff -u SOURCES/egroupware.conf:1.1 SOURCES/egroupware.conf:1.2 --- SOURCES/egroupware.conf:1.1 Thu Aug 25 09:11:16 2005 +++ SOURCES/egroupware.conf Thu Aug 25 09:27:53 2005 @@ -3,6 +3,7 @@ Alias /egroupware /usr/share/egroupware php_value memory_limit 16M + php_value mbstring.func_overload 7 # vim: filetype=apache ts=4 sw=4 et ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/egroupware.conf?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 09:28:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: egroupware.spec - added apache config In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 07:28:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added apache config ---- Files affected: SPECS: egroupware.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.4 SPECS/egroupware.spec:1.5 --- SPECS/egroupware.spec:1.4 Thu Aug 25 03:51:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 09:28:25 2005 @@ -6,16 +6,18 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.1 +Release: 0.4 Epoch: 0 License: GPL Group: Applications/WWW Source0: http://dl.sourceforge.net/egroupware/eGroupWare-%{version}.tar.bz2 # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b +Source1: %{name}.conf URL: http://www.egroupware.org/ Requires: php >= 3:4.1.2 Requires: php-mysql Requires: php-pgsql +#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -23,6 +25,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _appdir %{_datadir}/%{name} +%define _sysconfdir /etc/%{name} %description eGroupWare is a multi-user, web-based groupware suite developed on a @@ -51,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_appdir} +install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}} cp -a *.php $RPM_BUILD_ROOT%{_appdir} cp -a addressbook admin backup bookmarks calendar comic developer_tools \ @@ -60,11 +63,27 @@ phpsysinfo polls preferences projects registration setup sitemgr stocks tts \ wiki $RPM_BUILD_ROOT%{_appdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf + %clean rm -rf $RPM_BUILD_ROOT +%triggerin -- apache1 >= 1.3.33-2 +%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache1 >= 1.3.33-2 +%apache_config_uninstall -v 1 + +%triggerin -- apache >= 2.0.0 +%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf + +%triggerun -- apache >= 2.0.0 +%apache_config_uninstall -v 2 + %files %defattr(644,root,root,755) +%attr(710,root,http) %dir %{_sysconfdir} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* %{_appdir} @@ -74,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 07:28:25 glen +- added apache config + Revision 1.4 2005/08/25 01:51:28 wolvverine - add R ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.4&r2=1.5&f=u From aflinta at pld-linux.org Thu Aug 25 10:05:02 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: cairo.spec - avoid to link with external libpixman, rel 3. In-Reply-To: References: Message-ID: Author: aflinta Date: Thu Aug 25 08:05:02 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - avoid to link with external libpixman, rel 3. ---- Files affected: SPECS: cairo.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.32 SPECS/cairo.spec:1.33 --- SPECS/cairo.spec:1.32 Wed Aug 17 19:19:41 2005 +++ SPECS/cairo.spec Thu Aug 25 10:04:57 2005 @@ -3,21 +3,20 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 0.9.2 -Release: 2 +Release: 3 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz # Source0-md5: 992095a5db597384a89b41e93737105d Patch0: %{name}-bug4110.patch URL: http://cairographics.org/ +BuildConflicts: libpixman-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.1.0 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 -# libpixman incorporated (explanation in NEWS) -#BuildRequires: libpixman-devel >= 0.1.6 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -26,7 +25,6 @@ BuildRequires: zlib-devel Requires: freetype >= 2.1.0 Requires: glitz >= 0.4.4 -#Requires: libpixman >= 0.1.6 Requires: xrender >= 0.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,9 +76,9 @@ Requires: fontconfig-devel Requires: freetype-devel >= 2.1.0 Requires: glitz-devel >= 0.4.4 -#Requires: libpixman-devel >= 0.1.6 Requires: libpng-devel Requires: xrender-devel >= 0.6 +Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -151,6 +149,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.33 2005/08/25 08:04:57 aflinta +- avoid to link with external libpixman, rel 3. + Revision 1.32 2005/08/17 17:19:41 paladine - added bug4110 patch (thx freetz) - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.32&r2=1.33&f=u From adamg at pld-linux.org Thu Aug 25 10:05:46 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: APC-3.0.8.tgz Message-ID: <27796.1124957146@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/APC-3.0.8.tgz a70a14a00275e551e8085f742322433f APC-3.0.8.tgz Size: 75541 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 10:05:47 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: php-pecl-APC.spec, php4-pecl-APC.spec - updated to 3.0.8 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 08:05:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.8 ---- Files affected: SPECS: php-pecl-APC.spec (1.8 -> 1.9) , php4-pecl-APC.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-APC.spec diff -u SPECS/php-pecl-APC.spec:1.8 SPECS/php-pecl-APC.spec:1.9 --- SPECS/php-pecl-APC.spec:1.8 Sun Aug 21 20:54:41 2005 +++ SPECS/php-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php-devel @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.8 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.3 SPECS/php4-pecl-APC.spec:1.4 --- SPECS/php4-pecl-APC.spec:1.3 Sun Aug 21 20:54:41 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:05:42 2005 @@ -5,12 +5,12 @@ Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} -Version: 3.0.7 +Version: 3.0.8 Release: 1 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz -# Source0-md5: a1163cc093b9fb683678f0da4333631d +# Source0-md5: a70a14a00275e551e8085f742322433f URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 @@ -72,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 08:05:42 adamg +- updated to 3.0.8 + Revision 1.3 2005/08/21 18:54:41 adamg - updated to 3.0.7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-APC.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 10:22:30 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: template-php4-pecl.spec (NEW) - copy of template-php-pecl.spec In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:22:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy of template-php-pecl.spec ---- Files affected: SPECS: template-php4-pecl.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u /dev/null SPECS/template-php4-pecl.spec:1.1 --- /dev/null Thu Aug 25 10:22:30 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:22:25 2005 @@ -0,0 +1,100 @@ +# $Revision$, $Date$ +%define _modname - +%define _status - + +Summary: %{_modname} - +Summary(pl): %{_modname} - +Name: php-pecl-%{_modname} +Version: 1.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +URL: http://pecl.php.net/package/Modname/ +BuildRequires: libtool +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description + +In PECL status of this extension is: %{_status}. + +%description -l pl + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 08:22:25 glen +- copy of template-php-pecl.spec + +Revision 1.10 2004/08/07 17:47:11 adamg +- ok, let's force php5 for pecl extensions + +Revision 1.9 2004/05/30 16:13:15 adamg +- fixed english information about status of the package; cosmetics + +Revision 1.8 2003/10/21 11:17:28 adamg +- added default doc files + +Revision 1.7 2003/10/15 17:37:05 adamg +- it finally happened - PECL separated from PEAR and moved to its own + repository, thus changes in urls (s/pear/pecl/) + +Revision 1.6 2003/10/07 20:50:01 adamg +- do not use macros in URL + +Revision 1.5 2003/08/31 20:49:12 adamg +- more specific URL + +Revision 1.4 2003/08/18 08:09:35 gotar +- mass commit: cosmetics (removed trailing white spaces) + +Revision 1.3 2003/06/12 12:31:48 qboosh +- cosmetics + +Revision 1.2 2003/06/11 23:09:37 adamg +- fixed package status information + +Revision 1.1 2003/06/11 17:18:49 adamg +- initial import of PECL template ================================================================ From paladine at pld-linux.org Thu Aug 25 10:25:32 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: gnome-keyring-manager-desktop.patch - updated for 2.11.92 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:25:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 2.11.92 ---- Files affected: SOURCES: gnome-keyring-manager-desktop.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gnome-keyring-manager-desktop.patch diff -u SOURCES/gnome-keyring-manager-desktop.patch:1.1 SOURCES/gnome-keyring-manager-desktop.patch:1.2 --- SOURCES/gnome-keyring-manager-desktop.patch:1.1 Wed Nov 17 13:37:44 2004 +++ SOURCES/gnome-keyring-manager-desktop.patch Thu Aug 25 10:25:27 2005 @@ -1,6 +1,6 @@ -diff -urN gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in ---- gnome-keyring-manager-0.0.3.orig/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:07.517253736 +0100 -+++ gnome-keyring-manager-0.0.3/gnome-keyring-manager.desktop.in.in 2004-11-17 13:34:32.275489912 +0100 +diff -urN gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in +--- gnome-keyring-manager-2.11.92.orig/data/gnome-keyring-manager.desktop.in.in 2005-03-25 16:41:46.000000000 +0100 ++++ gnome-keyring-manager-2.11.92/data/gnome-keyring-manager.desktop.in.in 2005-08-24 21:16:15.760210344 +0200 @@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Product=gnome-keyring-manager X-GNOME-Bugzilla-Component=general ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gnome-keyring-manager-desktop.patch?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Thu Aug 25 10:26:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: gnome-keyring-manager-2.11.92.tar.bz2 Message-ID: <7395.1124958366@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/gnome-keyring-manager-2.11.92.tar.bz2 73ad2540e61970442f880eb24b595d74 gnome-keyring-manager-2.11.92.tar.bz2 Size: 386900 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:26:07 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gnome-keyring-manager.spec - updated to 2.11.92 - gnome-doc... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:26:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.11.92 - gnome-doc-utils for omf files - sorted %%files ---- Files affected: SPECS: gnome-keyring-manager.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.7 SPECS/gnome-keyring-manager.spec:1.8 --- SPECS/gnome-keyring-manager.spec:1.7 Mon Apr 25 11:47:57 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 10:26:02 2005 @@ -2,23 +2,24 @@ Summary: Keyring manager for GNOME Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager -Version: 0.0.4 -Release: 2 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/0.0/%{name}-%{version}.tar.bz2 -# Source0-md5: 6c44751e9d5fa25559a751fc9751606f +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: 73ad2540e61970442f880eb24b595d74 Patch0: %{name}-desktop.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.8.1 +BuildRequires: gnome-doc-utils >= 0.3.1-2 BuildRequires: gnome-keyring-devel >= 0.4.1 -BuildRequires: gtk+2-devel >= 2:2.4.4 +BuildRequires: gtk+2-devel >= 2:2.6.0 BuildRequires: intltool >= 0.23 BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 Requires(post,preun): GConf2 -Requires: gtk+2 >= 2:2.4.4 +Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,8 +34,11 @@ %patch0 -p1 %build +gnome-doc-prepare --copy --force +%{__gnome_doc_common} %configure \ - --disable-schemas-install + --disable-schemas-install \ + --disable-scrollkeeper %{__make} %install @@ -46,7 +50,7 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no -%find_lang %{name} +%find_lang %{name} --with-gnome %clean rm -rf $RPM_BUILD_ROOT @@ -61,8 +65,9 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/* %{_desktopdir}/* +%{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +75,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 08:26:02 paladine +- updated to 2.11.92 +- gnome-doc-utils for omf files +- sorted %%files + Revision 1.7 2005/04/25 09:47:57 paladine - new style macros - rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Thu Aug 25 10:26:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: template-php4-pecl.spec - use confdir based php In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:26:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir based php ---- Files affected: SPECS: template-php4-pecl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.1 SPECS/template-php4-pecl.spec:1.2 --- SPECS/template-php4-pecl.spec:1.1 Thu Aug 25 10:22:25 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:26:49 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php4 Summary: %{_modname} - Summary(pl): %{_modname} - @@ -12,13 +13,13 @@ Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool -BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +BuildRequires: php4-devel +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description @@ -42,21 +43,29 @@ install -d $RPM_BUILD_ROOT%{extensionsdir} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/25 08:26:49 glen +- use confdir based php + Revision 1.1 2005/08/25 08:22:25 glen - copy of template-php-pecl.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 10:31:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: template-php4-pecl.spec - typo, merge installs In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:31:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - typo, merge installs ---- Files affected: SPECS: template-php4-pecl.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.2 SPECS/template-php4-pecl.spec:1.3 --- SPECS/template-php4-pecl.spec:1.2 Thu Aug 25 10:26:49 2005 +++ SPECS/template-php4-pecl.spec Thu Aug 25 10:31:34 2005 @@ -40,11 +40,10 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d -cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini ; Enable %{_modname} extension module extension=%{_modname}.so EOF @@ -74,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 08:31:34 glen +- typo, merge installs + Revision 1.2 2005/08/25 08:26:49 glen - use confdir based php ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.2&r2=1.3&f=u From glen at pld-linux.org Thu Aug 25 10:37:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: php4-pecl-APC.spec - use confdir php, rel 2 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 08:37:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use confdir php, rel 2 ---- Files affected: SPECS: php4-pecl-APC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-APC.spec diff -u SPECS/php4-pecl-APC.spec:1.4 SPECS/php4-pecl-APC.spec:1.5 --- SPECS/php4-pecl-APC.spec:1.4 Thu Aug 25 10:05:42 2005 +++ SPECS/php4-pecl-APC.spec Thu Aug 25 10:36:56 2005 @@ -1,12 +1,13 @@ # $Revision$, $Date$ %define _modname APC %define _status stable +%define _sysconfdir /etc/php4 Summary: %{_modname} - Alternative PHP Cache Summary(pl): %{_modname} - alternatywne cache PHP Name: php4-pecl-%{_modname} Version: 3.0.8 -Release: 1 +Release: 2 License: PHP Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz @@ -14,12 +15,11 @@ URL: http://pecl.php.net/package/APC/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description APC is the Alternative PHP Cache. It was conceived of to provide a @@ -46,24 +46,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_modname}-%{version}/modules/apc.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CHANGELOG,INSTALL,NOTICE} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -72,6 +79,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/25 08:36:56 glen +- use confdir php, rel 2 + Revision 1.4 2005/08/25 08:05:42 adamg - updated to 3.0.8 @@ -83,4 +93,3 @@ Revision 1.1 2005/07/27 11:09:41 adamg - new (cp from php-pecl-APC.spec) - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.4&r2=1.5&f=u From paladine at pld-linux.org Thu Aug 25 10:37:27 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: yelp-2.11.92.tar.bz2 Message-ID: <14578.1124959047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/yelp-2.11.92.tar.bz2 0458ead502d20d69ec96397da792f285 yelp-2.11.92.tar.bz2 Size: 649041 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 10:37:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS (DEVEL): yelp.spec - updated to 2.11.92 - use style macros -... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 08:37:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.11.92 - use style macros - sorted %%files ---- Files affected: SPECS: yelp.spec (1.66.2.10 -> 1.66.2.11) ---- Diffs: ================================================================ Index: SPECS/yelp.spec diff -u SPECS/yelp.spec:1.66.2.10 SPECS/yelp.spec:1.66.2.11 --- SPECS/yelp.spec:1.66.2.10 Thu Aug 18 14:24:16 2005 +++ SPECS/yelp.spec Thu Aug 25 10:37:22 2005 @@ -11,12 +11,12 @@ Summary: A system documentation reader from the GNOME project Summary(pl): Czytnik dokumentacji z projektu GNOME Name: yelp -Version: 2.11.1 -Release: 3 +Version: 2.11.92 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/%{name}-%{version}.tar.bz2 -# Source0-md5: f133a46fb20eb4733e5d5078a7c93ece +# Source0-md5: 0458ead502d20d69ec96397da792f285 Patch0: %{name}-desktop-categories.patch Patch1: %{name}-MOZILLA_HOME.patch URL: http://www.gnome.org/ @@ -40,9 +40,9 @@ %endif BuildRequires: pkgconfig >= 1:0.15.0 BuildRequires: popt-devel -BuildRequires: rpm-build >= 4.1-10 +BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: zlib-devel -Requires(post): GConf2 +Requires(post,preun): GConf2 Requires: docbook-style-xsl >= 1.55.0 Requires: gnome-doc-utils >= 0.3.1 Requires: gnome-vfs2 >= 2.11.0 @@ -93,17 +93,20 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install +%gconf_schema_install yelp.schemas + +%preun +%gconf_schema_uninstall yelp.schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc README ChangeLog NEWS TODO AUTHORS %attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/%{name} -%{_libdir}/bonobo/servers/* -%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png %{_desktopdir}/* +%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png +%{_libdir}/bonobo/servers/* +%{_sysconfdir}/gconf/schemas/yelp.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -111,6 +114,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.66.2.11 2005/08/25 08:37:22 paladine +- updated to 2.11.92 +- use style macros +- sorted %%files + Revision 1.66.2.10 2005/08/18 12:24:16 aflinta - rebuild with cairo, rel. 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/yelp.spec?r1=1.66.2.10&r2=1.66.2.11&f=u From adamg at pld-linux.org Thu Aug 25 11:08:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: apache.spec - fix for a byterange handling bug that could c... In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 09:08:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix for a byterange handling bug that could cause a DoS - release 5 ---- Files affected: SPECS: apache.spec (1.404 -> 1.405) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.404 SPECS/apache.spec:1.405 --- SPECS/apache.spec:1.404 Thu Aug 25 08:09:20 2005 +++ SPECS/apache.spec Thu Aug 25 11:08:30 2005 @@ -1,6 +1,5 @@ # $Revision$, $Date$ # TODO: -# - security http://security.gentoo.org/glsa/glsa-200508-15.xml # - mod_case_filter # - mod_case_filter_in # - mod_optional_fn_{export,import} @@ -37,7 +36,7 @@ Summary(tr): Lider WWW taray?c? Name: apache Version: 2.0.54 -Release: 4 +Release: 5 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -91,6 +90,8 @@ Patch23: %{name}-normalize-path.patch # http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre Patch24: %{name}2-pcre-patch.diff +# http://issues.apache.org/bugzilla/attachment.cgi?id=16102 DoS +Patch25: %{name}2-byterange.patch URL: http://httpd.apache.org/ BuildRequires: automake BuildRequires: apr-devel >= 1:1.0.0 @@ -775,6 +776,7 @@ %patch22 -p1 %patch23 -p1 %{?with_external_pcre:%patch24 -p2} +%patch25 -p0 %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *) %{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in @@ -1829,6 +1831,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.405 2005/08/25 09:08:30 adamg +- fix for a byterange handling bug that could cause a DoS +- release 5 + Revision 1.404 2005/08/25 06:09:20 glen - todo security ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.404&r2=1.405&f=u From paladine at pld-linux.org Thu Aug 25 11:09:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: gnubiff-2.1.5.tar.gz Message-ID: <1518.1124960976@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnubiff/gnubiff-2.1.5.tar.gz 5b8c406042028558a0cd3d24ec2cf199 gnubiff-2.1.5.tar.gz Size: 757377 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:09:39 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gnubiff.spec - updated to 2.1.5 - sorted %%files In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:09:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.5 - sorted %%files ---- Files affected: SPECS: gnubiff.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/gnubiff.spec diff -u SPECS/gnubiff.spec:1.23 SPECS/gnubiff.spec:1.24 --- SPECS/gnubiff.spec:1.23 Wed Jun 1 22:06:44 2005 +++ SPECS/gnubiff.spec Thu Aug 25 11:09:33 2005 @@ -6,12 +6,12 @@ Summary: Mail notification program Summary(pl): Program powiadamiaj?cy o nowej poczcie Name: gnubiff -Version: 2.1.3 +Version: 2.1.5 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/gnubiff/%{name}-%{version}.tar.gz -# Source0-md5: 4832f7d100b8f476082191a4c66a772f +# Source0-md5: 5b8c406042028558a0cd3d24ec2cf199 URL: http://gnubiff.sourceforge.net/ %{?with_gnome:BuildRequires: GConf2-devel >= 2.4.0} BuildRequires: autoconf >= 2.53 @@ -81,8 +81,8 @@ %{_pixmapsdir}/*.png %if %{with gnome} -%{_libdir}/bonobo/servers/*.server %{_datadir}/gnome-*/ui/*.xml +%{_libdir}/bonobo/servers/*.server %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +91,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/25 09:09:33 paladine +- updated to 2.1.5 +- sorted %%files + Revision 1.23 2005/06/01 20:06:44 zbyniu - BR: fam-devel, gettext-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnubiff.spec?r1=1.23&r2=1.24&f=u From paladine at pld-linux.org Thu Aug 25 11:13:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: python-pygtk-pangocairo.defs (REMOVED) - already in sources In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:13:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - already in sources ---- Files affected: SOURCES: python-pygtk-pangocairo.defs (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Thu Aug 25 11:14:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: pygtk-2.7.4.tar.bz2 Message-ID: <4419.1124961241@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/pygtk-2.7.4.tar.bz2 103670cb22c6cb65375dbd68aa727315 pygtk-2.7.4.tar.bz2 Size: 752672 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 11:14:03 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS (DEVEL): python-pygtk.spec - updated to 2.7.4 - removed pang... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 09:14:03 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.7.4 - removed pangocairo.defs (already in sources) - fixed/updated BRs/Rs - sorted %%files ---- Files affected: SPECS: python-pygtk.spec (1.113.2.6 -> 1.113.2.7) ---- Diffs: ================================================================ Index: SPECS/python-pygtk.spec diff -u SPECS/python-pygtk.spec:1.113.2.6 SPECS/python-pygtk.spec:1.113.2.7 --- SPECS/python-pygtk.spec:1.113.2.6 Thu Aug 18 23:44:43 2005 +++ SPECS/python-pygtk.spec Thu Aug 25 11:13:58 2005 @@ -10,16 +10,15 @@ Summary: Python bindings for GTK+ 2.x libraries Summary(pl): Wi?zania Pythona do bibliotek GTK+ 2.x Name: python-%{module} -Version: 2.7.3 -Release: 2 +Version: 2.7.4 +Release: 1 Epoch: 2 License: LGPL Group: Libraries/Python Source0: http://ftp.gnome.org/pub/gnome/sources/pygtk/2.7/%{module}-%{version}.tar.bz2 -# Source0-md5: 17986ed00ce4b3fb3e699c7f3735942c +# Source0-md5: 103670cb22c6cb65375dbd68aa727315 Source1: %{name}-python.m4 Source2: %{name}-jhflags.m4 -Source3: %{name}-pangocairo.defs Patch0: %{name}-pyc.patch URL: http://www.pygtk.org/ BuildRequires: atk-devel >= 1:1.8.1 @@ -29,10 +28,10 @@ BuildRequires: gtk+2-devel >= 2:2.8.0 BuildRequires: libglade2-devel >= 1:2.5.1 BuildRequires: libtool -BuildRequires: pango-devel >= 1:1.9.0 +BuildRequires: pango-devel >= 1:1.10.0 BuildRequires: python-devel >= 1:2.3.2 %{?with_numpy:BuildRequires: python-numpy-devel} -BuildRequires: python-pycairo-devel +BuildRequires: python-pycairo-devel >= 0.5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -81,7 +80,7 @@ Summary(pl): Wi?zania Pythona do biblioteki GObject Group: Libraries/Python %pyrequires_eq python-modules -Requires: glib2 >= 1:2.7.4 +Requires: glib2 >= 1:2.8.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -97,8 +96,8 @@ Group: Libraries/Python Requires: %{name}-atk = %{epoch}:%{version}-%{release} Requires: %{name}-pango = %{epoch}:%{version}-%{release} -Requires: gtk+2 >= 2:2.7.4 -Requires: python-pycairo +Requires: gtk+2 >= 2:2.8.0 +Requires: python-pycairo >= 0.5.0 Conflicts: python-pygtk < 1:1.0 Obsoletes: python-pygtk-glarea @@ -113,7 +112,7 @@ Summary(pl): Wi?zania Pythona do biblioteki ATK Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: atk >= 1.8.0 +Requires: atk >= 1:1.8.0 %description atk Python bindings for ATK library. @@ -126,7 +125,7 @@ Summary(pl): Wi?zania Pythona do biblioteki Pango Group: Libraries/Python Requires: %{name}-gobject = %{epoch}:%{version}-%{release} -Requires: pango > 1.9.0 +Requires: pango >= 1:1.10.0 Requires: python-pycairo %description pango @@ -156,7 +155,6 @@ mkdir m4 cp %{SOURCE1} m4/python.m4 cp %{SOURCE2} m4/jhflags.m4 -cp %{SOURCE3} pangocairo.defs %build %{__libtoolize} @@ -189,15 +187,12 @@ %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -%{_includedir}/pygtk-2.0 - %dir %{_datadir}/%{module} %dir %{_datadir}/%{module}/2.0 %dir %{_datadir}/%{module}/2.0/codegen %{_datadir}/%{module}/2.0/codegen/*.py[co] - %{_datadir}/%{module}/2.0/defs - +%{_includedir}/pygtk-2.0 %{_pkgconfigdir}/*.pc %files examples @@ -237,6 +232,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113.2.7 2005/08/25 09:13:58 paladine +- updated to 2.7.4 +- removed pangocairo.defs (already in sources) +- fixed/updated BRs/Rs +- sorted %%files + Revision 1.113.2.6 2005/08/18 21:44:43 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pygtk.spec?r1=1.113.2.6&r2=1.113.2.7&f=u From glen at pld-linux.org Thu Aug 25 11:45:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: egroupware.spec - splitting dirs for fine tune of permissions In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 09:45:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - splitting dirs for fine tune of permissions ---- Files affected: SPECS: egroupware.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.5 SPECS/egroupware.spec:1.6 --- SPECS/egroupware.spec:1.5 Thu Aug 25 09:28:25 2005 +++ SPECS/egroupware.spec Thu Aug 25 11:45:28 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.4 +Release: 0.7 Epoch: 0 License: GPL Group: Applications/WWW @@ -85,7 +85,42 @@ %attr(710,root,http) %dir %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %doc doc/* -%{_appdir} +%dir %{_appdir} +%{_appdir}/*.php +%{_appdir}/addressbook +%{_appdir}/admin +%{_appdir}/backup +%{_appdir}/bookmarks +%{_appdir}/calendar +%{_appdir}/comic +%{_appdir}/developer_tools +%{_appdir}/email +%{_appdir}/emailadmin +%{_appdir}/etemplate +%{_appdir}/felamimail +%{_appdir}/filemanager +%{_appdir}/forum +%{_appdir}/ftp +%{_appdir}/fudforum +%{_appdir}/headlines +%{_appdir}/infolog +%{_appdir}/jinn +%{_appdir}/manual +%{_appdir}/messenger +%{_appdir}/news_admin +%{_appdir}/phpbrain +%{_appdir}/phpgwapi +%{_appdir}/phpldapadmin +%{_appdir}/phpsysinfo +%{_appdir}/polls +%{_appdir}/preferences +%{_appdir}/projects +%{_appdir}/registration +%{_appdir}/setup +%{_appdir}/sitemgr +%{_appdir}/stocks +%{_appdir}/tts +%{_appdir}/wiki %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -93,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:45:28 glen +- splitting dirs for fine tune of permissions + Revision 1.5 2005/08/25 07:28:25 glen - added apache config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.5&r2=1.6&f=u From heretyk at pld-linux.org Thu Aug 25 11:55:09 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: jude-icon.png (NEW), jude.desktop - added icon for Jude In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:55:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added icon for Jude ---- Files affected: SOURCES: jude-icon.png (NONE -> 1.1) (NEW), jude.desktop (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/jude-icon.png <> ================================================================ Index: SOURCES/jude.desktop diff -u SOURCES/jude.desktop:1.2 SOURCES/jude.desktop:1.3 --- SOURCES/jude.desktop:1.2 Wed Nov 17 00:20:43 2004 +++ SOURCES/jude.desktop Thu Aug 25 11:55:04 2005 @@ -3,6 +3,7 @@ Name=Jude Comment=Jude Comment[pl]=Jude +Icon=jude.png Exec=jude Terminal=false MultipleArgs=false ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jude.desktop?r1=1.2&r2=1.3&f=u From heretyk at pld-linux.org Thu Aug 25 11:58:57 2005 From: heretyk at pld-linux.org (heretyk) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: jude.spec - up to 1.6.2 - icon added In-Reply-To: References: Message-ID: Author: heretyk Date: Thu Aug 25 09:58:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.6.2 - icon added ---- Files affected: SPECS: jude.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.5 SPECS/jude.spec:1.6 --- SPECS/jude.spec:1.5 Wed Nov 17 00:20:56 2004 +++ SPECS/jude.spec Thu Aug 25 11:58:52 2005 @@ -3,12 +3,13 @@ Summary: A New Java/UML Object-Oriented Design Tool Summary(pl): ?rodowisko obiektowo zorientowanego projektowania narz?dzi UML Name: jude -Version: 1.4 -Release: 2 +Version: 1.6.2 +Release: 1 License: Freeware Group: Applications/Engineering -Source0: http://objectclub.esm.co.jp/Jude/com%(echo %{version} |tr -d .)/%{name}-%{codename}-%(echo %{version} |tr . _).zip +Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop +Source2: %{name}-icon.png URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch @@ -29,7 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}} cat < $RPM_BUILD_ROOT%{_bindir}/%{name} #!/bin/sh @@ -38,6 +39,7 @@ install jude-%{codename}.jar JudeDefaultModel.jude $RPM_BUILD_ROOT%{_datadir}/%{name} install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png %clean rm -rf $RPM_BUILD_ROOT @@ -48,6 +50,7 @@ %attr(755,root,root) %{_bindir}/* %{_datadir}/%{name} %{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -55,6 +58,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 09:58:52 heretyk +- up to 1.6.2 +- icon added + Revision 1.5 2004/11/16 23:20:56 paladine - rel 2 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Thu Aug 25 12:04:47 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - commit my last change... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:04:47 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - commit my last changes, dated 2005-06-19 ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.5 -> 1.11.2.6) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.5 Sun Jun 19 19:04:13 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:04:42 2005 @@ -14,7 +14,7 @@ Name: php-pear-%{_pearname} Version: 1.3.0 %define _rc RC3 -Release: 0.%{_rc}.4 +Release: 0.%{_rc}.5 License: PHP 3.00 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz @@ -192,6 +192,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -x /usr/bin/pear ]; then + umask 002 + # this builds the pear registry depdb + /usr/bin/pear list > /dev/null +fi + %files %defattr(644,root,root,755) %doc %{_pearname}-%{version}%{_rc}/{Authors,ChangeLog,FAQ,INSTALL,PHPLICENSE.txt,README,Release*,poweredbyphpdoc.gif} @@ -210,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.6 2005/08/25 10:04:42 glen +- commit my last changes, dated 2005-06-19 + Revision 1.11.2.5 2005/06/19 17:04:13 glen - missing dir - NOTE: it doesn't work non-root now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.5&r2=1.11.2.6&f=u From paladine at pld-linux.org Thu Aug 25 12:06:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: gnome-keyring-manager.spec - fixed %%files - added missing ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 10:06:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %%files - added missing BR/R: scrollkeeper - run %%scrollkeeper_update_post{,un} - rel. 2 ---- Files affected: SPECS: gnome-keyring-manager.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/gnome-keyring-manager.spec diff -u SPECS/gnome-keyring-manager.spec:1.8 SPECS/gnome-keyring-manager.spec:1.9 --- SPECS/gnome-keyring-manager.spec:1.8 Thu Aug 25 10:26:02 2005 +++ SPECS/gnome-keyring-manager.spec Thu Aug 25 12:06:45 2005 @@ -3,7 +3,7 @@ Summary(pl): Zarz?dzanie kluczami dla GNOME Name: gnome-keyring-manager Version: 2.11.92 -Release: 1 +Release: 2 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-keyring-manager/2.11/%{name}-%{version}.tar.bz2 @@ -18,7 +18,9 @@ BuildRequires: libglade2-devel >= 1:2.4.1 BuildRequires: libgnomeui-devel >= 2.8.0 BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,preun): GConf2 +Requires(post,postun): scrollkeeper Requires: gtk+2 >= 2:2.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,16 +59,22 @@ %post %gconf_schema_install gnome-keyring-manager.schemas +%scrollkeeper_update_post %preun %gconf_schema_uninstall gnome-keyring-manager.schemas +%postun +%scrollkeeper_update_postun + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README TODO %attr(755,root,root) %{_bindir}/* -%{_datadir}/* +%{_datadir}/%{name} %{_desktopdir}/* +%{_mandir}/man1/* +%{_omf_dest_dir}/%{name} %{_sysconfdir}/gconf/schemas/gnome-keyring-manager.schemas %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -75,6 +83,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 10:06:45 paladine +- fixed %%files +- added missing BR/R: scrollkeeper +- run %%scrollkeeper_update_post{,un} +- rel. 2 + Revision 1.8 2005/08/25 08:26:02 paladine - updated to 2.11.92 - gnome-doc-utils for omf files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-keyring-manager.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Thu Aug 25 12:10:36 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:35 2005 Subject: SOURCES: dev-list - fix grsec In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:10:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix grsec ---- Files affected: SOURCES: dev-list (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SOURCES/dev-list diff -u SOURCES/dev-list:1.29 SOURCES/dev-list:1.30 --- SOURCES/dev-list:1.29 Mon Aug 22 10:46:10 2005 +++ SOURCES/dev-list Thu Aug 25 12:10:31 2005 @@ -2640,7 +2640,7 @@ %dev(b,2,37) %attr(660,root,floppy) /dev/fd1CompaQ %dev(c,1,7) %attr(644,root,root) /dev/full %dev(c,10,229) %attr(660,root,fsctrl) /dev/fuse -%dev(c,1,10) %attr(622,root,root) /dev/grsec +%dev(c,1,12) %attr(622,root,root) /dev/grsec %dev(b,3,0) %attr(660,root,disk) /dev/hda %dev(b,3,1) %attr(660,root,disk) /dev/hda1 %dev(b,3,10) %attr(660,root,disk) /dev/hda10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/dev-list?r1=1.29&r2=1.30&f=u From glen at pld-linux.org Thu Aug 25 12:11:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: egroupware.spec - permission changes, check_install.php passed In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 10:11:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - permission changes, check_install.php passed ---- Files affected: SPECS: egroupware.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.6 SPECS/egroupware.spec:1.7 --- SPECS/egroupware.spec:1.6 Thu Aug 25 11:45:28 2005 +++ SPECS/egroupware.spec Thu Aug 25 12:11:52 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.7 +Release: 0.9 Epoch: 0 License: GPL Group: Applications/WWW @@ -101,7 +101,6 @@ %{_appdir}/filemanager %{_appdir}/forum %{_appdir}/ftp -%{_appdir}/fudforum %{_appdir}/headlines %{_appdir}/infolog %{_appdir}/jinn @@ -109,7 +108,6 @@ %{_appdir}/messenger %{_appdir}/news_admin %{_appdir}/phpbrain -%{_appdir}/phpgwapi %{_appdir}/phpldapadmin %{_appdir}/phpsysinfo %{_appdir}/polls @@ -122,12 +120,33 @@ %{_appdir}/tts %{_appdir}/wiki +%dir %{_appdir}/phpgwapi +%{_appdir}/phpgwapi/*.php +%{_appdir}/phpgwapi/cron +%{_appdir}/phpgwapi/doc +%{_appdir}/phpgwapi/inc +%{_appdir}/phpgwapi/js +%{_appdir}/phpgwapi/setup +%{_appdir}/phpgwapi/templates +%{_appdir}/phpgwapi/themes +%dir %attr(775,root,http) %{_appdir}/phpgwapi/images +%{_appdir}/phpgwapi/images/* + +%dir %attr(775,root,http) %{_appdir}/fudforum +%{_appdir}/fudforum/*.php +%{_appdir}/fudforum/inc +%{_appdir}/fudforum/setup +%{_appdir}/fudforum/templates + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 10:11:52 glen +- permission changes, check_install.php passed + Revision 1.6 2005/08/25 09:45:28 glen - splitting dirs for fine tune of permissions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.6&r2=1.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:13:13 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:35 2005 Subject: SPECS: horde-passwd.spec - unification In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:13:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unification ---- Files affected: SPECS: horde-passwd.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.25 SPECS/horde-passwd.spec:1.26 --- SPECS/horde-passwd.spec:1.25 Wed Aug 24 21:08:52 2005 +++ SPECS/horde-passwd.spec Thu Aug 25 12:13:07 2005 @@ -16,7 +16,7 @@ Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz # Source0-md5: 6638fad5170d5421bacf7e44868a7964 Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/horde-passwd-broken-_userDN.patch +Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/25 10:13:07 paszczus +- unification + Revision 1.25 2005/08/24 19:08:52 glen - fix for broken ldap::_userDN() ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.25&r2=1.26&f=u From paszczus at pld-linux.org Thu Aug 25 12:15:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:35 2005 Subject: DISTFILES: l7-protocols-2005-08-24.tar.gz Message-ID: <9113.1124964928@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/l7-filter/l7-protocols-2005-08-24.tar.gz d6529a1483678b8b7969fc55dcd3f294 l7-protocols-2005-08-24.tar.gz Size: 65328 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:15:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: l7-protocols.spec - updated to 2005-08-24 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:15:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-24 ---- Files affected: SPECS: l7-protocols.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/l7-protocols.spec diff -u SPECS/l7-protocols.spec:1.10 SPECS/l7-protocols.spec:1.11 --- SPECS/l7-protocols.spec:1.10 Fri Jul 29 15:16:35 2005 +++ SPECS/l7-protocols.spec Thu Aug 25 12:15:22 2005 @@ -1,15 +1,15 @@ # $Revision$, $Date$ -%define dashver 2005-07-28 +%define dashver 2005-08-24 # Summary: Protocol definitions files for l7-filter Summary(pl): Pliki definicji protoko??w dla l7-filter Name: l7-protocols -Version: 2005_07_28 +Version: 2005_08_24 Release: 1 License: GPL Group: Applications/Networking Source0: http://dl.sourceforge.net/l7-filter/%{name}-%{dashver}.tar.gz -# Source0-md5: 9020a5bf60175ba7194d3f718cf6585f +# Source0-md5: d6529a1483678b8b7969fc55dcd3f294 URL: http://l7-filter.sourceforge.net/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 10:15:22 paszczus +- updated to 2005-08-24 + Revision 1.10 2005/07/29 13:16:35 paszczus - updated to 2005_07_28 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/l7-protocols.spec?r1=1.10&r2=1.11&f=u From arekm at pld-linux.org Thu Aug 25 12:17:21 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): php-pear-PhpDocumentor.spec - fix br In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 10:17:21 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix br ---- Files affected: SPECS: php-pear-PhpDocumentor.spec (1.11.2.6 -> 1.11.2.7) ---- Diffs: ================================================================ Index: SPECS/php-pear-PhpDocumentor.spec diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 SPECS/php-pear-PhpDocumentor.spec:1.11.2.7 --- SPECS/php-pear-PhpDocumentor.spec:1.11.2.6 Thu Aug 25 12:04:42 2005 +++ SPECS/php-pear-PhpDocumentor.spec Thu Aug 25 12:17:16 2005 @@ -22,7 +22,7 @@ Patch0: %{name}-includes_fix.patch Patch1: %{name}-html_treemenu_includes_fix.patch URL: http://pear.php.net/package/PhpDocumentor/ -BuildRequires: php-pear-PEAR >= 1.4.0-0.a11.5 +BuildRequires: php-pear-PEAR >= 1:1.4.0-0.a11.5 BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: sed >= 4.0 Requires(post): php-pear-PEAR @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11.2.7 2005/08/25 10:17:16 arekm +- fix br + Revision 1.11.2.6 2005/08/25 10:04:42 glen - commit my last changes, dated 2005-06-19 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.6&r2=1.11.2.7&f=u From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: kmplayer-0.9.1-pre1.tar.bz2 Message-ID: <25276.1124966469@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xs4all.nl/~jjvrieze/kmplayer-0.9.1-pre1.tar.bz2 b82f729fc99967cf76d92a78f241e164 kmplayer-0.9.1-pre1.tar.bz2 Size: 740728 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Thu Aug 25 12:41:09 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): kmplayer.spec - updated to 0.9.1-pre1 - adaptarized In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 10:41:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 0.9.1-pre1 - adaptarized ---- Files affected: SPECS: kmplayer.spec (1.48.2.2 -> 1.48.2.3) ---- Diffs: ================================================================ Index: SPECS/kmplayer.spec diff -u SPECS/kmplayer.spec:1.48.2.2 SPECS/kmplayer.spec:1.48.2.3 --- SPECS/kmplayer.spec:1.48.2.2 Fri Jul 29 12:44:26 2005 +++ SPECS/kmplayer.spec Thu Aug 25 12:41:03 2005 @@ -1,21 +1,23 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without gstreamer # Do not build kgstplayer +%bcond_with koffice # Build koffice plugin +%bcond_without xine # Do not build kxineplayer -%bcond_without gstreamer # Do not build kgstplayer -%bcond_with koffice # Build koffice plugin -%bcond_without xine # Do not build kxineplayer - +%define _pre pre1 Summary: A KDE MPlayer/Xine/ffmpeg/ffserver/VDR frontend Summary(pl): Frontend dla program?w MPlayer/Xine/ffmpeg/ffserver/VDR pod KDE Name: kmplayer -Version: 0.9.0a -Release: 0.1 +Version: 0.9.1 +Release: 0.%{_pre}.1 Epoch: 2 License: GPL Group: X11/Applications/Multimedia # From kdeextragear-2 kde cvs module #Source0: ftp://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2 -Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}.tar.bz2 -# Source0-md5: c6d5203bf1bfe5d2f1a5fb9f3b048c74 +Source0: http://www.xs4all.nl/~jjvrieze/%{name}-%{version}-%{_pre}.tar.bz2 +# Source0-md5: b82f729fc99967cf76d92a78f241e164 #Patch0: %{name}-mimetypes.patch URL: http://www.xs4all.nl/~jjvrieze/kmplayer.html BuildRequires: arts-qt-devel @@ -23,7 +25,7 @@ %{?with_gstreamer:BuildRequires: gstreamer-plugins-devel} BuildRequires: kdelibs-devel >= 9:3.1.92 %{?with_koffice:BuildRequires: koffice-devel} -BuildRequires: rpmbuild(macros) >= 1.129 +BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: sed >= 4.0 %{?with_xine:BuildRequires: xine-lib-devel >= 1:1.0} #BuildRequires: unsermake @@ -53,7 +55,7 @@ Integracja kmplayera z koffice. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{_pre} %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ src/kmplayer.desktop \ @@ -65,7 +67,7 @@ #export UNSERMAKE=/usr/share/unsermake/unsermake -#%{__make} -f admin/Makefile.common cvs +#%{__make} -f admin/Makefile.common cvs %configure \ --disable-rpath \ @@ -87,7 +89,7 @@ # remove bogus translation rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx -#%find_lang %{name} --with-kde +#%find_lang %{name} --with-kde %clean rm -rf $RPM_BUILD_ROOT @@ -130,6 +132,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.48.2.3 2005/08/25 10:41:03 paszczus +- updated to 0.9.1-pre1 +- adaptarized + Revision 1.48.2.2 2005/07/29 10:44:26 paszczus - updated to 0.9.0a ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kmplayer.spec?r1=1.48.2.2&r2=1.48.2.3&f=u From trojan at pld-linux.org Thu Aug 25 12:47:22 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (GCC4): gcc.spec - updated to 4.0.1 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 10:47:22 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - updated to 4.0.1 ---- Files affected: SPECS: gcc.spec (1.308 -> 1.308.2.1) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308 SPECS/gcc.spec:1.308.2.1 --- SPECS/gcc.spec:1.308 Mon May 23 12:30:55 2005 +++ SPECS/gcc.spec Thu Aug 25 12:47:16 2005 @@ -25,14 +25,12 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -%define _snap 20050521 -Release: 0.%{_snap}.2 +Release: 0.1 Epoch: 5 License: GPL v2+ Group: Development/Languages -#Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/gcc-4.0-%{_snap}.tar.bz2 -# Source0-md5: 7f45e29a00590ce57a001a9294e8184e +Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 947416e825a877a0d69489be1be43be1 Source1: %{name}-optimize-la.pl Patch0: %{name}-info.patch Patch1: %{name}-nolocalefiles.patch @@ -40,12 +38,6 @@ Patch3: %{name}-ada-link-new-libgnat.patch Patch4: %{name}-ada-link.patch Patch5: %{name}-alpha-ada_fix.patch -# PRs -Patch10: %{name}-pr19664.patch -Patch11: %{name}-pr20218.patch -Patch12: %{name}-pr20297.patch -Patch14: %{name}-push-pop-visibility.patch -Patch15: %{name}-pr21704.patch URL: http://gcc.gnu.org/ BuildRequires: autoconf BuildRequires: automake @@ -676,8 +668,7 @@ Statyczne biblioteki Obiektowego C. %prep -#setup -q -n gcc-%{version} -%setup -q -n gcc-4.0-%{_snap} +%setup -q -n gcc-%{version} %patch0 -p1 %patch1 -p1 @@ -686,13 +677,6 @@ %patch4 -p1 %patch5 -p1 -# PRs -%patch10 -p1 -%patch11 -p0 -%patch12 -p1 -%patch14 -p0 -%patch15 -p1 - # because we distribute modified version of gcc... perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c perl -pi -e 's@(bug_report_url.*";@' gcc/version.c @@ -1204,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.1 2005/08/25 10:47:16 trojan +- updated to 4.0.1 + Revision 1.308 2005/05/23 10:30:55 pluto - fix handling #pragma gcc visibility for builtins. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308&r2=1.308.2.1&f=u From paszczus at pld-linux.org Thu Aug 25 13:03:12 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: adapter.awk - do not be so humble ; added one more author In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 11:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - do not be so humble ; added one more author ---- Files affected: SPECS: adapter.awk (1.172 -> 1.173) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.172 SPECS/adapter.awk:1.173 --- SPECS/adapter.awk:1.172 Tue Aug 23 22:34:51 2005 +++ SPECS/adapter.awk Thu Aug 25 13:03:07 2005 @@ -9,6 +9,7 @@ # Tomasz K?oczko # Artur Frysiak # Michal Kochanowicz +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.172&r2=1.173&f=u From paladine at pld-linux.org Thu Aug 25 13:04:06 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): gnome-media.spec - missing dir - rel. 3 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:06 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dir - rel. 3 ---- Files affected: SPECS: gnome-media.spec (1.122.2.5 -> 1.122.2.6) ---- Diffs: ================================================================ Index: SPECS/gnome-media.spec diff -u SPECS/gnome-media.spec:1.122.2.5 SPECS/gnome-media.spec:1.122.2.6 --- SPECS/gnome-media.spec:1.122.2.5 Thu Aug 18 12:56:42 2005 +++ SPECS/gnome-media.spec Thu Aug 25 13:04:01 2005 @@ -4,7 +4,7 @@ Summary(pl): Programy multimedialne dla GNOME Name: gnome-media Version: 2.11.91 -Release: 2 +Release: 3 License: GPL v2+/LGPL v2+ Group: X11/Applications/Multimedia Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-media/2.11/%{name}-%{version}.tar.bz2 @@ -295,6 +295,7 @@ %dir %{_datadir}/gnome-media/pixmaps %{_datadir}/gnome-media/glade %{_datadir}/gstreamer-properties +%dir %{_omf_dest_dir}/%{name} %{_omf_dest_dir}/%{name}/gstreamer-properties-C.omf %{_pixmapsdir}/gstreamer-properties.png %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas @@ -393,6 +394,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122.2.6 2005/08/25 11:04:01 paladine +- missing dir +- rel. 3 + Revision 1.122.2.5 2005/08/18 10:56:42 aflinta - rebuild with cairo, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-media.spec?r1=1.122.2.5&r2=1.122.2.6&f=u From paladine at pld-linux.org Thu Aug 25 13:04:50 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): gnome-applets.spec - missing dirs - rel. 2 In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:04:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - missing dirs - rel. 2 ---- Files affected: SPECS: gnome-applets.spec (1.152.2.8 -> 1.152.2.9) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.152.2.8 SPECS/gnome-applets.spec:1.152.2.9 --- SPECS/gnome-applets.spec:1.152.2.8 Wed Aug 24 08:54:24 2005 +++ SPECS/gnome-applets.spec Thu Aug 25 13:04:44 2005 @@ -8,7 +8,7 @@ Summary(uk): ???????? ????????, ?? ???????????? ? ?????? GNOME Name: gnome-applets Version: 2.11.92.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2, FDL Group: X11/Applications @@ -533,6 +533,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml %{_pixmapsdir}/accessx-status-applet %{_iconsdir}/hicolor/48x48/apps/ax-applet.png +%dir %{_omf_dest_dir}/accessx-status %{_omf_dest_dir}/accessx-status/accessx-status-C.omf %lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf @@ -545,6 +546,7 @@ %{_datadir}/%{name}/glade/battstat_applet.glade %{_sysconfdir}/gconf/schemas/battstat.schemas %{_sysconfdir}/sound/events/battstat_applet.soundlist +%dir %{_omf_dest_dir}/battstat %{_omf_dest_dir}/battstat/battstat-C.omf %files charpicker -f char-palette.lang @@ -555,6 +557,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml %{_iconsdir}/hicolor/48x48/apps/charpick.png %{_sysconfdir}/gconf/schemas/charpick.schemas +%dir %{_omf_dest_dir}/char-palette %{_omf_dest_dir}/char-palette/char-palette-C.omf %lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf @@ -570,6 +573,7 @@ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas %{_pixmapsdir}/cpufreq-applet %{_iconsdir}/hicolor/48x48/apps/gnome-cpu.png +%dir %{_omf_dest_dir}/cpufreq-applet %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf %lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf @@ -580,6 +584,7 @@ %{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server %{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml %{_sysconfdir}/gconf/schemas/drivemount.schemas +%dir %{_omf_dest_dir}/drivemount %{_omf_dest_dir}/drivemount/drivemount-C.omf %lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf @@ -592,6 +597,7 @@ %{_datadir}/%{name}/geyes %{_iconsdir}/hicolor/48x48/apps/gnome-eyes.png %{_sysconfdir}/gconf/schemas/geyes.schemas +%dir %{_omf_dest_dir}/geyes %{_omf_dest_dir}/geyes/geyes-C.omf %lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf @@ -603,6 +609,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GtikApplet.xml %{_iconsdir}/hicolor/48x48/apps/gnome-money.png %{_sysconfdir}/gconf/schemas/gtik.schemas +%dir %{_omf_dest_dir}/gtik2_applet2 %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf %lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf @@ -614,6 +621,7 @@ %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml %{_datadir}/%{name}/gweather %{_sysconfdir}/gconf/schemas/gweather.schemas +%dir %{_omf_dest_dir}/gweather %{_omf_dest_dir}/gweather/gweather-C.omf %lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf @@ -673,6 +681,7 @@ %{_datadir}/%{name}/glade/gswitchit*.glade %{_iconsdir}/hicolor/48x48/apps/gswitchit*.png %{_sysconfdir}/gconf/schemas/gswitchit.schemas +%dir %{_omf_dest_dir}/gswitchit %{_omf_dest_dir}/gswitchit/gswitchit-C.omf %lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf @@ -687,6 +696,7 @@ %{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas %{_sysconfdir}/gconf/schemas/mini-commander.schemas +%dir %{_omf_dest_dir}/command-line %{_omf_dest_dir}/command-line/command-line-C.omf %lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf @@ -697,6 +707,7 @@ %{_libdir}/bonobo/servers/GNOME_MixerApplet.server %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas +%dir %{_omf_dest_dir}/mixer_applet2 %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf %lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf @@ -716,6 +727,7 @@ %{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml %{_sysconfdir}/gconf/schemas/multiload.schemas +%dir %{_omf_dest_dir}/multiload %{_omf_dest_dir}/multiload/multiload-C.omf %lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf @@ -728,6 +740,7 @@ %{_datadir}/%{name}/glade/stickynotes.glade %{_pixmapsdir}/stickynotes %{_sysconfdir}/gconf/schemas/stickynotes.schemas +%dir %{_omf_dest_dir}/stickynotes_applet %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf %lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf @@ -738,6 +751,7 @@ %{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server %{_datadir}/%{name}/glade/trashapplet.glade %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +%dir %{_omf_dest_dir}/trashapplet %{_omf_dest_dir}/trashapplet/trashapplet-C.omf %lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf %lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf @@ -748,6 +762,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.152.2.9 2005/08/25 11:04:44 paladine +- missing dirs +- rel. 2 + Revision 1.152.2.8 2005/08/24 06:54:24 paladine - updated to 2.11.92.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.152.2.8&r2=1.152.2.9&f=u From havner at pld-linux.org Thu Aug 25 13:12:27 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:36 2005 Subject: fortunes-pl: pld-offensive - glen's polish course continues In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 11:12:26 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - glen's polish course continues ---- Files affected: fortunes-pl: pld-offensive (1.6 -> 1.7) ---- Diffs: ================================================================ Index: fortunes-pl/pld-offensive diff -u fortunes-pl/pld-offensive:1.6 fortunes-pl/pld-offensive:1.7 --- fortunes-pl/pld-offensive:1.6 Fri Feb 4 11:54:52 2005 +++ fortunes-pl/pld-offensive Thu Aug 25 13:12:21 2005 @@ -55,3 +55,12 @@ 11:36 <@cieciwa> Panowie... 11:37 <@cieciwa> komu przyjebac ??? tak od serca ? % +[13:08:17] < mmazur> 'kurwa mac' is short for 'kurwa twoja mac' which means (literally) 'whore your mother' [IN] +[13:08:27] < mmazur> So it's kind of heavy for a curse :) [IN] +[13:08:46] < glen> we have saying here in estonia, after one anectote [IN] +[13:08:48] < gausus> mmazur: nalezy Ci sie medal KEN i uscisk reki miodka za promocje poprawnie rozumianej polszczyzny na obczyznie [IN] +[13:08:54] < glen> "suck your own mother's dick" :) [IN] +[13:09:00] < gausus> mmazur: ale ucz ich ucz, jak ich podbijemy to beda nas rozumiec [IN] +[13:09:20] < gausus> glen: afair nobodys mother has a dick of her own [IN] +[13:09:27] < gausus> at least where i come from [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld-offensive?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:24:35 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): imlib2.spec - updated to 1.2.1.004 - new Source0 ("... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:24:35 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.2.1.004 - new Source0 ("official" snapshots) - added URL ---- Files affected: SPECS: imlib2.spec (1.51.2.1 -> 1.51.2.2) ---- Diffs: ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.51.2.1 SPECS/imlib2.spec:1.51.2.2 --- SPECS/imlib2.spec:1.51.2.1 Thu Mar 31 01:38:47 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:24:30 2005 @@ -2,14 +2,13 @@ Summary: Powerful image loading and rendering library Summary(pl): Pot??na biblioteka wczytuj?ca i renderuj?ca obrazki Name: imlib2 -Version: 1.2.0 -%define _snap 20050329 -Release: 1.%{_snap}.0.1 +Version: 1.2.1.004 +Release: 1 License: LGPL Group: X11/Libraries -#Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz -Source0: ftp://ftp.sparky.homelinux.org/pub/e17/%{name}-%{_snap}.tar.gz -# Source0-md5: cd77568626e5212ffcdbb881e407d8c6 +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz +# Source0-md5: 9130e1b016eb392700c51baaa35c76cd +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -71,13 +70,13 @@ Biblioteki statyczne imlib2. %prep -%setup -q -n %{name} +%setup -q sed -i -e 's@/lib -lX11@/%{_lib} -lX11@' configure.in %build %{__libtoolize} -%{__aclocal} -I m4 +%{__aclocal} %{__autoconf} %{__autoheader} %{__automake} @@ -137,6 +136,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.51.2.2 2005/08/25 11:24:30 charles +- updated to 1.2.1.004 +- new Source0 ("official" snapshots) +- added URL + Revision 1.51.2.1 2005/03/30 23:38:47 sparky - updated to 20050329 snap ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.51.2.1&r2=1.51.2.2&f=u From charles at pld-linux.org Thu Aug 25 13:24:39 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: imlib2-1.2.1.004.tar.gz Message-ID: <26548.1124969079@distfiles.pld-linux.org> Files fetched: 1 STORED: http://enlightenment.freedesktop.org/files/imlib2-1.2.1.004.tar.gz 9130e1b016eb392700c51baaa35c76cd imlib2-1.2.1.004.tar.gz Size: 902236 bytes -- Virtually Yours: distfiles. From trojan at pld-linux.org Thu Aug 25 13:31:29 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: trojan Date: Thu Aug 25 11:31:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: binutils.spec (1.219 -> 1.220) ---- Diffs: ================================================================ Index: SPECS/binutils.spec diff -u SPECS/binutils.spec:1.219 SPECS/binutils.spec:1.220 --- SPECS/binutils.spec:1.219 Thu Jul 21 20:56:00 2005 +++ SPECS/binutils.spec Thu Aug 25 13:31:23 2005 @@ -14,13 +14,13 @@ Summary(tr): GNU geli?tirme ara?lar? Summary(uk): ????? ???????????? GNU ??? ???????? ??????????? ??????? Name: binutils -Version: 2.16.91.0.2 -Release: 2 +Version: 2.16.91.0.3 +Release: 1 Epoch: 2 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6 Patch0: %{name}-gasp.patch @@ -248,6 +248,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.220 2005/08/25 11:31:23 trojan +- updated to 2.16.91.0.3 + Revision 1.219 2005/07/21 18:56:00 arekm - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/binutils.spec?r1=1.219&r2=1.220&f=u From trojan at pld-linux.org Thu Aug 25 13:32:13 2005 From: trojan at pld-linux.org (trojan) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: binutils-2.16.91.0.3.tar.bz2 binutils-non-english-man-pages.tar.bz2 Message-ID: <31455.1124969533@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-2.16.91.0.3.tar.bz2 c737a5787927f60758b4960f10e44f93 binutils-2.16.91.0.3.tar.bz2 Size: 12214719 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/binutils-non-english-man-pages.tar.bz2 a717d9707ec77d82acb6ec9078c472d6 binutils-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From charles at pld-linux.org Thu Aug 25 13:36:47 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: enlightenmentDR17.spec - external vera fonts (req. fonts-TT... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:36:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) ---- Files affected: SPECS: enlightenmentDR17.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/enlightenmentDR17.spec diff -u SPECS/enlightenmentDR17.spec:1.6 SPECS/enlightenmentDR17.spec:1.7 --- SPECS/enlightenmentDR17.spec:1.6 Wed Aug 24 20:45:44 2005 +++ SPECS/enlightenmentDR17.spec Thu Aug 25 13:36:42 2005 @@ -83,6 +83,14 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop +cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts +VERA=$(ls Vera*.ttf) +for FONT in $VERA; do + rm -f $FONT + ln -s %{_fontsdir}/TTF/$FONT . +done +cd - + %find_lang %{name} %clean @@ -120,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:36:42 charles +- external vera fonts (req. fonts-TTF-bitstream-vera inst. by deps.) + Revision 1.6 2005/08/24 18:45:44 charles - updated to 0.16.999.013 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/enlightenmentDR17.spec?r1=1.6&r2=1.7&f=u From paladine at pld-linux.org Thu Aug 25 13:43:13 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: netspeed_applet-0.13.tar.gz Message-ID: <5915.1124970193@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/netspeed_applet-0.13.tar.gz b5c5332993ed779c3653433c6f3b6a9a netspeed_applet-0.13.tar.gz Size: 647081 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Thu Aug 25 13:43:11 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: gnome-applet-netspeed.spec - updated to 0.13 - missing dir ... In-Reply-To: References: Message-ID: Author: paladine Date: Thu Aug 25 11:43:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.13 - missing dir - missing BRs - use more macros ---- Files affected: SPECS: gnome-applet-netspeed.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-applet-netspeed.spec diff -u SPECS/gnome-applet-netspeed.spec:1.6 SPECS/gnome-applet-netspeed.spec:1.7 --- SPECS/gnome-applet-netspeed.spec:1.6 Mon Apr 25 11:09:08 2005 +++ SPECS/gnome-applet-netspeed.spec Thu Aug 25 13:43:06 2005 @@ -3,19 +3,22 @@ Summary: Show how much traffic occurs on a network device Summary(pl): Pokazywanie wielko?ci ruchu wyst?puj?cego na urz?dzeniu sieciowym Name: gnome-applet-netspeed -Version: 0.12.1 -Release: 2 +Version: 0.13 +Release: 1 License: GPL Group: X11/Applications Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/%{_realname}-%{version}.tar.gz -# Source0-md5: 7a651eab80c1a10654595fcfd4832463 +# Source0-md5: b5c5332993ed779c3653433c6f3b6a9a URL: http://mfcn.ilo.de/netspeed_applet/ BuildRequires: automake BuildRequires: gnome-desktop-devel >= 2.4.0 BuildRequires: gnome-panel-devel >= 2.4.0 BuildRequires: intltool >= 0.21 BuildRequires: libglade2-devel >= 2.0.1 -BuildRequires: libgnomeui-devel >= 2.4.0 +BuildRequires: libgnomeui-devel >= 2.8.0 +BuildRequires: libgtop-devel >= 2.10.0 +BuildRequires: rpmbuild(macros) >= 1.197 +BuildRequires: scrollkeeper Requires(post,postun): scrollkeeper BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,9 +59,10 @@ %files -f netspeed-applet.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO -%attr(755,root,root) %{_libdir}/netspeed_applet2 +%attr(755,root,root) %{_libdir}/%{_realname}2 %{_libdir}/bonobo/servers/*.server -%{_datadir}/omf/netspeed_applet/*.omf +%{_omf_dest_dir}/%{_realname} +%{_pixmapsdir}/%{_realname} %{_pixmapsdir}/*.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -67,6 +71,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:43:06 paladine +- updated to 0.13 +- missing dir +- missing BRs +- use more macros + Revision 1.6 2005/04/25 09:09:08 paladine - run %%scrollkeeper_update_post{,un} - removed redundant BR: libgtop-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-applet-netspeed.spec?r1=1.6&r2=1.7&f=u From charles at pld-linux.org Thu Aug 25 13:50:28 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: ecore.spec, edje.spec, eet.spec, embryo.spec, emotion.spec, ... In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: ecore.spec (1.6 -> 1.7) , edje.spec (1.8 -> 1.9) , eet.spec (1.7 -> 1.8) , embryo.spec (1.6 -> 1.7) , emotion.spec (1.6 -> 1.7) , epeg.spec (1.5 -> 1.6) , epsilon.spec (1.5 -> 1.6) , etox.spec (1.5 -> 1.6) , evas.spec (1.8 -> 1.9) , ewl.spec (1.6 -> 1.7) , imlib2.spec (1.52 -> 1.53) ---- Diffs: ================================================================ Index: SPECS/ecore.spec diff -u SPECS/ecore.spec:1.6 SPECS/ecore.spec:1.7 --- SPECS/ecore.spec:1.6 Wed Aug 24 20:27:57 2005 +++ SPECS/ecore.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ef3dcedf00e18c6449e744edf4a50c50 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ecore/ BuildRequires: autoconf BuildRequires: automake BuildRequires: evas-devel @@ -132,6 +132,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:27:57 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/edje.spec diff -u SPECS/edje.spec:1.8 SPECS/edje.spec:1.9 --- SPECS/edje.spec:1.8 Wed Aug 24 20:30:10 2005 +++ SPECS/edje.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 1e5829e8c784770da2ccbd57ef55714c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Edje/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -128,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:30:10 charles - updated to 0.5.0.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/eet.spec diff -u SPECS/eet.spec:1.7 SPECS/eet.spec:1.8 --- SPECS/eet.spec:1.7 Wed Aug 24 20:32:54 2005 +++ SPECS/eet.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 875802e243e37e2eb954d3580cb19678 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Eet/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -118,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 11:50:22 charles +- proper URL + Revision 1.7 2005/08/24 18:32:54 charles - updated md5 ================================================================ Index: SPECS/embryo.spec diff -u SPECS/embryo.spec:1.6 SPECS/embryo.spec:1.7 --- SPECS/embryo.spec:1.6 Wed Aug 24 20:33:50 2005 +++ SPECS/embryo.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: e1140446f243445ad8b987becb975d3d -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Embryo/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -96,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:33:50 charles - updated to 0.9.1.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/emotion.spec diff -u SPECS/emotion.spec:1.6 SPECS/emotion.spec:1.7 --- SPECS/emotion.spec:1.6 Wed Aug 24 20:34:53 2005 +++ SPECS/emotion.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 3be5850cf23afeff8976e45a9861b7c4 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Emotion/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:34:53 charles - updated to 0.0.1.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epeg.spec diff -u SPECS/epeg.spec:1.5 SPECS/epeg.spec:1.6 --- SPECS/epeg.spec:1.5 Wed Aug 24 20:35:56 2005 +++ SPECS/epeg.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ad8505bed8deb7049dfa6322ce908f99 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epeg/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel @@ -94,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:35:56 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/epsilon.spec diff -u SPECS/epsilon.spec:1.5 SPECS/epsilon.spec:1.6 --- SPECS/epsilon.spec:1.5 Wed Aug 24 20:37:42 2005 +++ SPECS/epsilon.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 10118c712b42d00b332c6fe1d9257661 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Epsilon/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:37:42 charles - updated to 0.3.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/etox.spec diff -u SPECS/etox.spec:1.5 SPECS/etox.spec:1.6 --- SPECS/etox.spec:1.5 Wed Aug 24 20:41:32 2005 +++ SPECS/etox.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: ffb6de465dfc9a9b2802b414dd432932 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Etox/ BuildRequires: autoconf BuildRequires: automake BuildRequires: ecore-devel @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/25 11:50:22 charles +- proper URL + Revision 1.5 2005/08/24 18:41:32 charles - updated to 0.9.0.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/evas.spec diff -u SPECS/evas.spec:1.8 SPECS/evas.spec:1.9 --- SPECS/evas.spec:1.8 Wed Aug 24 20:42:34 2005 +++ SPECS/evas.spec Thu Aug 25 13:50:22 2005 @@ -23,7 +23,7 @@ Group: Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 6d888cc6427d783ae517185c1e446e38 -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Evas/ BuildRequires: DirectFB-devel BuildRequires: OpenGL-devel BuildRequires: autoconf @@ -164,6 +164,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/25 11:50:22 charles +- proper URL + Revision 1.8 2005/08/24 18:42:34 charles - updated to 0.9.9.013 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/ewl.spec diff -u SPECS/ewl.spec:1.6 SPECS/ewl.spec:1.7 --- SPECS/ewl.spec:1.6 Wed Aug 24 20:44:33 2005 +++ SPECS/ewl.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: aed8f9eaf06ed5f0120d6f9ce2dc985c -URL: http://enlightenment.org/ +URL: http://enlightenment.org/Libraries/Ewl/ BuildRequires: autoconf BuildRequires: automake BuildRequires: edje-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/25 11:50:22 charles +- proper URL + Revision 1.6 2005/08/24 18:44:33 charles - updated to 0.0.4.004 - new Source0 ("official" snapshots) ================================================================ Index: SPECS/imlib2.spec diff -u SPECS/imlib2.spec:1.52 SPECS/imlib2.spec:1.53 --- SPECS/imlib2.spec:1.52 Thu Jun 16 23:55:02 2005 +++ SPECS/imlib2.spec Thu Aug 25 13:50:22 2005 @@ -8,7 +8,7 @@ Group: X11/Libraries Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: e32970d03d8aee2885782312d0a7f15f -URL: http://enlightenment.org/Libraries/Imlib2.html +URL: http://enlightenment.org/Libraries/Imlib2/ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -136,6 +136,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.53 2005/08/25 11:50:22 charles +- proper URL + Revision 1.52 2005/06/16 21:55:02 charles - updated to 1.2.1 - added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecore.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/edje.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/eet.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/embryo.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/emotion.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/epeg.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/epsilon.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/etox.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/evas.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/ewl.spec?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/SPECS/imlib2.spec?r1=1.52&r2=1.53&f=u From charles at pld-linux.org Thu Aug 25 13:52:02 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:52:02 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21.2.3 -> 1.21.2.4) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21.2.3 SPECS/edb.spec:1.21.2.4 --- SPECS/edb.spec:1.21.2.3 Wed Aug 24 20:19:40 2005 +++ SPECS/edb.spec Thu Aug 25 13:51:57 2005 @@ -9,7 +9,7 @@ Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz # Source0-md5: 2565467041d770240f93969c6055e35f Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -120,6 +120,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21.2.4 2005/08/25 11:51:57 charles +- proper URL + Revision 1.21.2.3 2005/08/24 18:19:40 charles - updated to 1.0.5.004 - new Source0 ("official" snapshots) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21.2.3&r2=1.21.2.4&f=u From charles at pld-linux.org Thu Aug 25 13:56:55 2005 From: charles at pld-linux.org (charles) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: edb.spec - proper URL In-Reply-To: References: Message-ID: Author: charles Date: Thu Aug 25 11:56:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper URL ---- Files affected: SPECS: edb.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/edb.spec diff -u SPECS/edb.spec:1.21 SPECS/edb.spec:1.22 --- SPECS/edb.spec:1.21 Thu Oct 28 11:58:30 2004 +++ SPECS/edb.spec Thu Aug 25 13:56:50 2005 @@ -9,7 +9,7 @@ Source0: http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz # Source0-md5: c8ee165f92dbc6e6fd9c9114e90e338c Patch0: %{name}-ac_fix.patch -URL: http://www.enlightement.org/ +URL: http://enlightenment.org/Libraries/Edb/ BuildRequires: autoconf BuildRequires: automake BuildRequires: glib-devel @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.22 2005/08/25 11:56:50 charles +- proper URL + Revision 1.21 2004/10/28 09:58:30 paladine - "GTK+" unification (hope thats all) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/edb.spec?r1=1.21&r2=1.22&f=u From paszczus at pld-linux.org Thu Aug 25 15:00:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: horde.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:00:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: horde.spec (1.96 -> 1.97) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.96 SPECS/horde.spec:1.97 --- SPECS/horde.spec:1.96 Tue Aug 23 22:23:55 2005 +++ SPECS/horde.spec Thu Aug 25 14:59:58 2005 @@ -15,7 +15,7 @@ Summary(pt_BR): Componentes comuns do Horde usados por todos os m?dulos Name: horde Version: 3.0.5 -Release: 0.1 +Release: 1 License: LGPL Vendor: The Horde Project Group: Applications/WWW @@ -311,6 +311,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.97 2005/08/25 12:59:58 paszczus +- release 1 + Revision 1.96 2005/08/23 20:23:55 glen - merged from DEVEL, updated to 3.0.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.96&r2=1.97&f=u From paszczus at pld-linux.org Thu Aug 25 15:04:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: gollem.spec - release 1 In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 13:04:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - release 1 ---- Files affected: SPECS: gollem.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/gollem.spec diff -u SPECS/gollem.spec:1.10 SPECS/gollem.spec:1.11 --- SPECS/gollem.spec:1.10 Tue Aug 23 22:32:23 2005 +++ SPECS/gollem.spec Thu Aug 25 15:04:41 2005 @@ -5,7 +5,7 @@ Summary(pl): Gollem - zarz?dca plik?w Horde Name: gollem Version: 1.0 -Release: 0.1 +Release: 1 License: GPL Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz @@ -129,6 +129,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/25 13:04:41 paszczus +- release 1 + Revision 1.10 2005/08/23 20:32:23 paszczus - updated to FINAL 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.10&r2=1.11&f=u From adamg at pld-linux.org Thu Aug 25 15:13:51 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES: apache2-byterange.patch (NEW) - forgotten In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:13:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - forgotten ---- Files affected: SOURCES: apache2-byterange.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/apache2-byterange.patch diff -u /dev/null SOURCES/apache2-byterange.patch:1.1 --- /dev/null Thu Aug 25 15:13:51 2005 +++ SOURCES/apache2-byterange.patch Thu Aug 25 15:13:46 2005 @@ -0,0 +1,81 @@ +--- modules/http/http_protocol.c (revision 226972) ++++ modules/http/http_protocol.c (working copy) +@@ -2856,18 +2856,35 @@ + #define MIN_LENGTH(len1, len2) ((len1 > len2) ? len2 : len1) + request_rec *r = f->r; + conn_rec *c = r->connection; +- byterange_ctx *ctx = f->ctx; ++ byterange_ctx *ctx; + apr_bucket *e; + apr_bucket_brigade *bsend; + apr_off_t range_start; + apr_off_t range_end; + char *current; +- apr_off_t bb_length; + apr_off_t clength = 0; + apr_status_t rv; + int found = 0; + +- if (!ctx) { ++ /* Iterate through the brigade until reaching EOS or a bucket with ++ * unknown length. */ ++ for (e = APR_BRIGADE_FIRST(bb); ++ (e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e) ++ && e->length != (apr_size_t)-1); ++ e = APR_BUCKET_NEXT(e)) { ++ clength += e->length; ++ } ++ ++ /* Don't attempt to do byte range work if this brigade doesn't ++ * contain an EOS, or if any of the buckets has an unknown length; ++ * this avoids the cases where it is expensive to perform ++ * byteranging (i.e. may require arbitrary amounts of memory). */ ++ if (!APR_BUCKET_IS_EOS(e) || clength <= 0) { ++ ap_remove_output_filter(f); ++ return ap_pass_brigade(f->next, bb); ++ } ++ ++ { + int num_ranges = ap_set_byterange(r); + + /* We have nothing to do, get out of the way. */ +@@ -2876,7 +2893,7 @@ + return ap_pass_brigade(f->next, bb); + } + +- ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx)); ++ ctx = apr_pcalloc(r->pool, sizeof(*ctx)); + ctx->num_ranges = num_ranges; + /* create a brigade in case we never call ap_save_brigade() */ + ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc); +@@ -2903,29 +2920,6 @@ + } + } + +- /* We can't actually deal with byte-ranges until we have the whole brigade +- * because the byte-ranges can be in any order, and according to the RFC, +- * we SHOULD return the data in the same order it was requested. +- * +- * XXX: We really need to dump all bytes prior to the start of the earliest +- * range, and only slurp up to the end of the latest range. By this we +- * mean that we should peek-ahead at the lowest first byte of any range, +- * and the highest last byte of any range. +- */ +- if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { +- ap_save_brigade(f, &ctx->bb, &bb, r->pool); +- return APR_SUCCESS; +- } +- +- /* Prepend any earlier saved brigades. */ +- APR_BRIGADE_PREPEND(bb, ctx->bb); +- +- /* It is possible that we won't have a content length yet, so we have to +- * compute the length before we can actually do the byterange work. +- */ +- apr_brigade_length(bb, 1, &bb_length); +- clength = (apr_off_t)bb_length; +- + /* this brigade holds what we will be sending */ + bsend = apr_brigade_create(r->pool, c->bucket_alloc); + + ================================================================ From baggins at pld-linux.org Thu Aug 25 15:32:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES: linux-2.6-atm-vbr.patch (NEW) - ported to 2.6 from ftp://... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:32:17 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported to 2.6 from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs ---- Files affected: SOURCES: linux-2.6-atm-vbr.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atm-vbr.patch diff -u /dev/null SOURCES/linux-2.6-atm-vbr.patch:1.1 --- /dev/null Thu Aug 25 15:32:17 2005 +++ SOURCES/linux-2.6-atm-vbr.patch Thu Aug 25 15:32:12 2005 @@ -0,0 +1,162 @@ +Index: linux/include/linux/atm.h +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/include/linux/atm.h,v +retrieving revision 1.2 +diff -u -r1.2 atm.h +--- linux/include/linux/atm.h 12 Feb 2003 20:56:33 -0000 1.2 ++++ linux/include/linux/atm.h 9 Apr 2003 12:08:38 -0000 +@@ -72,7 +72,7 @@ + /* connection identifier range; socket must be + bound or connected */ + #define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos) +- /* Quality of Service setting */ ++ /* Quality of Service setting (with vbr support) */ + #define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap) + /* Service Access Point */ + #define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc) +@@ -127,9 +127,11 @@ + #define ATM_NONE 0 /* no traffic */ + #define ATM_UBR 1 + #define ATM_CBR 2 +-#define ATM_VBR 3 ++#define ATM_VBR_NRT 3 ++#define ATM_VBR ATM_VBR_NRT /* for backward compatibility */ + #define ATM_ABR 4 + #define ATM_ANYCLASS 5 /* compatible with everything */ ++#define ATM_VBR_RT 6 + + #define ATM_MAX_PCR -1 /* maximum available PCR */ + +@@ -140,6 +142,11 @@ + int min_pcr; /* minimum PCR in cells per second */ + int max_cdv; /* maximum CDV in microseconds */ + int max_sdu; /* maximum SDU in bytes */ ++ ++ /* extra params for VBR */ ++ int scr; /* sustained rate in cells per second */ ++ int mbs; /* maximum burst size (MBS) in cells */ ++ + /* extra params for ABR */ + unsigned int icr; /* Initial Cell Rate (24-bit) */ + unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ +@@ -243,4 +251,37 @@ + }; + + typedef unsigned short atm_backend_t; ++struct atm_trafprm_compat { ++ unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */ ++ int max_pcr; /* maximum PCR in cells per second */ ++ int pcr; /* desired PCR in cells per second */ ++ int min_pcr; /* minimum PCR in cells per second */ ++ int max_cdv; /* maximum CDV in microseconds */ ++ int max_sdu; /* maximum SDU in bytes */ ++ /* extra params for ABR */ ++ unsigned int icr; /* Initial Cell Rate (24-bit) */ ++ unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ ++ unsigned int frtt : 24; /* Fixed Round Trip Time (24-bit) */ ++ unsigned int rif : 4; /* Rate Increment Factor (4-bit) */ ++ unsigned int rdf : 4; /* Rate Decrease Factor (4-bit) */ ++ unsigned int nrm_pres :1; /* nrm present bit */ ++ unsigned int trm_pres :1; /* rm present bit */ ++ unsigned int adtf_pres :1; /* adtf present bit */ ++ unsigned int cdf_pres :1; /* cdf present bit*/ ++ unsigned int nrm :3; /* Max # of Cells for each forward RM cell (3-bit) */ ++ unsigned int trm :3; /* Time between forward RM cells (3-bit) */ ++ unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */ ++ unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */ ++ unsigned int spare :9; /* spare bits */ ++}; ++ ++struct atm_qos_compat { ++ struct atm_trafprm_compat txtp; /* parameters in TX direction */ ++ struct atm_trafprm_compat rxtp __ATM_API_ALIGN; ++ /* parameters in RX direction */ ++ unsigned char aal __ATM_API_ALIGN; ++}; ++ ++#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat) ++ /* Quality of Service setting (no vbr support) */ + #endif +Index: linux/net/atm/common.c +=================================================================== +RCS file: /afs/cmf/project/cvsroot/linux/net/atm/common.c,v +retrieving revision 1.13 +diff -u -r1.13 common.c +--- linux/net/atm/common.c 17 Mar 2003 16:13:12 -0000 1.13 ++++ linux/net/atm/common.c 9 Apr 2003 12:10:28 -0000 +@@ -1085,6 +1085,43 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ struct atm_qos qos; ++ ++ if (copy_from_user(&qos_compat,optval,sizeof(qos_compat))) ++ return -EFAULT; ++ ++ /* convert old atm_qos to new atm_qos */ ++ qos.aal = qos_compat.aal; ++ qos.rxtp.traffic_class = qos_compat.rxtp.traffic_class; ++ qos.rxtp.max_pcr = qos_compat.rxtp.max_pcr; ++ qos.rxtp.pcr = qos_compat.rxtp.pcr; ++ qos.rxtp.min_pcr = qos_compat.rxtp.min_pcr; ++ qos.rxtp.max_cdv = qos_compat.rxtp.max_cdv; ++ qos.rxtp.max_sdu = qos_compat.rxtp.max_sdu; ++ qos.rxtp.scr = 0; ++ qos.rxtp.mbs = 0; ++ qos.txtp.traffic_class = qos_compat.txtp.traffic_class; ++ qos.txtp.max_pcr = qos_compat.txtp.max_pcr; ++ qos.txtp.pcr = qos_compat.txtp.pcr; ++ qos.txtp.min_pcr = qos_compat.txtp.min_pcr; ++ qos.txtp.max_cdv = qos_compat.txtp.max_cdv; ++ qos.txtp.max_sdu = qos_compat.txtp.max_sdu; ++ qos.txtp.scr = 0; ++ qos.txtp.mbs = 0; ++ ++ error = check_qos(&qos); ++ if (error) return error; ++ if (sock->state == SS_CONNECTED) ++ return atm_change_qos(vcc,&qos); ++ if (sock->state != SS_UNCONNECTED) ++ return -EBADFD; ++ vcc->qos = qos; ++ set_bit(ATM_VF_HASQOS,&vcc->flags); ++ return 0; ++ } + case SO_ATMQOS: + { + struct atm_qos qos; +@@ -1132,6 +1169,31 @@ + + vcc = ATM_SD(sock); + switch (optname) { ++ case SO_ATMQOS_COMPAT: ++ { ++ struct atm_qos_compat qos_compat; ++ ++ if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) ++ return -EINVAL; ++ ++ /* convert new atm_qos to old atm_qos */ ++ qos_compat.aal = vcc->qos.aal; ++ qos_compat.rxtp.traffic_class = vcc->qos.rxtp.traffic_class; ++ qos_compat.rxtp.max_pcr = vcc->qos.rxtp.max_pcr; ++ qos_compat.rxtp.pcr = vcc->qos.rxtp.pcr; ++ qos_compat.rxtp.min_pcr = vcc->qos.rxtp.min_pcr; ++ qos_compat.rxtp.max_cdv = vcc->qos.rxtp.max_cdv; ++ qos_compat.rxtp.max_sdu = vcc->qos.rxtp.max_sdu; ++ qos_compat.txtp.traffic_class = vcc->qos.txtp.traffic_class; ++ qos_compat.txtp.max_pcr = vcc->qos.txtp.max_pcr; ++ qos_compat.txtp.pcr = vcc->qos.txtp.pcr; ++ qos_compat.txtp.min_pcr = vcc->qos.txtp.min_pcr; ++ qos_compat.txtp.max_cdv = vcc->qos.txtp.max_cdv; ++ qos_compat.txtp.max_sdu = vcc->qos.txtp.max_sdu; ++ ++ return copy_to_user(optval,&qos_compat,sizeof(qos_compat)) ? ++ -EFAULT : 0; ++ } + case SO_ATMQOS: + if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) + return -EINVAL; ================================================================ From havner at pld-linux.org Thu Aug 25 15:33:32 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:36 2005 Subject: fortunes-pl: pld - madrosci gaususa (ale to mu sie calkiem udalo m... In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:33:32 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - madrosci gaususa (ale to mu sie calkiem udalo musze przyznac) ---- Files affected: fortunes-pl: pld (1.425 -> 1.426) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.425 fortunes-pl/pld:1.426 --- fortunes-pl/pld:1.425 Wed Jul 13 22:44:38 2005 +++ fortunes-pl/pld Thu Aug 25 15:33:27 2005 @@ -3559,3 +3559,6 @@ Mariusz Mazur @ pld-devel-pl % +[15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] +[15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.425&r2=1.426&f=u From baggins at pld-linux.org Thu Aug 25 15:34:11 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM VBR is baaaaack! In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:34:11 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM VBR is baaaaack! ---- Files affected: SPECS: kernel.spec (1.441.2.1161 -> 1.441.2.1162) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1161 SPECS/kernel.spec:1.441.2.1162 --- SPECS/kernel.spec:1.441.2.1161 Tue Aug 23 15:06:36 2005 +++ SPECS/kernel.spec Thu Aug 25 15:34:05 2005 @@ -253,6 +253,8 @@ Patch112: linux-2.6-via82c586-irq-routing.patch Patch113: linux-2.6-3Com_IBM-fix.patch Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch +# Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs +Patch115: linux-2.6-atm-vbr.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -688,6 +690,7 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 +%patch115 -p1 %ifarch %{ix86} %if %{with abi} @@ -1481,6 +1484,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1162 2005/08/25 13:34:05 baggins +- ATM VBR is baaaaack! + Revision 1.441.2.1161 2005/08/23 13:06:36 baggins - added bind mount extensions for vservers - added fixes for vserver 2.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1161&r2=1.441.2.1162&f=u From adamg at pld-linux.org Thu Aug 25 15:37:57 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: File_Find-1.0.0.tgz Message-ID: <26311.1124977077@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/File_Find-1.0.0.tgz fa77a8b791c5a56c08336e8e2debad34 File_Find-1.0.0.tgz Size: 4871 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Thu Aug 25 15:37:58 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: php-pear-File_Find.spec - updated to 1.0.0 In-Reply-To: References: Message-ID: Author: adamg Date: Thu Aug 25 13:37:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.0 ---- Files affected: SPECS: php-pear-File_Find.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-File_Find.spec diff -u SPECS/php-pear-File_Find.spec:1.18 SPECS/php-pear-File_Find.spec:1.19 --- SPECS/php-pear-File_Find.spec:1.18 Fri Jan 14 08:30:22 2005 +++ SPECS/php-pear-File_Find.spec Thu Aug 25 15:37:53 2005 @@ -2,18 +2,18 @@ %include /usr/lib/rpm/macros.php %define _class File %define _subclass Find -%define _status beta +%define _status stable %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - a class that facillitates the search of filesystems Summary(pl): %{_pearname} - klasa z narz?dziami do przeszukiwania systemu plik?w Name: php-pear-%{_pearname} -Version: 0.3.1 +Version: 1.0.0 Release: 1 License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: a81c83a7ce53f4fb9bec8a0019fde0e8 +# Source0-md5: fa77a8b791c5a56c08336e8e2debad34 URL: http://pear.php.net/package/File_Find/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/25 13:37:53 adamg +- updated to 1.0.0 + Revision 1.18 2005/01/14 07:30:22 adamg - updated to 0.3.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-File_Find.spec?r1=1.18&r2=1.19&f=u From baggins at pld-linux.org Thu Aug 25 15:39:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (LINUX_2_6): kernel.spec - TODO updated In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 13:39:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - TODO updated ---- Files affected: SPECS: kernel.spec (1.441.2.1162 -> 1.441.2.1163) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1162 SPECS/kernel.spec:1.441.2.1163 --- SPECS/kernel.spec:1.441.2.1162 Thu Aug 25 15:34:05 2005 +++ SPECS/kernel.spec Thu Aug 25 15:39:05 2005 @@ -3,6 +3,9 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs +# - check and maybe port ATM patches from 2.4 +# linux-2.4.22-fore200e-0.2f.patch +# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1484,6 +1487,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1163 2005/08/25 13:39:05 baggins +- TODO updated + Revision 1.441.2.1162 2005/08/25 13:34:05 baggins - ATM VBR is baaaaack! ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1162&r2=1.441.2.1163&f=u From arekm at pld-linux.org Thu Aug 25 15:51:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES (DEVEL): php-gd_imagerotate_enable.patch, php-nohttpd.patc... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 13:51:06 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for 5.1rc1 (we loose one parameter to imagereotate unfortunately) ---- Files affected: SOURCES: php-gd_imagerotate_enable.patch (1.2 -> 1.2.2.1) , php-nohttpd.patch (1.1 -> 1.1.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-gd_imagerotate_enable.patch diff -u SOURCES/php-gd_imagerotate_enable.patch:1.2 SOURCES/php-gd_imagerotate_enable.patch:1.2.2.1 --- SOURCES/php-gd_imagerotate_enable.patch:1.2 Mon Oct 18 14:25:34 2004 +++ SOURCES/php-gd_imagerotate_enable.patch Thu Aug 25 15:51:00 2005 @@ -1,5 +1,6 @@ ---- ./ext/gd/gd.c.org 2004-08-17 01:08:56.000000000 +0200 -+++ ./ext/gd/gd.c 2004-10-18 14:24:15.797275104 +0200 +diff -urbB php-5.1.0RC1.org/ext/gd/gd.c php-5.1.0RC1/ext/gd/gd.c +--- php-5.1.0RC1.org/ext/gd/gd.c 2005-08-25 15:26:22.317049000 +0200 ++++ php-5.1.0RC1/ext/gd/gd.c 2005-08-25 15:27:37.644598376 +0200 @@ -209,8 +209,8 @@ PHP_FE(imagecopyresampled, NULL) #endif @@ -10,7 +11,7 @@ PHP_FE(imageantialias, NULL) #endif -@@ -416,11 +416,11 @@ +@@ -429,11 +429,11 @@ #ifdef GD2_FMT_COMPRESSED REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); #endif @@ -23,7 +24,7 @@ REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); /* Section Filters */ REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); -@@ -1191,7 +1191,6 @@ +@@ -1204,7 +1204,6 @@ /* }}} */ #endif @@ -31,7 +32,16 @@ /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor) Rotate an image using a custom angle */ PHP_FUNCTION(imagerotate) -@@ -1221,7 +1220,6 @@ +@@ -1221,7 +1220,7 @@ + + ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd); + +- im_dst = gdImageRotate(im_src, degrees, color, ignoretransparent); ++ im_dst = gdImageRotate(im_src, degrees, color); + + if (im_dst != NULL) { + ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd); +@@ -1230,7 +1229,6 @@ } } /* }}} */ @@ -39,8 +49,10 @@ #if HAVE_GD_IMAGESETTILE /* {{{ proto bool imagesettile(resource image, resource tile) ---- ./ext/gd/php_gd.h.org 2004-01-08 18:32:08.000000000 +0100 -+++ ./ext/gd/php_gd.h 2004-10-18 14:24:34.372451248 +0200 +Tylko w php-5.1.0RC1/ext/gd: gd.c.orig +diff -urbB php-5.1.0RC1.org/ext/gd/php_gd.h php-5.1.0RC1/ext/gd/php_gd.h +--- php-5.1.0RC1.org/ext/gd/php_gd.h 2005-08-25 15:26:22.366042000 +0200 ++++ php-5.1.0RC1/ext/gd/php_gd.h 2005-08-25 15:27:37.645598224 +0200 @@ -103,8 +103,8 @@ PHP_FUNCTION(imagecopyresampled); #endif ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1 SOURCES/php-nohttpd.patch:1.1.4.1 --- SOURCES/php-nohttpd.patch:1.1 Fri Jul 30 07:54:01 2004 +++ SOURCES/php-nohttpd.patch Thu Aug 25 15:51:01 2005 @@ -1,14 +1,15 @@ ---- php-4.3.8/sapi/apache2handler/config.m4.orig 2003-07-16 07:46:46.000000000 +0200 -+++ php-4.3.8/sapi/apache2handler/config.m4 2004-07-30 00:45:48.301382112 +0200 -@@ -52,9 +52,9 @@ +diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4 +--- php-5.1.0RC1.org/sapi/apache2handler/config.m4 2005-08-05 10:14:54.000000000 +0200 ++++ php-5.1.0RC1/sapi/apache2handler/config.m4 2005-08-25 15:09:38.486655320 +0200 +@@ -58,9 +58,9 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required.]) ++ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then + AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-gd_imagerotate_enable.patch?r1=1.2&r2=1.2.2.1&f=u http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1&r2=1.1.4.1&f=u From havner at pld-linux.org Thu Aug 25 15:51:55 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:36 2005 Subject: fortunes-pl: pld - no i madrosci ciag dalszy :-) In-Reply-To: References: Message-ID: Author: havner Date: Thu Aug 25 13:51:55 2005 GMT Module: fortunes-pl Tag: HEAD ---- Log message: - no i madrosci ciag dalszy :-) ---- Files affected: fortunes-pl: pld (1.426 -> 1.427) ---- Diffs: ================================================================ Index: fortunes-pl/pld diff -u fortunes-pl/pld:1.426 fortunes-pl/pld:1.427 --- fortunes-pl/pld:1.426 Thu Aug 25 15:33:27 2005 +++ fortunes-pl/pld Thu Aug 25 15:51:50 2005 @@ -3562,3 +3562,9 @@ [15:31:02] < gausus> baggins: bo pld to jest wyzwanie intelektualne a nie distro ;) [IN] [15:31:18] < gausus> ostatnio kogos tu zbanowali za to ze marudzil ze cos w kernelu sie sypie :) [IN] % +[15:36:37] < gausus> havner: a autoryzacje dostales :) [IN] +[15:36:48] < gausus> potem bedzie potop i potomni dostana tylko moje przemyslenia i co [IN] +[15:36:53] < gausus> beda nas mieli za cywilizacje kretynow ? [IN] +[15:37:01] < gausus> chociaz w sumie [IN] +[15:37:11] < gausus> moze to i lepiej niz jakby mialo po nas cos wiecej pozostac ;) [IN] +% ================================================================ ---- CVS-web: http://cvs.pld-linux.org/fortunes-pl/pld?r1=1.426&r2=1.427&f=u From arekm at pld-linux.org Thu Aug 25 16:09:50 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): php.spec - started 5.1 (cpdf, dbx, dio, fam, mnogos... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 14:09:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ---- Files affected: SPECS: php.spec (1.467 -> 1.467.2.1) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467 SPECS/php.spec:1.467.2.1 --- SPECS/php.spec:1.467 Tue Aug 23 12:31:11 2005 +++ SPECS/php.spec Thu Aug 25 16:09:44 2005 @@ -5,7 +5,6 @@ # - mcve, # - ovrimos, # - pfpro, -# - ircg, # These extensions BuildRequires proprietary libraries... # - deal with modules removed from php and not moved to PECL # (existing only in php4): @@ -24,16 +23,13 @@ %bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) %bcond_with oracle # with oracle extension module (BR: proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) -%bcond_without cpdf # without cpdf extension module %bcond_without curl # without CURL extension module -%bcond_without fam # without FAM (File Alteration Monitor) extension module %bcond_without imap # without IMAP extension module %bcond_with interbase # with InterBase extension module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension module %bcond_without ming # without ming extension module %bcond_without mm # without mm support for session storage -%bcond_without mnogosearch # without mnogosearch extension module %bcond_without msession # without msession extension module %bcond_without mssql # without MS SQL extension module %bcond_without odbc # without ODBC extension module @@ -77,13 +73,14 @@ Summary(ru): PHP ?????? 5 - ???? ?????????????????? HTML-??????, ??????????? ?? ??????? Summary(uk): PHP ?????? 5 - ???? ??????????????? HTML-??????, ?????????? ?? ??????? Name: php -Version: 5.0.4 -Release: 10%{?with_hardening:hardened} +Version: 5.1.0 +%define _rc RC1 +Release: 0.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP -Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 -# Source0-md5: fb1aac107870f897d26563a9cc5053c0 +Source0: http://www.php.net/distributions/%{name}-%{version}%{_rc}.tar.bz2 +# Source0-md5: c7aebeb915e6f898559365cf82493ad0 Source1: FAQ.%{name} Source2: zend.gif Source3: %{name}-module-install @@ -114,7 +111,6 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch -Patch20: %{name}-mnogosearch-fix.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -122,7 +118,6 @@ Patch25: %{name}-hwapi-link.patch Patch26: %{name}-dba-link.patch Patch27: %{name}-install_gd_headers.patch -Patch28: %{name}-cpdf-fix.patch Patch29: %{name}-gcc4.patch Patch30: %{name}-hardening-fix.patch Patch31: %{name}-both-apxs.patch @@ -142,7 +137,6 @@ %if %{with xmlrpc} BuildRequires: expat-devel %endif -%{?with_fam:BuildRequires: fam-devel} %{?with_fdf:BuildRequires: fdftk-devel} BuildRequires: fcgi-devel BuildRequires: flex @@ -154,7 +148,6 @@ BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2} -%{?with_cpdf:BuildRequires: libcpdf-devel >= 2.02r1-2} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 @@ -166,7 +159,6 @@ %{?with_mhash:BuildRequires: mhash-devel} %{?with_ming:BuildRequires: ming-devel >= 0.1.0} %{?with_mm:BuildRequires: mm-devel >= 1.3.0} -%{?with_mnogosearch:BuildRequires: mnogosearch-devel >= 3.2.6} BuildRequires: mysql-devel >= 4.0.0 %{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0} BuildRequires: ncurses-ext-devel @@ -195,7 +187,7 @@ BuildRequires: apache1-devel %endif %if %{with apache2} -BuildRequires: apache-devel >= 2.0.52-2 +BuildRequires: apache-devel >= 2.0.44-1 BuildRequires: apr-devel >= 1:1.0.0 BuildRequires: apr-util-devel >= 1:1.0.0 %endif @@ -465,20 +457,6 @@ %description calendar -l pl Modu? PHP dodaj?cy wsparcie dla kalendarza. -%package cpdf -Summary: cpdf extension module for PHP -Summary(pl): Modu? cpdf dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description cpdf -This is a dynamic shared object (DSO) for PHP that will add PDF -support through libcpdf library. - -%description cpdf -l pl -Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. - %package ctype Summary: ctype extension module for PHP Summary(pl): Modu? ctype dla PHP @@ -536,36 +514,6 @@ %description dbase -l pl Modu? PHP ze wsparciem dla DBase. -%package dbx -Summary: DBX extension module for PHP -Summary(pl): Modu? DBX dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dbx -This is a dynamic shared object (DSO) for PHP that will add DB -abstraction layer. DBX supports odbc, mysql, pgsql, mssql, fbsql and -more. - -%description dbx -l pl -Modu? PHP dodaj?cy warstw? abstrakcji do obs?ugi baz danych. DBX -obs?uguje bazy odbc, mysql, pgsql, mssql, fbsql i inne. - -%package dio -Summary: Direct I/O extension module for PHP -Summary(pl): Modu? Direct I/O dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description dio -This is a dynamic shared object (DSO) for PHP that will add direct -file I/O support. - -%description dio -l pl -Modu? PHP dodaj?cy obs?ug? bezpo?rednich operacji I/O na plikach. - %package dom Summary: DOM extension module for PHP Summary(pl): Modu? DOM dla PHP @@ -597,23 +545,6 @@ %description exif -l pl Modu? PHP dodaj?cy obs?ug? znacznik?w EXIF w plikach obrazk?w. -%package fam -Summary: FAM (File Alteration Monitor) module for PHP -Summary(pl): Modu? FAM (File Alteration Monitor) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description fam -This PHP module adds support for FAM (File Alteration Monitor). -FAM monitors files and directories, notifying interested applications -of changes. - -%description fam -l pl -Modu? PHP dodaj?cy obs?ug? dla FAM (File Alteration Monitor). -FAM monitoruje pliki oraz katalogi, informuj?c zainteresowane aplikacje -o zmianach. - %package fdf Summary: FDF extension module for PHP Summary(pl): Modu? FDF dla PHP @@ -856,21 +787,6 @@ Modu? PHP dodaj?cy obs?ug? plik?w Flash (.swf) poprzez bibliotek? ming. -%package mnogosearch -Summary: mnoGoSearch extension module for PHP -Summary(pl): Modu? mnoGoSearch dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description mnogosearch -This is a dynamic shared object (DSO) for PHP that will allow you to -access mnoGoSearch free search engine. - -%description mnogosearch -l pl -Modu? PHP dodaj?cy pozwalaj?cy na dost?p do wolnodost?pnego silnika -wyszukiwarki mnoGoSearch. - %package msession Summary: msession extension module for PHP Summary(pl): Modu? msession dla PHP @@ -1401,20 +1317,6 @@ %description xsl -l pl Modu? PHP dodaj?cy now? obs?ug? XSLT (przy u?yciu libxslt). -%package yp -Summary: NIS (yp) extension module for PHP -Summary(pl): Modu? NIS (yp) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} - -%description yp -This is a dynamic shared object (DSO) for PHP that will add NIS -(Yellow Pages) support. - -%description yp -l pl -Modu? PHP dodaj?cy wsparcie dla NIS (Yellow Pages). - %package zlib Summary: Zlib extension module for PHP Summary(pl): Modu? zlib dla PHP @@ -1430,7 +1332,7 @@ Modu? PHP umo?liwiaj?cy u?ywanie kompresji zlib. %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} # this patch is broken by design, breaks --enable-versioning for example %patch0 -p1 %patch1 -p1 @@ -1441,23 +1343,24 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +# FIXME; it's still needed? +# %patch9 -p1 cp php.ini-dist php.ini %patch10 -p1 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked # conditionally... %patch11 -p1 -%patch12 -p1 -%patch13 -p1 +# DROPME: not needed +# %patch12 -p1 +# DROPME: seems not needed +# %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 -%patch28 -p1 %if "%{_lib}" == "lib64" %patch22 -p1 %endif @@ -1465,8 +1368,9 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -%patch27 -p1 -%patch29 -p1 +# FIXME: ??? +# %patch27 -p1 +# %patch29 -p1 %if %{with hardening} zcat %{SOURCE9} | patch -p1 @@ -1546,8 +1450,6 @@ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ - --enable-dbx=shared \ - --enable-dio=shared \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1573,9 +1475,8 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --enable-yp=shared \ + --with-xmlreader \ --with-bz2=shared \ - %{?with_cpdf:--with-cpdflib=shared} \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ --with-dbase=shared \ @@ -1586,7 +1487,6 @@ %endif %{?with_fdf:--with-fdftk=shared} \ --with-iconv=shared \ - %{?with_fam:--with-fam=shared} \ --with-filepro=shared \ --with-freetype-dir=shared \ --with-gettext=shared \ @@ -1597,13 +1497,12 @@ %{?with_imap:--with-imap=shared --with-imap-ssl} \ %{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \ --with-jpeg-dir=/usr \ - %{?with_ldap:--with-ldap=shared} \ + %{?with_ldap:--with-ldap=shared --with-ldap-sasl} \ --with-mcrypt=shared \ %{?with_mhash:--with-mhash=shared} \ --with-mime-magic=shared,/usr/share/file/magic.mime \ %{?with_ming:--with-ming=shared} \ %{?with_mm:--with-mm} \ - %{!?with_mnogosearch:--without-mnogosearch}%{?with_mnogosearch:--with-mnogosearch=shared,/usr} \ %{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \ %{?with_mssql:--with-mssql=shared} \ --with-mysql=shared,/usr \ @@ -1612,6 +1511,7 @@ --with-ncurses=shared \ %{?with_oci8:--with-oci8=shared} \ %{?with_openssl:--with-openssl=shared} \ + --with-kerberos \ %{?with_oracle:--with-oracle=shared} \ %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared} \ --with-pear=%{php_pear_dir} \ @@ -1625,11 +1525,11 @@ %{?with_snmp:--with-snmp=shared} \ %{?with_sybase:--with-sybase=shared,/usr} \ %{?with_sybase_ct:--with-sybase-ct=shared,/usr} \ - %{?with_sqlite:--with-sqlite=shared,/usr} \ + %{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \ --with-t1lib=shared \ %{?with_tidy:--with-tidy=shared} \ --with-tiff-dir=/usr \ - %{?with_odbc:--with-unixODBC=shared} \ + %{?with_odbc:--with-unixODBC=shared,/usr} \ %{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \ --with-xsl=shared \ --with-zlib=shared \ @@ -1879,12 +1779,6 @@ %postun calendar %extension_postun -%post cpdf -%extension_post - -%postun cpdf -%extension_postun - %post ctype %extension_post @@ -1909,18 +1803,6 @@ %postun dbase %extension_postun -%post dbx -%extension_post - -%postun dbx -%extension_postun - -%post dio -%extension_post - -%postun dio -%extension_postun - %post dom %extension_post @@ -1933,12 +1815,6 @@ %postun exif %extension_postun -%post fam -%extension_post - -%postun fam -%extension_postun - %post fdf %extension_post @@ -2035,12 +1911,6 @@ %postun ming %extension_postun -%post mnogosearch -%extension_post - -%postun mnogosearch -%extension_postun - %post msession %extension_post @@ -2272,12 +2142,6 @@ %postun xsl %extension_postun -%post yp -%extension_post - -%postun yp -%extension_postun - %post zlib %extension_post @@ -2293,9 +2157,6 @@ %triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini -%triggerun cpdf -- %{name}-cpdf < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove cpdf %{_sysconfdir}/php.ini - %triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini @@ -2308,21 +2169,12 @@ %triggerun dbase -- %{name}-dbase < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini -%triggerun dbx -- %{name}-dbx < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dbx %{_sysconfdir}/php.ini - -%triggerun dio -- %{name}-dio < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dio %{_sysconfdir}/php.ini - %triggerun dom -- %{name}-dom < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove dom %{_sysconfdir}/php.ini %triggerun exif -- %{name}-exif < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini -%triggerun fam -- %{name}-fam < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fam %{_sysconfdir}/php.ini - %triggerun fdf -- %{name}-fdf < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove fdf %{_sysconfdir}/php.ini @@ -2371,9 +2223,6 @@ %triggerun ming -- %{name}-ming < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini -%triggerun mnogosearch -- %{name}-mnogosearch < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove mnogosearch %{_sysconfdir}/php.ini - %triggerun msession -- %{name}-msession < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini @@ -2461,9 +2310,6 @@ %triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove xsl %{_sysconfdir}/php.ini -%triggerun yp -- %{name}-yp < 4:5.0.4-9.1 -[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove yp %{_sysconfdir}/php.ini - %triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1 [ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini @@ -2544,13 +2390,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so -%if %{with cpdf} -%files cpdf -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/cpdf.ini -%attr(755,root,root) %{extensionsdir}/cpdf.so -%endif - %files ctype %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini @@ -2573,28 +2412,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so -%files dbx -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbx.ini -%attr(755,root,root) %{extensionsdir}/dbx.so - -%files dio -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dio.ini -%attr(755,root,root) %{extensionsdir}/dio.so - %files dom %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so -%if %{with fam} -%files fam -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fam.ini -%attr(755,root,root) %{extensionsdir}/fam.so -%endif - %if %{with fdf} %files fdf %defattr(644,root,root,755) @@ -2694,13 +2516,6 @@ %attr(755,root,root) %{extensionsdir}/ming.so %endif -%if %{with mnogosearch} -%files mnogosearch -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mnogosearch.ini -%attr(755,root,root) %{extensionsdir}/mnogosearch.so -%endif - %if %{with msession} %files msession %defattr(644,root,root,755) @@ -2894,11 +2709,6 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xsl.ini %attr(755,root,root) %{extensionsdir}/xsl.so -%files yp -%defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/yp.ini -%attr(755,root,root) %{extensionsdir}/yp.so - %files zlib %defattr(644,root,root,755) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/zlib.ini @@ -2910,6 +2720,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.1 2005/08/25 14:09:44 arekm +- started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy + Revision 1.467 2005/08/23 10:31:11 glen - rel 10 for finished conf.d support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467&r2=1.467.2.1&f=u From arekm at pld-linux.org Thu Aug 25 16:10:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: php-5.1.0RC1.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz Message-ID: <15469.1124979007@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.php.net/distributions/php-5.1.0RC1.tar.bz2 c7aebeb915e6f898559365cf82493ad0 php-5.1.0RC1.tar.bz2 Size: 5989455 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- Virtually Yours: distfiles. From andree at pld-linux.org Thu Aug 25 16:58:32 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: VMware-workstation.spec - added bcond to build kernel24 mod... In-Reply-To: References: Message-ID: Author: andree Date: Thu Aug 25 14:58:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added bcond to build kernel24 modules ---- Files affected: SPECS: VMware-workstation.spec (1.66 -> 1.67) ---- Diffs: ================================================================ Index: SPECS/VMware-workstation.spec diff -u SPECS/VMware-workstation.spec:1.66 SPECS/VMware-workstation.spec:1.67 --- SPECS/VMware-workstation.spec:1.66 Sat Aug 20 02:06:15 2005 +++ SPECS/VMware-workstation.spec Thu Aug 25 16:58:27 2005 @@ -9,10 +9,14 @@ %bcond_without kernel # don't build kernel modules %bcond_without smp # without SMP kernel modules %bcond_without userspace # don't build userspace utilities +%bcond_with kernel24 # build kernel24 modules (disable kernel26) %bcond_with internal_libs # internal libs stuff %bcond_with verbose # verbose build (V=1) # %include /usr/lib/rpm/macros.perl +%if %{with kernel24} +%define _kernelsrcdir /usr/src/linux-2.4 +%endif # %define _ver 5.0.0 %define _build 13124 @@ -192,6 +196,82 @@ %description -n kernel-smp-misc-vmnet -l pl Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. +%package -n kernel24-misc-vmmon +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-misc-vmmon +Kernel modules for VMware Workstation - vmmon. + +%description -n kernel24-misc-vmmon -l pl +Modu?y j?dra dla VMware Workstation - vmmon. + +%package -n kernel24-misc-vmnet +Summary: Kernel module for VMware Workstation +Summary(pl): Modu? j?dra dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-misc-vmnet +Kernel modules for VMware Workstation - vmnet. + +%description -n kernel24-misc-vmnet -l pl +Modu?y j?dra dla VMware Workstation - vmnet. + +%package -n kernel24-smp-misc-vmmon +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmmon) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmmon +SMP kernel modules fov VMware Workstation - vmmon-smp. + +%description -n kernel24-smp-misc-vmmon -l pl +Modu?y j?dra SMP dla VMware Workstation - vmmon-smp. + +%package -n kernel24-smp-misc-vmnet +Summary: SMP kernel module for VMware Workstation +Summary(pl): Modu? j?dra SMP dla VMware Workstation +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif +Provides: kernel(vmnet) = %{version}-%{_rel} + +%description -n kernel24-smp-misc-vmnet +SMP kernel module for VMware Workstation - vmnet-smp. + +%description -n kernel24-smp-misc-vmnet -l pl +Modu?y j?dra SMP dla VMware Workstation - vmnet-smp. + %prep %setup -q -n vmware-distrib %setup -qDT -n vmware-distrib -a1 @@ -220,6 +300,8 @@ %if %{with kernel} rm -rf built mkdir built + +%if %{without kernel24} cp -a vmmon-only vmmon-only.clean cp -a vmnet-only vmnet-only.clean for mod in vmmon vmnet ; do @@ -244,7 +326,42 @@ cd - done done -cd .. + +%else +for mod in vmmon vmnet ; do + rm -rf $mod-only + tar xf $mod.tar + cd $mod-only + sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile + sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile + +%if %{with smp} + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod-smp.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod-smp.o + fi + + %{__make} VM_KBUILD=no clean +%endif + %{__make} \ + VM_KBUILD=no VMWARE_VER=VME_V5 \ + M=$PWD O=$PWD CC=%{kgcc} \ + INCLUDES="%{rpmcflags} -I. -I%{_kernelsrcdir}/include" + if [ -e $mod-xxx-* ]; then + mv -f $mod-xxx-* ../built/$mod.o + else + mv -f driver-*/$mod-xxx-* ../built/$mod.o + fi + + cd .. +done +%endif # kernel24 + %endif %install @@ -267,6 +384,8 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc cd vmware-any-any-update%{_urel} + +%if %{without kernel24} install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ @@ -277,6 +396,21 @@ install built/vmnet-smp.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko %endif + +%else +install built/vmmon.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.o +install built/vmnet.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.o +%if %{with smp} && %{with dist_kernel} +install built/vmmon-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.o +install built/vmnet-smp.o \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.o +%endif + +%endif + cd - %endif @@ -358,6 +492,30 @@ %postun -n kernel-smp-misc-vmnet %depmod %{_kernel_ver}smp +%post -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmmon +%depmod %{_kernel_ver} + +%post -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%postun -n kernel24-misc-vmnet +%depmod %{_kernel_ver} + +%post -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmmon +%depmod %{_kernel_ver}smp + +%post -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + +%postun -n kernel24-smp-misc-vmnet +%depmod %{_kernel_ver}smp + %if %{with userspace} %files %defattr(644,root,root,755) @@ -428,6 +586,7 @@ %endif %if %{with kernel} +%if %{without kernel24} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -445,6 +604,28 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko* %endif + +%else +%files -n kernel24-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmmon.o* + +%files -n kernel24-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/vmnet.o* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel24-smp-misc-vmmon +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmmon.o* + +%files -n kernel24-smp-misc-vmnet +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/misc/vmnet.o* +%endif + +%endif + %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -453,6 +634,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.67 2005/08/25 14:58:27 andree +- added bcond to build kernel24 modules + Revision 1.66 2005/08/20 00:06:15 charles - rpmbuild(macros) >= 1.217 - added kernel, userspace, verbose bconds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.66&r2=1.67&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:51 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: horde.spec - added GeoIP database In-Reply-To: References: Message-ID: Author: paszczus Date: Thu Aug 25 15:35:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added GeoIP database ---- Files affected: SPECS: horde.spec (1.97 -> 1.98) ---- Diffs: ================================================================ Index: SPECS/horde.spec diff -u SPECS/horde.spec:1.97 SPECS/horde.spec:1.98 --- SPECS/horde.spec:1.97 Thu Aug 25 14:59:58 2005 +++ SPECS/horde.spec Thu Aug 25 17:35:46 2005 @@ -22,6 +22,8 @@ Source0: ftp://ftp.horde.org/pub/horde/%{name}-%{version}.tar.gz # Source0-md5: 31ee0819be4efe44819f8ffef5db5365 Source1: %{name}.conf +Source2: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz +# Source2-md5: 4f29410e385065eaa37037c1b1a44695 Patch0: %{name}-path.patch Patch1: %{name}-shell.disabled.patch Patch2: %{name}-util-h3.patch @@ -149,6 +151,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf +# MaxMind GeoIP Hostname Country lookup + +install %{SOURCE2} $RPM_BUILD_ROOT/var/lib/horde/ + > $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log install scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir} @@ -181,6 +187,9 @@ NOTE: You don't need SQL database for Auhtorization if You use LDAP for authorization. +If you want to use MaxMind GeoIP Hostname Country lookup do 'gunzip /var/lib/horde/GeoIP.dat.gz' +and enable this function in horde configuration. + EOF # ' @@ -300,6 +309,7 @@ %dir %attr(770,root,http) /var/log/%{name} %dir %attr(770,root,http) /var/lib/%{name} %ghost %attr(770,root,http) /var/log/%{name}/%{name}.log +%attr(640,root,http) /var/lib/%{name}/GeoIP.dat.gz %files -n openldap-schema-horde %defattr(644,root,root,755) @@ -311,6 +321,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.98 2005/08/25 15:35:46 paszczus +- added GeoIP database + Revision 1.97 2005/08/25 12:59:58 paszczus - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.97&r2=1.98&f=u From paszczus at pld-linux.org Thu Aug 25 17:35:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: horde-3.0.5.tar.gz GeoIP.dat.gz Message-ID: <7880.1124984152@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: ftp://ftp.horde.org/pub/horde/horde-3.0.5.tar.gz 31ee0819be4efe44819f8ffef5db5365 horde-3.0.5.tar.gz STORED: http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz 4f29410e385065eaa37037c1b1a44695 GeoIP.dat.gz Size: 418910 bytes -- Virtually Yours: distfiles. From wolf at pld-linux.org Thu Aug 25 18:08:40 2005 From: wolf at pld-linux.org (wolf) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: adapter.awk - spaces -> tabs, pld-linux.org In-Reply-To: References: Message-ID: Author: wolf Date: Thu Aug 25 16:08:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spaces -> tabs, pld-linux.org ---- Files affected: SPECS: adapter.awk (1.173 -> 1.174) ---- Diffs: ================================================================ Index: SPECS/adapter.awk diff -u SPECS/adapter.awk:1.173 SPECS/adapter.awk:1.174 --- SPECS/adapter.awk:1.173 Thu Aug 25 13:03:07 2005 +++ SPECS/adapter.awk Thu Aug 25 18:08:33 2005 @@ -7,9 +7,9 @@ # Micha? Kuratczyk # Sebastian Zagrodzki # Tomasz K?oczko -# Artur Frysiak +# Artur Frysiak # Michal Kochanowicz -# Elan Ruusam?e +# Elan Ruusam?e # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.173&r2=1.174&f=u From glen at pld-linux.org Thu Aug 25 18:21:15 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: egroupware.spec - created virtual DB packages to let user c... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 16:21:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created virtual DB packages to let user choose just one database ---- Files affected: SPECS: egroupware.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.7 SPECS/egroupware.spec:1.8 --- SPECS/egroupware.spec:1.7 Thu Aug 25 12:11:52 2005 +++ SPECS/egroupware.spec Thu Aug 25 18:21:09 2005 @@ -6,7 +6,7 @@ Summary(pl): eGroupWAre - oparte na WWW oprogramowanie do pracy grupowej napisane w PHP Name: egroupware Version: 1.0.0.009 -Release: 0.9 +Release: 0.12 Epoch: 0 License: GPL Group: Applications/WWW @@ -14,10 +14,8 @@ # Source0-md5: 2ed2f3041ab4ff235f56ed23dfa7274b Source1: %{name}.conf URL: http://www.egroupware.org/ +Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-mysql -Requires: php-pgsql -#Requires: php(pgsql||mysql) <- that would be neat Requires: php-pcre Requires: php-gd Requires: php-mbstring @@ -40,6 +38,33 @@ adresow?, kalendarz, infolog (notatki, rzeczy do zrobienia, rozmowy telefoniczne), zarz?dzanie tre?ci?, forum, zak?adki, wiki. +%package db-mysql +Summary: eGroupware DB Driver for MySQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mysql + +%description db-mysql +This virtual package provides MySQL database backend for eGroupware. + +%package db-pgsql +Summary: eGroupware DB Driver for PostgreSQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-pgsql + +%description db-pgsql +This virtual package provides PostgreSQL database backend for eGroupware. + +%package db-mssql +Summary: eGroupware DB Driver for MS SQL +Group: Applications/WWW +Provides: %{name}(DB_Driver) = %{version}-%{release} +Requires: php-mssql + +%description db-mssql +This virtual package provides MS SQL database backend for eGroupware. + %prep %setup -q -n %{name} @@ -138,12 +163,24 @@ %{_appdir}/fudforum/setup %{_appdir}/fudforum/templates +%files db-mysql +%defattr(644,root,root,755) + +%files db-pgsql +%defattr(644,root,root,755) + +%files db-mssql +%defattr(644,root,root,755) + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 16:21:09 glen +- created virtual DB packages to let user choose just one database + Revision 1.7 2005/08/25 10:11:52 glen - permission changes, check_install.php passed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Thu Aug 25 19:04:50 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atmdd patch ported from 2.4 In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:04:50 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atmdd patch ported from 2.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1163 -> 1.441.2.1164) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1163 SPECS/kernel.spec:1.441.2.1164 --- SPECS/kernel.spec:1.441.2.1163 Thu Aug 25 15:39:05 2005 +++ SPECS/kernel.spec Thu Aug 25 19:04:44 2005 @@ -5,7 +5,6 @@ # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs # - check and maybe port ATM patches from 2.4 # linux-2.4.22-fore200e-0.2f.patch -# linux-2.4.25-atmdd.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -258,6 +257,7 @@ Patch114: linux-2.6-nptl-signal-delivery-deadlock.patch # Derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs Patch115: linux-2.6-atm-vbr.patch +Patch116: linux-2.6-atmdd.patch # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch @@ -694,6 +694,7 @@ %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1487,6 +1488,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1164 2005/08/25 17:04:44 baggins +- atmdd patch ported from 2.4 + Revision 1.441.2.1163 2005/08/25 13:39:05 baggins - TODO updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1163&r2=1.441.2.1164&f=u From baggins at pld-linux.org Thu Aug 25 19:06:41 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES: linux-2.6-atmdd.patch (NEW) - ported from linux-2.4.25-at... In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:06:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - ported from linux-2.4.25-atmdd.patch ---- Files affected: SOURCES: linux-2.6-atmdd.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-atmdd.patch diff -u /dev/null SOURCES/linux-2.6-atmdd.patch:1.1 --- /dev/null Thu Aug 25 19:06:41 2005 +++ SOURCES/linux-2.6-atmdd.patch Thu Aug 25 19:06:36 2005 @@ -0,0 +1,953 @@ +diff -urN linux-2.4.25/drivers/atm/Makefile linux-2.4.25-atmdd/drivers/atm/Makefile +--- linux-2.4.25/drivers/atm/Makefile 2004-02-23 15:18:29.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/Makefile 2004-02-29 22:51:26.000000000 +0100 +@@ -31,6 +31,7 @@ + obj-$(CONFIG_ATM_IDT77252) += suni.o + endif + ++obj-$(CONFIG_ATM_DD) += atmdd.o + obj-$(CONFIG_ATM_TCP) += atmtcp.o + obj-$(CONFIG_ATM_FIRESTREAM) += firestream.o + obj-$(CONFIG_ATM_LANAI) += lanai.o +diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfig +--- linux-2.4.25/drivers/atm/Kcnfig 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.25-atmdd/drivers/atm/Kconfig 2004-02-29 22:52:59.000000000 +0100 +@@ -4,6 +4,14 @@ + + menu "ATM drivers" + depends on NETDEVICES && ATM ++ ++config ATM_DD ++ tristate "ATM loopback" ++ depends on INET && ATM ++ help ++ This is an example atm driver. It does not require any actual ATM ++ hardware. It supports AAL5 and AAL0. Frames are merely looped back ++ to the sender on the same VC they were sent. + + config ATM_TCP + tristate "ATM over TCP" +diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.c +--- linux-2.4.25/drivers/atm/atmdd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.25-atmdd/drivers/atm/atmdd.c 2004-02-29 22:58:11.000000000 +0100 +@@ -0,0 +1,920 @@ ++/* ++####################################################################### ++# ++# (C) Copyright 2001 ++# Alex Zeffertt, Cambridge Broadband Ltd, ajz@cambridgebroadband.com ++# ++# 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 ++####################################################################### ++# Notes: ++# ++# This is an example atm driver. It does not require any actual ATM ++# hardware. It supports AAL5 and AAL0. frames are merely looped back ++# to the sender on the same VC they were sent. ++# ++####################################################################### ++*/ ++ ++/*############ Includes ###############################################*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include /* for xtime */ ++ ++/*############ Defines ################################################*/ ++ ++#define MYATMDD "atmdd" ++#define KLOG_PREAMBLE MYATMDD ": " ++#define MYATMDD_VPI_BITS 1 /* Allow ?.1.? but not ?.2.? */ ++#define MYATMDD_VCI_BITS 11 /* Allow ?.?.2047 but not ?.?.2048 */ ++#define MYATMDD_PCR 100000 ++#define RXQ_SZ 16 ++#define TXQ_SZ 16 ++#define AAL5_MTU (1510+8) /* Default AAL5 Maximum Transmission Unit (and length of AAL5 buffers) */ ++#define AAL5_BUFLEN (((AAL5_MTU + 47)/48)*48) /* Round up to n*48 bytes */ ++#if 0 ++# define DEBUG(format,args...) printk(format,##args) ++#else ++# define DEBUG(format,args...) ++#endif ++/*############ Types ##################################################*/ ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ RX_EMPTY, /* No sk_buff present */ ++ RX_FULL, /* sk_buff present and awaiting data */ ++ RX_RECVD, /* sk_buff present and contains valid data */ ++} myatmdd_rxstatus_e; ++ ++/* status flags shared between s/w and emulated h/w */ ++typedef enum { ++ TX_EMPTY, /* No sk_buff present */ ++ TX_FULL, /* sk_buff present and awaiting transmission */ ++ TX_SENT, /* sk_buff present and has been sent */ ++} myatmdd_txstatus_e; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_rxstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_rxq_t; ++ ++typedef struct { ++ struct sk_buff **start; ++ struct sk_buff **end; ++ struct sk_buff **head; ++ struct sk_buff **tail; ++ ++ /* everything below this line emulates h/w */ ++ myatmdd_txstatus_e *status; ++ struct sk_buff **hw_ptr; ++ int *pkt_len; ++ ++} myatmdd_txq_t; ++ ++typedef struct { ++} myatmdd_devdata_t; ++ ++typedef struct { ++ myatmdd_rxq_t rxqueue; ++ myatmdd_txq_t txqueue; ++} myatmdd_vccdata_t; ++ ++/*############ Module paramters #######################################*/ ++ ++MODULE_AUTHOR("Alex Zeffertt, ajz@cambridgebroadband.com"); ++MODULE_DESCRIPTION("Example ATM device driver (loopback)"); ++#ifdef MODULE_LICENSE ++MODULE_LICENSE("GPL"); ++#endif ++/*#################### Forward declarations ###########################*/ ++ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc); ++ ++static void myatmdd_free_tx_skb(struct sk_buff *skb); ++ ++/* these functions will need modifying in a real ATM driver */ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc); ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc); ++ ++/* functions for manipulating circular bufs */ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size); ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size); ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue); ++static int myatmdd_release_txq(myatmdd_txq_t *queue); ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb); ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */); ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue); ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len); ++ ++/* myatmdd_ops registered by ATM device */ ++static int myatmdd_open(struct atm_vcc *vcc); ++static void myatmdd_close(struct atm_vcc *vcc); ++static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg); ++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb); ++static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs); ++static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page); ++ ++/* myatmdd_phy_ops registered by phy driver */ ++static void myatmdd_phy_int(struct atm_dev *dev); ++static int myatmdd_phy_start(struct atm_dev *dev); /* <-- This is the only thing exported by PHY driver */ ++static int myatmdd_phy_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg); ++ ++/*#################### Global scope variables #########################*/ ++ ++/* operations registered by the atm device */ ++static const struct atmdev_ops myatmdd_ops = ++{ ++ open: myatmdd_open, ++ close: myatmdd_close, ++ ioctl: myatmdd_ioctl, ++ getsockopt: myatmdd_getsockopt, ++ setsockopt: myatmdd_setsockopt, ++ send: myatmdd_send, ++ change_qos: myatmdd_change_qos, ++ proc_read: myatmdd_proc_read, ++ owner: THIS_MODULE, ++}; ++ ++/* operations registered by the phy driver */ ++static const struct atmphy_ops myatmdd_phy_ops = { ++ start: myatmdd_phy_start, ++ ioctl: myatmdd_phy_ioctl, ++ interrupt: myatmdd_phy_int, ++}; ++ ++struct atm_dev *myatmdd_dev; ++ ++/*#################### Function definitions ###########################*/ ++ ++ ++/* ++######################################################### ++# ++# Function : myatmdd_rx_interrupt, and myatmdd_tx_interrupt ++# ++# Purpose : handle interrupt from hardware. In first ++# case this means extract recvd buffers and pass ++# it up protocol stack. In 2nd case this means ++# free the sent buffers. ++# ++# Args : pointer to private data of the VCC concerned ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static void myatmdd_rx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ int pkt_len; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len))) ++ { ++ struct sk_buff *newskb; ++ ++ /* Get a new skb to replace the one just consumed */ ++ if (!(newskb = dev_alloc_skb(AAL5_BUFLEN))) ++ { ++ atomic_inc(&vcc->stats->rx_err); ++ printk(KERN_ERR KLOG_PREAMBLE "cannot receive packet - out of memory\n"); ++ /* put skb back in rx queue) */ ++ myatmdd_rxq_enqueue(&priv->rxqueue, skb); ++ return; ++ } ++ myatmdd_rxq_enqueue(&priv->rxqueue, newskb); ++ ++ if (!atm_charge (vcc, skb->truesize)) ++ { ++ /* Exceeded memory quota for this vcc ++ * NOTE: if atm_charge succeeds you must then push or accounting will screw up ++ */ ++ dev_kfree_skb(skb); ++ /* &vcc->stats->drop stats incremented in atm_charge */ ++ } ++ else ++ { ++ /* sk_buff passed all sanity checks! */ ++ ++ /* Add received length to socket buffer */ ++ skb_put(skb, pkt_len); ++ ++ /* update device stats */ ++ atomic_inc(&vcc->stats->rx); ++ ++ /* add timestamp for upper layers to use */ ++ do_gettimeofday(&skb->stamp); ++ ++ /* Point socket buffer at the right VCC before giving to socket layer */ ++ ATM_SKB(skb)->vcc = vcc; ++ ++ /* push socket buffer up to ATM layer */ ++ vcc->push(vcc, skb); ++ } ++ } ++} ++ ++static void myatmdd_tx_interrupt(struct atm_vcc *vcc) ++{ ++ struct sk_buff *skb; ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ while ((skb = myatmdd_txq_dequeue(&priv->txqueue))) ++ { ++ // Update channel stats and free the memory ++ atomic_inc(&vcc->stats->tx); ++ myatmdd_free_tx_skb(skb); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : myatmdd_emulate_loopback_hardware ++# ++# Purpose : emulate things normally done by hardware ++# i.e. copying tx bufs to rx bufs (we're modelling ++# a loopback system here), calling the tx done ++# interrupt, and calling the rx done interrupt. ++# ++# Args : priv = data private to VCC ++# ++# Returns : nowt ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++static void myatmdd_emulate_loopback_hardware(struct atm_vcc *vcc) ++{ ++ myatmdd_vccdata_t *priv = vcc->dev_data; ++ struct sk_buff **ptxskb; ++ struct sk_buff **prxskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ ptxskb = priv->txqueue.hw_ptr; ++ prxskb = priv->rxqueue.hw_ptr; ++ ++ /* Send each tx buff waiting to go */ ++ while (priv->txqueue.status[ptxskb - priv->txqueue.start] == TX_FULL) ++ { ++ struct sk_buff *txskb = *ptxskb; ++ struct sk_buff *rxskb = *prxskb; ++ int pkt_len = priv->txqueue.pkt_len[ptxskb - priv->txqueue.start]; ++ ++ /* Is there an rx buffer? */ ++ if (priv->rxqueue.status[prxskb - priv->rxqueue.start] == RX_FULL) ++ { ++ /* Yes - Is the length in range? */ ++ if (pkt_len <= AAL5_BUFLEN) ++ { ++ /* Yes - do the copy */ ++ memcpy(rxskb->data, txskb->data,pkt_len); ++ priv->rxqueue.pkt_len[prxskb - priv->rxqueue.start] = pkt_len; ++ ++ /* Indicate rx buffer recvd */ ++ priv->rxqueue.status[prxskb - priv->rxqueue.start] = RX_RECVD; ++ ++ /* increment and maybe wrap rx pointer */ ++ if (++prxskb == priv->rxqueue.end) ++ prxskb = priv->rxqueue.start; ++ priv->rxqueue.hw_ptr = prxskb; ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "recvd frame too long - discarded\n"); ++ } ++ } ++ else ++ { ++ /* No - then h/w cannot do a recv */ ++ printk(KERN_ERR KLOG_PREAMBLE "no rx buffers available\n"); ++ } ++ ++ /* Indicate tx buffer sent */ ++ priv->txqueue.status[ptxskb - priv->txqueue.start] = TX_SENT; ++ ++ /* increment and maybe wrap tx pointer */ ++ if (++ptxskb == priv->txqueue.end) ++ ptxskb = priv->txqueue.start; ++ priv->txqueue.hw_ptr = ptxskb; ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_tx_interrupt(vcc); ++ ++ /* Call tx ring interrupt handler */ ++ myatmdd_rx_interrupt(vcc); ++ } ++} ++ ++/* ++######################################################### ++# ++# Function : functions for manipulating circular buffs ++# ++# Purpose : ++# ++# Args : ++# ++# Returns : ++# ++# Notes : ++# ++########################################################## ++# Edit history: ++# Who When What ++# AJZ 10Apr03 Created ++########################################################## ++*/ ++ ++static int myatmdd_init_rxq(myatmdd_rxq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = RX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_init_txq(myatmdd_txq_t *queue, int size) ++{ ++ /* TODO - cope with kmalloc failure */ ++ struct sk_buff **pskb; ++ int i; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ queue->hw_ptr = queue->head = queue->tail = ++ queue->start = kmalloc(size * sizeof(struct sk_buff *), GFP_KERNEL); ++ queue->end = &queue->start[size]; ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ *pskb = NULL; ++ ++ queue->status = kmalloc(size * sizeof(myatmdd_rxstatus_e),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->status[i] = TX_EMPTY; ++ ++ queue->pkt_len = kmalloc(size * sizeof(int),GFP_KERNEL); ++ for (i = 0; i < size; i++) ++ queue->pkt_len[i] = 0; ++ ++ return 0; ++} ++ ++static int myatmdd_release_rxq(myatmdd_rxq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is there an skb here */ ++ if (*pskb == NULL) ++ continue; /* No, so skip this entry in ring */ ++ ++ /* Yes - free it */ ++ dev_kfree_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++static int myatmdd_release_txq(myatmdd_txq_t *queue) ++{ ++ struct sk_buff **pskb; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ /* Scan through all TX bd's and cleanup */ ++ for (pskb = queue->start; pskb < queue->end; pskb++) ++ { ++ /* Is this buffer currently unused - i.e. no skb */ ++ if (*pskb == NULL) ++ continue; /* Yes, so ignore it */ ++ ++ /* If we reach here, we have found a socket buffer that ++ * exists in the TX ring and is waiting to be released. ++ */ ++ printk(KERN_WARNING KLOG_PREAMBLE "discarding unsent tx sk_buff\n"); ++ atomic_inc(&ATM_SKB(*pskb)->vcc->stats->tx_err); ++ myatmdd_free_tx_skb(*pskb); ++ } ++ kfree(queue->start); ++ kfree(queue->status); ++ kfree(queue->pkt_len); ++ ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_txq_enqueue(myatmdd_txq_t *queue, struct sk_buff *skb) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if tx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = TX_FULL; ++ queue->pkt_len[queue->head - queue->start] = skb->len; ++ queue->head = newhead; ++ return 0; ++} ++ ++/* returns non-zero for "out of space" */ ++static int myatmdd_rxq_enqueue(myatmdd_rxq_t *queue, struct sk_buff *skb /* empty buffer */) ++{ ++ /* increment head and wrap */ ++ struct sk_buff **newhead = queue->head + 1; ++ if (newhead == queue->end) ++ newhead = queue->start; ++ ++ DEBUG("%s\n", __FUNCTION__); ++ ++ /* abort if rx ring full */ ++ if (newhead == queue->tail) ++ return -1; ++ ++ /* all is okay if we're here */ ++ *queue->head = skb; ++ /* Tell hardware there's a buffer to send */ ++ queue->status[queue->head - queue->start] = RX_FULL; ++ queue->head = newhead; ++ return 0; ++} ++ ++static struct sk_buff *myatmdd_txq_dequeue(myatmdd_txq_t *queue) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == TX_SENT) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = TX_EMPTY; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* returns NULL for "no new recvd frames" */ ++static struct sk_buff *myatmdd_rxq_dequeue(myatmdd_rxq_t *queue, int *pkt_len) ++{ ++ DEBUG("%s\n", __FUNCTION__); ++ if (queue->tail != queue->head && queue->status[queue->tail - queue->start] == RX_RECVD) ++ { ++ struct sk_buff *skb = *queue->tail; ++ ++ /* increment tail and wrap */ ++ struct sk_buff **newtail = queue->tail + 1; ++ if (newtail == queue->end) ++ newtail = queue->start; ++ *queue->tail = NULL; ++ queue->status[queue->tail - queue->start] = RX_EMPTY; ++ *pkt_len = queue->pkt_len[queue->tail - queue->start]; ++ queue->tail = newtail; ++ return skb; ++ } ++ return NULL; ++} ++ ++/* ++######################################################### <> From baggins at pld-linux.org Thu Aug 25 19:09:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (LINUX_2_6): kernel.spec - ATM TODO done In-Reply-To: References: Message-ID: Author: baggins Date: Thu Aug 25 17:09:53 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - ATM TODO done ---- Files affected: SPECS: kernel.spec (1.441.2.1164 -> 1.441.2.1165) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1164 SPECS/kernel.spec:1.441.2.1165 --- SPECS/kernel.spec:1.441.2.1164 Thu Aug 25 19:04:44 2005 +++ SPECS/kernel.spec Thu Aug 25 19:09:47 2005 @@ -3,8 +3,6 @@ # TODO: # - add distcc support (and don't break crossbuild!) # - move em8300/lirc/iriverfs/squashfs stuff to separeated specs -# - check and maybe port ATM patches from 2.4 -# linux-2.4.22-fore200e-0.2f.patch # # Conditional build: %bcond_without smp # don't build SMP kernel @@ -1488,6 +1486,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1165 2005/08/25 17:09:47 baggins +- ATM TODO done + Revision 1.441.2.1164 2005/08/25 17:04:44 baggins - atmdd patch ported from 2.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1164&r2=1.441.2.1165&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: open4-0.1.0.tgz Message-ID: <12632.1124997894@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.codeforpeople.com/lib/ruby/open4/open4-0.1.0.tgz aab7035d09a19af38a7468d7f1cb93c9 open4-0.1.0.tgz Size: 2918 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 09:12:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: subversion-1.2.3.tar.bz2 Message-ID: <6823.1125040338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://subversion.tigris.org/tarballs/subversion-1.2.3.tar.bz2 a14bc6590241b6e5c2ff2b354cc184a1 subversion-1.2.3.tar.bz2 Size: 7238176 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:57:27 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: mdadm-2.0.tar.bz2 Message-ID: <15335.1125061047@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 802f301ea67db14773f49d6bed4f2411 mdadm-2.0.tar.bz2 Size: 102270 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Thu Aug 25 20:25:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: mysql-4.1.14.tar.gz Message-ID: <8345.1124994338@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mysql.dataphone.se/Downloads/MySQL-4.1/mysql-4.1.14.tar.gz 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz Size: 17074439 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: openvpn-2.0.2.tar.gz Message-ID: <32021.1125001715@distfiles.pld-linux.org> Files fetched: 1 STORED: http://openvpn.net/release/openvpn-2.0.2.tar.gz 862f8788f080f669b1ae00a74ef68001 openvpn-2.0.2.tar.gz Size: 663246 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Fri Aug 26 05:55:56 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: cairo-1.0.0.tar.gz Message-ID: <19931.1125028556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://cairographics.org/releases/cairo-1.0.0.tar.gz f0ff35c91983b7bf226154e68b280be3 cairo-1.0.0.tar.gz Size: 1439299 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 15:01:46 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: mdadm-1.12.0.tar.bz2 Message-ID: <18114.1125061306@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 736705240e918294740929518477fc6f mdadm-1.12.0.tar.bz2 Size: 79934 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Fri Aug 26 14:49:18 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ERRORS: mdadm-1.12.0.tar.bz2 Message-ID: <9701.1125060558@distfiles.pld-linux.org> FATAL: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-1.12.0.tar.bz2 md5 mismatch, needed 4de899ddb1ede1d2cafd183794874ce1, got 736705240e918294740929518477fc6f Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <23028.1124995811@distfiles.pld-linux.org> wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/c915b118-a612-43d5-8310-14d6c7a93c52/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 20:50:11 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Thu Aug 25 20:50:18 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <23163.1124995818@distfiles.pld-linux.org> wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/bb9a70ec-cf58-4d1a-b45d-d56fc2a3d2d6/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 20:50:18 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From jajcus at pld-linux.org Fri Aug 26 10:43:25 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <31468.1125045805@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 08:25:29 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ooo-build-1.9.124.tar.gz src680-m124-core.tar.bz2 src680-m124-system.tar.bz2 src680-m124-binfilter.tar.bz2 src680-m124-lang.tar.bz2 ooo_custom_images-13.tar.bz2 ooo_crystal_images-6.tar.bz2 extras-2.tar.bz2 libwpd-0.8.0.tar.gz mdbtools-0.6pre1.tar.gz ... Message-ID: <10770.1125037529@distfiles.pld-linux.org> Files fetched: 5 STORED: http://go-ooo.org/packages/SRC680/ooo-build-1.9.124.tar.gz a82488bad72ea7006c7b269ad0652660 ooo-build-1.9.124.tar.gz Size: 4031429 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-core.tar.bz2 1f79a23b6d6a1339b137d12b156583a6 src680-m124-core.tar.bz2 Size: 157886806 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-system.tar.bz2 db7079c78028378224aeb0f282cb051e src680-m124-system.tar.bz2 Size: 18886198 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-binfilter.tar.bz2 a11c3419e5be158056bfbe8f16bcc65a src680-m124-binfilter.tar.bz2 Size: 18513561 bytes STORED: http://go-ooo.org/packages/SRC680/src680-m124-lang.tar.bz2 dc8bd51c89a032e9156a53a38039150d src680-m124-lang.tar.bz2 Size: 29036821 bytes ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2 2480af7f890c8175c7f9e183a1b39ed2 ooo_custom_images-13.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/SRC680/extras-2.tar.bz2 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 ALREADY GOT: http://go-ooo.org/packages/libwpd/libwpd-0.8.0.tar.gz 98e59beecc112339bb78654863304c1c libwpd-0.8.0.tar.gz ALREADY GOT: http://go-ooo.org/packages/SRC680/mdbtools-0.6pre1.tar.gz 246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_01_unix.tgz 7da2aff674c2c84aba8b21ac2ab16bb6 helpcontent_01_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_31_unix.tgz c7e618e2d9b8bd25cae12954ef2548c9 helpcontent_31_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_33_unix.tgz 68d58bc30b485a77c0a0fba08af3aee3 helpcontent_33_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_34_unix.tgz 8696bbee3dc4d5b6fd60218123016e29 helpcontent_34_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_39_unix.tgz c2ae86d02f462d2b663d621190f5ef34 helpcontent_39_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_46_unix.tgz 7b013981edce2fabe4a8751ff64a8d58 helpcontent_46_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_49_unix.tgz a39f44ec40f452c963a4a187f31d1acb helpcontent_49_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_55_unix.tgz 804d3ce61e11335193a410aaf9603f8e helpcontent_55_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_81_unix.tgz 81b705057a0e14ebcbf02fac4762781a helpcontent_81_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_82_unix.tgz 3121fbd251176d7c7b6e33ecec744c65 helpcontent_82_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_86_unix.tgz aee37935139c5ccd4b6d8abdd2037c66 helpcontent_86_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_88_unix.tgz 3b00571318e45965dee0545d86306d65 helpcontent_88_unix.tgz ALREADY GOT: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_90_unix.tgz 9521a01c5817e87178f356762f8cdab5 helpcontent_90_unix.tgz -- Virtually Yours: distfiles. From megabajt at pld-linux.org Fri Aug 26 16:53:24 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: GeoIP-1.3.13.tar.gz Message-ID: <27610.1125068004@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.maxmind.com/download/geoip/api/c/GeoIP-1.3.13.tar.gz 59fc9a6adfbde13cee33c88668f3f400 GeoIP-1.3.13.tar.gz Size: 668577 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Fri Aug 26 17:05:58 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: passwd-HEAD-2005-08-26.tar.gz Message-ID: <2176.1125068758@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/passwd-HEAD-2005-08-26.tar.gz 95fbc7b902ed4c527b1d84bcddf3241b passwd-HEAD-2005-08-26.tar.gz Size: 903489 bytes -- Virtually Yours: distfiles. From adamg at pld-linux.org Fri Aug 26 17:52:36 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: pecl_http-0.12.0.tgz Message-ID: <30445.1125071556@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pecl.php.net/get/pecl_http-0.12.0.tgz d180e5b95d22c911e40d8265f7c8fd96 pecl_http-0.12.0.tgz Size: 92002 bytes -- Virtually Yours: distfiles. From wolvverine at pld-linux.org Fri Aug 26 18:50:55 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: msmtp-1.4.4.tar.bz2 Message-ID: <3807.1125075055@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/msmtp/msmtp-1.4.4.tar.bz2 34b31619a61462d9f2dd4f59720cf05e msmtp-1.4.4.tar.bz2 Size: 480904 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Fri Aug 26 19:13:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:36 2005 Subject: DISTFILES: ocaml-3.08.4.tar.gz ocaml-3.08-refman.html.tar.gz ocaml-3.08-refman.ps.gz camlp4-3.06-manual.html.tar.gz camlp4-3.06-manual.dvi.gz camlp4-3.06-tutorial.html.tar.gz camlp4-3.06-tutorial.dvi.gz pure-fun-1.0.4.tar.bz2 ds-contrib.tar.gz ocaml-3.08-refman.info.tar.gz Message-ID: <17171.1125076405@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.gz 105d192896bf945b660c4fb1ee486f57 ocaml-3.08.4.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz 0daee5643db6960682c1a7d84467885f ocaml-3.08-refman.html.tar.gz ALREADY GOT: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz 35a5d4318456c0982e72ee3f33364bf5 ocaml-3.08-refman.ps.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.html.tar.gz 21370bae4e7f6435b38aeb21db7ce8bb camlp4-3.06-manual.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-manual.dvi.gz 035915d1a530aa7ec9b194d9a7d258eb camlp4-3.06-manual.dvi.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.html.tar.gz 96d8eb4ca5abd58c9a280ba59f73b192 camlp4-3.06-tutorial.html.tar.gz ALREADY GOT: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-3.06-tutorial.dvi.gz fcd87c235109364242a0c9ccf176dff8 camlp4-3.06-tutorial.dvi.gz ALREADY GOT: http://www.ocaml.info/ocaml_sources/pure-fun-1.0.4.tar.bz2 567bc681b4cc1cfcbbfb6fa5f012019b pure-fun-1.0.4.tar.bz2 ALREADY GOT: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz 77fa1da7375dea1393cc0b6cd802d7e1 ds-contrib.tar.gz STORED: http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz 49b68ec07ccd7ce45eb6bd3f3fdee140 ocaml-3.08-refman.info.tar.gz Size: 274899 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Fri Aug 26 19:40:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: kdebase.spec - rel 4 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:40:32 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 4 ---- Files affected: SPECS: kdebase.spec (1.458 -> 1.459) ---- Diffs: ================================================================ Index: SPECS/kdebase.spec diff -u SPECS/kdebase.spec:1.458 SPECS/kdebase.spec:1.459 --- SPECS/kdebase.spec:1.458 Tue Aug 16 19:26:31 2005 +++ SPECS/kdebase.spec Fri Aug 26 19:40:26 2005 @@ -27,7 +27,7 @@ Summary(zh_CN): KDE???? Name: kdebase Version: %{_ver} -Release: 3 +Release: 4 Epoch: 9 License: GPL Group: X11/Applications @@ -2803,6 +2803,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.459 2005/08/26 17:40:26 arekm +- rel 4 + Revision 1.458 2005/08/16 17:26:31 glen - move kwriteconfig to -desktop package (it's not kwrite related program) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.458&r2=1.459&f=u From arekm at pld-linux.org Fri Aug 26 19:42:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: kdepim.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 17:42:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: kdepim.spec (1.188 -> 1.189) ---- Diffs: ================================================================ Index: SPECS/kdepim.spec diff -u SPECS/kdepim.spec:1.188 SPECS/kdepim.spec:1.189 --- SPECS/kdepim.spec:1.188 Tue Aug 2 11:22:48 2005 +++ SPECS/kdepim.spec Fri Aug 26 19:42:04 2005 @@ -17,7 +17,7 @@ Summary(uk): ???????????? ???????????? (PIM) ??? KDE Name: kdepim Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: GPL Vendor: The KDE Team @@ -1338,6 +1338,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.189 2005/08/26 17:42:04 arekm +- rel 3 + Revision 1.188 2005/08/02 09:22:48 arekm - rel2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.188&r2=1.189&f=u From qboosh at pld-linux.org Fri Aug 26 19:43:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-themeengine-phptemplate.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:43:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-phptemplate.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-phptemplate.spec diff -u SPECS/drupal-themeengine-phptemplate.spec:1.1 SPECS/drupal-themeengine-phptemplate.spec:1.2 --- SPECS/drupal-themeengine-phptemplate.spec:1.1 Fri Aug 19 12:54:31 2005 +++ SPECS/drupal-themeengine-phptemplate.spec Fri Aug 26 19:43:31 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine phptemplate Summary: Drupal PHPTemplate theme engine +Summary(pl): Silnik motyw?w Drupala PHPTemplate Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.2 @@ -18,7 +19,7 @@ %description A theme engine that allows you to use template files written in pure -php. These template files do not need to be processed by the theme +PHP. These template files do not need to be processed by the theme engine, and as such execute a lot faster than most other template engines. Another major advantage to using PHP as your template language, is flexibility, as the advanced user can access any @@ -30,6 +31,21 @@ The 'default' template for this engine is box_grey by Adrian Simmons. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych w +czystym PHP. Te pliki szablon?w nie wymagaj? przetwarzania przez +silnik motyw?w i jako takie wykonuj? si? du?o szybciej ni? wi?kszo?? +innych silnik?w motyw?w. Inn? du?? zalet? u?ywania PHP jako j?zyka +szablon?w jest elastyczno??, jako ?e zaawansowany u?ytkownik mo?e +dosta? si? do ka?dej informacji/funkcjonalno?ci dost?pnej w API +Drupala i nie jest ograniczony do tego, na co pozwala mu silnik/j?zyk +szablon?w. + +Kilka najwi?kszych serwis?w opartych na Drupalu, takich jak Drupal.org +czy Spreadfirefox.com u?ywa motyw?w opartych na PHPTemplate. + +"Domy?lnym" szablonem dla tego silnika jest box_grey Adriana Simmonsa. + %prep %setup -q -n %{engine} rm -f LICENSE.txt # GPL v2 @@ -54,6 +70,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:43:31 qboosh +- pl + Revision 1.1 2005/08/19 10:54:31 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-phptemplate.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 19:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-themeengine-smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-smarty.spec diff -u SPECS/drupal-themeengine-smarty.spec:1.3 SPECS/drupal-themeengine-smarty.spec:1.4 --- SPECS/drupal-themeengine-smarty.spec:1.3 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-smarty.spec Fri Aug 26 19:45:11 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine smarty Summary: Drupal Smarty theme engine +Summary(pl): Silnik motyw?w Drupala Smarty Name: drupal-themeengine-%{engine} Version: 4.6.0 Release: 0.9 @@ -26,6 +27,13 @@ The 'default' template for this engine is box_grey_smarty, which is ported from the original box_grey theme. +%description -l pl +Ten silnik motyw?w umo?liwia u?ywanie plik?w szablon?w napisanych przy +u?yciu sk?adni silnika szablon?w Smarty. + +"Domy?lnym" szablonem dla tego silnika jest box_grey_smarty, kt?ry +jest sportowany z oryginalnego motywu box_grey. + %prep %setup -q -n %{engine} %patch0 -p1 @@ -60,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:45:11 qboosh +- pl + Revision 1.3 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-smarty.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 19:49:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-themeengine-wgsmarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:49:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-themeengine-wgsmarty.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/drupal-themeengine-wgsmarty.spec diff -u SPECS/drupal-themeengine-wgsmarty.spec:1.2 SPECS/drupal-themeengine-wgsmarty.spec:1.3 --- SPECS/drupal-themeengine-wgsmarty.spec:1.2 Fri Aug 19 12:55:01 2005 +++ SPECS/drupal-themeengine-wgsmarty.spec Fri Aug 26 19:49:04 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define engine wgsmarty Summary: Drupal wgSmarty theme engine +Summary(pl): Silnik motyw?w Drupala wgSmarty Name: drupal-themeengine-%{engine} Version: 4.6.001 Release: 0.2 @@ -23,18 +24,37 @@ wgSmarty is an implementation of the Smarty template engine as a theme engine. -Advantages -- Template files are easier to create and maintain then with PHPtemplate +Advantages: +- Template files are easier to create and maintain then with + PHPtemplate - Templates are compiled into PHP to avoid speed and memory issues with search-and-replace template engines like XTemplate - wgSmarty is much more closely integrated with Drupal than the - existing smarty theme engine + existing Smarty theme engine -Disadvantages +Disadvantages: - wgSmarty is currently experimental and is only available in CVS - There is very little support for wgSmarty: even when it is released, it will still be poorly supported in comparison with PHPTemplate +%description -l pl +wgSmarty to implementacja silnika szablon?w Smarty jako silnika +motyw?w. + +Zalety: +- pliki szablon?w s? ?atwiejsze do tworzenia i utrzymywania ni? + PHPtemplate +- szablony s? kompilowane do PHP, aby zapobiec problemom z szybko?ci? + i pami?ci? z silnikami szablon?w podmieniaj?cymi ?a?cuchy, takimi + jak XTemplate +- wgSmarty jest du?o bli?ej zintegrowany z Drupalem ni? istniej?cy + silnik motyw?w Smarty + +Wady: +- wgSmarty jest aktualnie eksperymentalny i dost?pny tylko w CVS-ie +- jest bardzo ma?e wsparcie dla wgSmarty: nawet kiedy zostanie wydany, + nadal b?dzie kiepsko wspierany w por?wnaniu do PHPTemplate + %prep %setup -q -n %{engine} %patch0 -p1 @@ -61,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 17:49:04 qboosh +- pl + Revision 1.2 2005/08/19 10:55:01 glen - unify ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-themeengine-wgsmarty.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:37:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-theme-box_grey_smarty.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:37:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey_smarty.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey_smarty.spec diff -u SPECS/drupal-theme-box_grey_smarty.spec:1.3 SPECS/drupal-theme-box_grey_smarty.spec:1.4 --- SPECS/drupal-theme-box_grey_smarty.spec:1.3 Fri Aug 19 13:08:48 2005 +++ SPECS/drupal-theme-box_grey_smarty.spec Fri Aug 26 19:37:35 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey_smarty Summary: Drupal Theme Box_grey_smarty +Summary(pl): Motyw Box_grey_smarty dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.5 @@ -21,6 +22,9 @@ %description A port of the original box_grey theme for the Smarty template engine. +%description -l pl +Port oryginalnego motywu box_grey dla silnika szablon?w Smarty. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -54,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 17:37:35 qboosh +- pl + Revision 1.3 2005/08/19 11:08:48 glen - fix theme style being available ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey_smarty.spec?r1=1.3&r2=1.4&f=u From wolvverine at pld-linux.org Fri Aug 26 18:50:57 2005 From: wolvverine at pld-linux.org (wolvverine) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: msmtp.spec - 1.4.4 - STBR In-Reply-To: References: Message-ID: Author: wolvverine Date: Fri Aug 26 16:50:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.4.4 - STBR ---- Files affected: SPECS: msmtp.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.48 SPECS/msmtp.spec:1.49 --- SPECS/msmtp.spec:1.48 Mon Jul 18 17:44:42 2005 +++ SPECS/msmtp.spec Fri Aug 26 18:50:52 2005 @@ -2,12 +2,12 @@ Summary: SMTP "plugin" for MUAs Summary(pl): "Wtyczka" SMTP dla klient?w pocztowych (MUA) Name: msmtp -Version: 1.4.3 +Version: 1.4.4 Release: 1 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/msmtp/%{name}-%{version}.tar.bz2 -# Source0-md5: f6614490834ad3c2c15559bf38c2f694 +# Source0-md5: 34b31619a61462d9f2dd4f59720cf05e Patch0: %{name}-home_etc.patch URL: http://msmtp.sourceforge.net/ BuildRequires: autoconf >= 2.50 @@ -34,7 +34,7 @@ %description -l pl msmtp to prosty program dzia?aj?cy jako "wtyczka SMTP" dla Mutta i -prawdopodobnie innych klient?w pocztowych (MUA - mail user agents). +innych klient?w pocztowych (MUA - mail user agents). Przekierowuje wiadomo?ci do serwera SMTP (na przyk?ad providera darmowych kont e-mail), kt?ry je dostarcza. Mo?liwo?ci obejmuj?: - obs?ug? SMTP AUTH - metod PLAIN, LOGIN i CRAM-MD5 @@ -47,7 +47,7 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym). +konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. %prep %setup -q @@ -98,6 +98,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.49 2005/08/26 16:50:52 wolvverine +- 1.4.4 +- STBR + Revision 1.48 2005/07/18 15:44:42 saq - drop unpackaged info-dir - works, release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.48&r2=1.49&f=u From adamg at pld-linux.org Fri Aug 26 18:15:45 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: template-php-pecl.spec - conf.d support In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - conf.d support ---- Files affected: SPECS: template-php-pecl.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.10 SPECS/template-php-pecl.spec:1.11 --- SPECS/template-php-pecl.spec:1.10 Sat Aug 7 19:47:11 2004 +++ SPECS/template-php-pecl.spec Fri Aug 26 18:15:39 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ %define _modname - %define _status - +%define _sysconfdir /etc/php +%define extensionsdir $(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -13,13 +15,11 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php - %description In PECL status of this extension is: %{_status}. @@ -39,24 +39,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{extensionsdir}} install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -65,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 16:15:39 adamg +- conf.d support + Revision 1.10 2004/08/07 17:47:11 adamg - ok, let's force php5 for pecl extensions ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.10&r2=1.11&f=u From aflinta at pld-linux.org Fri Aug 26 12:39:21 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:36 2005 Subject: CVSROOT: users - new JID In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 10:39:21 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - new JID ---- Files affected: CVSROOT: users (1.385 -> 1.386) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.385 CVSROOT/users:1.386 --- CVSROOT/users:1.385 Mon Aug 22 17:16:05 2005 +++ CVSROOT/users Fri Aug 26 12:39:16 2005 @@ -5,7 +5,7 @@ adamg:adamg@biomerieux.pl:Adam Go??biowski:adamg@pld-linux.org adasi:adasi@grubno.da.ru:Witek Kr?cicki adgor:adgor@isn.pl:Adam Gorzkiewicz:adgor@pld-linux.org -aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@at.kernel.pl +aflinta:aflinta@at.kernel.pl:Artur Flinta:aflinta@jabber.org agaran:agaran@ep09.pld-linux.org:Maciej 'Agaran' Pijanka:agaran@rulez.pl andree:andree@luch.eu.org:Andrzej Augustynowicz aniolek:michal@dominium.warszawa.pl:Michal Czwojdzinski:aniolek@pld-linux.org ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.385&r2=1.386&f=u From paszczus at pld-linux.org Fri Aug 26 16:37:48 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: ocaml-lablgl.spec - added -j1 option to make cause it fails... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:37:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -j1 option to make cause it fails with multiprocesor build ---- Files affected: SPECS: ocaml-lablgl.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.19 SPECS/ocaml-lablgl.spec:1.20 --- SPECS/ocaml-lablgl.spec:1.19 Fri Aug 26 16:32:56 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:37:43 2005 @@ -156,7 +156,7 @@ s|^GLLIBS.*|GLLIBS = -L%{_prefix}/X11R6/%{_lib} -lGL -lGLU -lXmu|; s|^COPTS.*|COPTS = %{rpmcflags} -c -fPIC|;' \ Makefile.config.ex > Makefile.config -%{__make} all opt +%{__make} -j1 all opt %install rm -rf $RPM_BUILD_ROOT @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/26 14:37:43 paszczus +- added -j1 option to make cause it fails with multiprocesor build + Revision 1.19 2005/08/26 14:32:56 paszczus - rel up for rebuild with ocaml 3.08.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.19&r2=1.20&f=u From darekr at pld-linux.org Thu Aug 25 22:11:59 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: wormulon.spec - fixed Source0 and URL field - added ChangeL... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:11:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed Source0 and URL field - added ChangeLog to %dir ---- Files affected: SPECS: wormulon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/wormulon.spec diff -u SPECS/wormulon.spec:1.2 SPECS/wormulon.spec:1.3 --- SPECS/wormulon.spec:1.2 Wed May 26 18:57:13 2004 +++ SPECS/wormulon.spec Thu Aug 25 22:11:54 2005 @@ -6,9 +6,9 @@ Release: 0.1 License: GPL Group: Networking/Utilities -Source0: http://www.raisdorf.net/files/wormulon/%{name}-%{version}.tar.gz +Source0: http://www.wormulon.net/files/code/wormulon/%{name}-%{version}.tar.gz # Source0-md5: 2ec78110fae31ee7f3cc651334da6b0e -URL: http://www.raisdorf.net/wormulon/ +URL: http://www.wormulon.net/projects/wormulon/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -37,7 +37,7 @@ %files %defattr(644,root,root,755) -%doc README TODO +%doc ChangeLog README TODO %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -46,6 +46,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/25 20:11:54 darekr +- fixed Source0 and URL field +- added ChangeLog to %dir + Revision 1.2 2004/05/26 16:57:13 qboosh - pl fixes, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wormulon.spec?r1=1.2&r2=1.3&f=u From aredridel at pld-linux.org Fri Aug 26 05:55:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: cairo.spec - up to 1.0.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Fri Aug 26 03:55:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.0 ---- Files affected: SPECS: cairo.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.33 SPECS/cairo.spec:1.34 --- SPECS/cairo.spec:1.33 Thu Aug 25 10:04:57 2005 +++ SPECS/cairo.spec Fri Aug 26 05:55:49 2005 @@ -2,13 +2,12 @@ Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo -Version: 0.9.2 -Release: 3 +Version: 1.0.0 +Release: 1 License: LGPL v2.1 or MPL v1.1 Group: Libraries -Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz -# Source0-md5: 992095a5db597384a89b41e93737105d -Patch0: %{name}-bug4110.patch +Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz +# Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel BuildRequires: autoconf @@ -100,7 +99,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +108,11 @@ %{__automake} %configure \ --enable-gtk-doc \ + --enable-quartz \ + --enable-xcb \ + --enable-glitz \ + --enable-ps \ + --enable-pdf \ --with-html-dir=%{_gtkdocdir} %{__make} @@ -149,6 +152,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2005/08/26 03:55:49 aredridel +- up to 1.0.0 + Revision 1.33 2005/08/25 08:04:57 aflinta - avoid to link with external libpixman, rel 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.33&r2=1.34&f=u From arekm at pld-linux.org Thu Aug 25 23:05:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES (DEVEL): php-lib64.patch - more complete fix In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 21:05:16 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - more complete fix ---- Files affected: SOURCES: php-lib64.patch (1.10.4.2 -> 1.10.4.3) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.2 SOURCES/php-lib64.patch:1.10.4.3 --- SOURCES/php-lib64.patch:1.10.4.2 Thu Aug 25 20:23:51 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 23:05:11 2005 @@ -1,6 +1,6 @@ diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 --- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 -+++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 23:03:43.002336568 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) @@ -10,6 +10,22 @@ MING_DIR=$i break fi +@@ -34,11 +34,11 @@ + ],[ + AC_MSG_ERROR([Ming library 0.2a or greater required.]) + ],[ +- -L$MING_DIR/lib ++ -L$MING_DIR/$PHP_LIBDIR + ]) + + PHP_ADD_INCLUDE($MING_INC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) + + AC_MSG_CHECKING([for destroySWFBlock]) + AC_TRY_RUN([ + + diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag --- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 +++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.2&r2=1.10.4.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:36:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-theme-box_grey.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:36:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-theme-box_grey.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-theme-box_grey.spec diff -u SPECS/drupal-theme-box_grey.spec:1.1 SPECS/drupal-theme-box_grey.spec:1.2 --- SPECS/drupal-theme-box_grey.spec:1.1 Fri Aug 19 13:08:08 2005 +++ SPECS/drupal-theme-box_grey.spec Fri Aug 26 19:36:13 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define themename box_grey Summary: Drupal Theme Box_grey +Summary(pl): Motyw Box_grey dla Drupala Name: drupal-theme-%{themename} Version: 4.6.0 Release: 0.1 @@ -26,6 +27,14 @@ lastly has a neutral grey colour scheme which will hopefully encourage people to change it. +%description -l pl +Box_grey ma by? stosunkowo ?atwy do modyfikowania dla tych, kt?rzy nie +s? kompetentni w pozycjonowaniu css, ale mog? zarz?dza? kolorami, +t?ami i obramowaniami css (albo przynajmniej chc? spr?bowa?). Jest +zaprojektowany tak, aby by? stosunkowo bogaty w r??ne rozmiary tre?ci +i ostatecznie mie? neutralny szary schemat kolor?w, zach?caj?cy ludzi +do jego zmiany. + %prep %setup -q -n %{themename} rm -f LICENSE.txt # GPL v2 @@ -59,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 17:36:13 qboosh +- pl + Revision 1.1 2005/08/19 11:08:08 glen - phptemplate based theme - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-theme-box_grey.spec?r1=1.1&r2=1.2&f=u From arekm at pld-linux.org Fri Aug 26 09:11:49 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: subversion.spec - up to 1.2.3 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 07:11:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.3 ---- Files affected: SPECS: subversion.spec (1.144 -> 1.145) ---- Diffs: ================================================================ Index: SPECS/subversion.spec diff -u SPECS/subversion.spec:1.144 SPECS/subversion.spec:1.145 --- SPECS/subversion.spec:1.144 Sun Jul 31 23:45:59 2005 +++ SPECS/subversion.spec Fri Aug 26 09:11:44 2005 @@ -16,19 +16,18 @@ Summary(pl): System kontroli wersji podobny, ale lepszy, ni? CVS Summary(pt_BR): Sistema de versionamento concorrente Name: subversion -Version: 1.2.1 -Release: 3 +Version: 1.2.3 +Release: 1 License: Apache/BSD Style Group: Development/Version Control Source0: http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2 -# Source0-md5: 0b546195ca794c327c6830f2e88661f7 +# Source0-md5: a14bc6590241b6e5c2ff2b354cc184a1 Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init Source4: %{name}-svnserve.sysconfig Patch0: %{name}-home_etc.patch -Patch1: %{name}-SWIGEXPORT.patch -Patch2: %{name}-po.pl.patch +Patch1: %{name}-po.pl.patch URL: http://subversion.tigris.org/ %if %{with net_client_only} %global apache_modules_api 0 @@ -270,7 +269,6 @@ %setup -q %patch0 -p0 %patch1 -p1 -%patch2 -p1 rm -rf apr-util{,/xml/expat}/autom4te.cache @@ -522,6 +520,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.145 2005/08/26 07:11:44 arekm +- up to 1.2.3 + Revision 1.144 2005/07/31 21:45:59 pluto - segfault fixed, release 3. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.144&r2=1.145&f=u From baggins at pld-linux.org Fri Aug 26 17:56:54 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:36 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - fix ip_conntra... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:56:54 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - fix ip_conntrack_amanda Oops ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.17 -> 1.1.2.18) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 Fri Aug 26 15:40:25 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 17:56:48 2005 @@ -7237,6 +7237,19 @@ + +module_init(init); +module_exit(fini); +Index: net/ipv4/netfilter/ip_conntrack_amanda.c +=================================================================== +--- net/ipv4/netfilter/ip_conntrack_amanda.c (.../branches/vanilla-2.6.12.x) (revision 6284) ++++ net/ipv4/netfilter/ip_conntrack_amanda.c (.../trunk) (revision 6284) +@@ -66,7 +66,7 @@ + + /* increase the UDP timeout of the master connection as replies from + * Amanda clients to the server can be quite delayed */ +- ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); ++ ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); + + /* No data? */ + dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); Index: net/ipv4/netfilter/ip_conntrack_core.c =================================================================== --- net/ipv4/netfilter/ip_conntrack_core.c (.../branches/vanilla-2.6.12.x) (revision 6284) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.17&r2=1.1.2.18&f=u From glen at pld-linux.org Fri Aug 26 17:05:50 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: horde-passwd.spec - updated to 2005-08-26 snap In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 15:05:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-08-26 snap ---- Files affected: SPECS: horde-passwd.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/horde-passwd.spec diff -u SPECS/horde-passwd.spec:1.26 SPECS/horde-passwd.spec:1.27 --- SPECS/horde-passwd.spec:1.26 Thu Aug 25 12:13:07 2005 +++ SPECS/horde-passwd.spec Fri Aug 26 17:05:45 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define _snap 2005-08-24 -%define _rel 2 +%define _snap 2005-08-26 +%define _rel 1 # %define _hordeapp passwd %include /usr/lib/rpm/macros.php @@ -14,9 +14,8 @@ Group: Applications/WWW #Source0: ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-beta.tar.gz Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz -# Source0-md5: 6638fad5170d5421bacf7e44868a7964 +# Source0-md5: 95fbc7b902ed4c527b1d84bcddf3241b Source1: %{name}.conf -Patch0: http://glen.alkohol.ee/pld/%{name}-broken-_userDN.patch URL: http://www.horde.org/passwd/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 BuildRequires: rpmbuild(macros) >= 1.226 @@ -52,7 +51,6 @@ %prep %setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}} tar zxf %{SOURCE0} --strip-components=1 -%patch0 -p1 rm -f scripts/.htaccess # considered harmful (horde/docs/SECURITY) @@ -144,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/26 15:05:45 glen +- updated to 2005-08-26 snap + Revision 1.26 2005/08/25 10:13:07 paszczus - unification ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Fri Aug 26 17:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS: drupal-mod-blogtheme.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 15:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: drupal-mod-blogtheme.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/drupal-mod-blogtheme.spec diff -u SPECS/drupal-mod-blogtheme.spec:1.1 SPECS/drupal-mod-blogtheme.spec:1.2 --- SPECS/drupal-mod-blogtheme.spec:1.1 Thu Aug 18 16:19:10 2005 +++ SPECS/drupal-mod-blogtheme.spec Fri Aug 26 17:54:16 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ %define modname blogtheme Summary: Drupal Blog Theme Module +Summary(pl): Modu? Drupal Blog Theme Name: drupal-mod-%{modname} Version: 4.6.0 Release: 0.1 @@ -19,12 +20,21 @@ %description Blog theme allows users to have persistent themes for their blogs based on the theme they choose for their account. When others view -thier main blog page, or any node created by them, the reader will see -the authors theme instead of thier own. +their main blog page, or any node created by them, the reader will see +the author's theme instead of their own. The module works by using the hook_init function and setting the $custom_theme global variable to the node/blog owner's theme. +%description -l pl +Blog theme pozwala u?ytkownikom mie? trwa?e motywy dla swoich blog?w w +oparciu o motyw wybrany dla w?asnego konta. Kiedy inni ogl?daj? ich +g??wn? stron? bloga lub dowolny utworzony w?ze?, czytelnik zobaczy +motyw autora zamiast w?asnego. + +Modu? dzia?a poprzez u?ycie funkcji hook_init i ustawienie zmiennej +globalnej $custom_theme na motyw w?a?ciciela w?z?a/bloga. + %prep %setup -q -n %{modname} @@ -49,6 +59,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:54:16 qboosh +- pl + Revision 1.1 2005/08/18 14:19:10 glen - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/drupal-mod-blogtheme.spec?r1=1.1&r2=1.2&f=u From paszczus at pld-linux.org Fri Aug 26 14:57:28 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:36 2005 Subject: SPECS (DEVEL): mdadm.spec - updated to 2.0 - added URL - changed S... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:57:27 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2.0 - added URL - changed Source0 url to mirror on kernel.org (better) - changed bcond_without initrd to bcond_with initrd cause build fails with initrd - release 0.1 ---- Files affected: SPECS: mdadm.spec (1.26.2.2 -> 1.26.2.3) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.26.2.2 SPECS/mdadm.spec:1.26.2.3 --- SPECS/mdadm.spec:1.26.2.2 Sat Jan 8 15:33:04 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:57:22 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without initrd # don't build initrd version +%bcond_with initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc # %ifarch amd64 @@ -10,16 +10,17 @@ Summary: Tool for creating and maintaining software RAID devices Summary(pl): Narz?dzie do tworzenia i obs?ugi programowych macierzy RAID Name: mdadm -Version: 1.8.1 -Release: 1 +Version: 2.0 +Release: 0.1 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz -# Source0-md5: d6298c34590334cad3b951bc590e4007 +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-2.0.tar.bz2 +# Source0-md5: 802f301ea67db14773f49d6bed4f2411 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-degraded.patch -Patch1: %{name}-mdassemble.patch +#Patch0: %{name}-degraded.patch +#Patch1: %{name}-mdassemble.patch +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ %if %{with initrd} %{!?with_uClibc:BuildRequires: glibc-static} %{?with_uClibc:BuildRequires: uClibc-static} @@ -56,8 +57,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +#%patch0 -p1 +#%patch1 -p1 %build %if %{with initrd} @@ -150,6 +151,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26.2.3 2005/08/26 12:57:22 paszczus +- updated to 2.0 +- added URL +- changed Source0 url to mirror on kernel.org (better) +- changed bcond_without initrd to bcond_with initrd cause build fails with initrd +- release 0.1 + Revision 1.26.2.2 2005/01/08 14:33:04 qboosh - added mdassemble patch, fixed mdassemble build (on by default again) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.26.2.2&r2=1.26.2.3&f=u From adamg at pld-linux.org Fri Aug 26 17:52:34 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec - updated to 0.12.0... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 15:52:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.12.0 - switched to conf.d ---- Files affected: SPECS: php-pecl-http.spec (1.7 -> 1.8) , php4-pecl-http.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.7 SPECS/php-pecl-http.spec:1.8 --- SPECS/php-pecl-http.spec:1.7 Wed Jul 27 08:59:16 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 -Requires: php-common >= 3:5.0.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.7 2005/07/27 06:59:16 adamg - updated to 0.10.1 ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.1 SPECS/php4-pecl-http.spec:1.2 --- SPECS/php4-pecl-http.spec:1.1 Wed Jul 27 09:04:39 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 17:52:28 2005 @@ -6,21 +6,22 @@ Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP Name: php4-pecl-%{_modname} -Version: 0.10.1 +Version: 0.12.0 Release: 1 License: PHP 3.0 Group: Development/Languages/PHP Source0: http://pecl.php.net/get/%{_fmodname}-%{version}.tgz -# Source0-md5: 63967a512656acfbc1dcd7cb521f2527 +# Source0-md5: d180e5b95d22c911e40d8265f7c8fd96 URL: http://pecl.php.net/package/pecl_http/ BuildRequires: libtool BuildRequires: php4-devel >= 3:4.3.0 -Requires: php4-common >= 3:4.3.0 +Requires: %{_sysconfdir}/conf.d +%requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/php4 -%define extensionsdir %{_libdir}/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) %description Currently implemented features: @@ -65,24 +66,31 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{extensionsdir} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}} install %{_fmodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini +; Enable %{_modname} extension module +extension=%{_modname}.so +EOF %clean rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -%preun -if [ "$1" = "0" ]; then - %{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +%postun +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi %files %defattr(644,root,root,755) %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL} +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini %attr(755,root,root) %{extensionsdir}/%{_modname}.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -91,6 +99,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 15:52:28 adamg +- updated to 0.12.0 +- switched to conf.d + Revision 1.1 2005/07/27 07:04:39 adamg - new (cp from php-pecl-http) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Thu Aug 25 21:19:24 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: pcre.spec - 6.3 fixes CAN-2005-2491 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 19:19:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 6.3 fixes CAN-2005-2491 ---- Files affected: SPECS: pcre.spec (1.64 -> 1.65) ---- Diffs: ================================================================ Index: SPECS/pcre.spec diff -u SPECS/pcre.spec:1.64 SPECS/pcre.spec:1.65 --- SPECS/pcre.spec:1.64 Mon Aug 22 14:16:57 2005 +++ SPECS/pcre.spec Thu Aug 25 21:19:18 2005 @@ -275,11 +275,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.65 2005/08/25 19:19:18 glen +- 6.3 fixes CAN-2005-2491 + Revision 1.64 2005/08/22 12:16:57 adamg - fixed previous changelog entry Revision 1.63 2005/08/22 12:11:35 adamg -- updated to 6.3 +- updated to 6.3 (fixes CAN-2005-2491) - -cxx patch seems obsolete; removed Revision 1.62 2005/08/06 13:19:55 qboosh ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcre.spec?r1=1.64&r2=1.65&f=u From arekm at pld-linux.org Thu Aug 25 21:55:44 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (DEVEL): php-mod_php.conf - fix for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:55:44 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fix for php 5.1 ---- Files affected: SOURCES: php-mod_php.conf (1.3.4.2 -> 1.3.4.2.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-mod_php.conf diff -u SOURCES/php-mod_php.conf:1.3.4.2 SOURCES/php-mod_php.conf:1.3.4.2.4.1 --- SOURCES/php-mod_php.conf:1.3.4.2 Fri Jul 16 21:44:02 2004 +++ SOURCES/php-mod_php.conf Thu Aug 25 21:55:39 2005 @@ -1,6 +1,6 @@ LoadModule php5_module modules/libphp5.so - + AddType application/x-httpd-php .php AddType application/x-httpd-php .php3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-mod_php.conf?r1=1.3.4.2&r2=1.3.4.2.4.1&f=u From baggins at pld-linux.org Fri Aug 26 15:40:31 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - shift sock opt... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 13:40:31 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - shift sock options for ipt_ACCOUNT to work (overlap with ip_tables.c) ---- Files affected: SOURCES: linux-2.6-pom-ng-branch.diff (1.1.2.16 -> 1.1.2.17) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-pom-ng-branch.diff diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.17 --- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.16 Mon Aug 1 16:25:15 2005 +++ SOURCES/linux-2.6-pom-ng-branch.diff Fri Aug 26 15:40:25 2005 @@ -3937,11 +3937,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -+#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -+#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -+#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -+#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) ++#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) ++#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) ++#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) ++#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) +#define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES + /* CONTINUE verdict for targets */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.16&r2=1.1.2.17&f=u From paszczus at pld-linux.org Fri Aug 26 14:47:37 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: mdadm.spec - changed to mirror site, but there are more fil... In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - changed to mirror site, but there are more files than on main site ---- Files affected: SPECS: mdadm.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.38 SPECS/mdadm.spec:1.39 --- SPECS/mdadm.spec:1.38 Tue Jun 28 10:24:13 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:47:29 2005 @@ -14,12 +14,12 @@ Release: 2 License: GPL Group: Base -Source0: http://www.cse.unsw.edu.au/~neilb/source/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ +URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ BuildRequires: groff BuildRequires: rpmbuild(macros) >= 1.213 %if %{with initrd} @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.39 2005/08/26 12:47:29 paszczus +- changed to mirror site, but there are more files than on main site + Revision 1.38 2005/06/28 08:24:13 blues - don't require mdadm on _every_ system. Require strict version of mdadm-initrd in mdadm. Should be enought ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.38&r2=1.39&f=u From glen at pld-linux.org Fri Aug 26 10:51:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: builder - skip colourization if output is not terminal In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 08:51:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - skip colourization if output is not terminal ---- Files affected: SPECS: builder (1.325 -> 1.326) ---- Diffs: ================================================================ Index: SPECS/builder diff -u SPECS/builder:1.325 SPECS/builder:1.326 --- SPECS/builder:1.325 Tue Aug 23 21:41:39 2005 +++ SPECS/builder Fri Aug 26 10:50:55 2005 @@ -134,7 +134,7 @@ else wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet" wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused" - + GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS" GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS" OUTFILEOPT="-O" @@ -1398,8 +1398,8 @@ if [ "`diff --brief $SPECFILE $tmpdir/$SPECFILE`" ] ; then diff -u $SPECFILE $tmpdir/$SPECFILE > $tmpdir/$SPECFILE.diff - diffcol $tmpdir/$SPECFILE.diff | less -r - ( + if [ -t 1 ]; then + diffcol $tmpdir/$SPECFILE.diff | less -r while : ; do echo -n "Accept? [yn] " read ans @@ -1415,7 +1415,9 @@ ;; esac done - ) + else + cat $tmpdir/$SPECFILE.diff + fi else echo "The SPEC is perfect ;)" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/builder?r1=1.325&r2=1.326&f=u From qboosh at pld-linux.org Fri Aug 26 13:44:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (RA-branch): clamav.spec - typo, proper error messages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:44:51 2005 GMT Module: SPECS Tag: RA-branch ---- Log message: - typo, proper error messages ---- Files affected: SPECS: clamav.spec (1.131.2.26 -> 1.131.2.27) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.131.2.26 SPECS/clamav.spec:1.131.2.27 --- SPECS/clamav.spec:1.131.2.26 Thu Jul 28 14:09:20 2005 +++ SPECS/clamav.spec Fri Aug 26 13:44:46 2005 @@ -52,7 +52,7 @@ Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig Requires: /usr/sbin/usermod -Requires: %{name}-libs = %{epoch}%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc Provides: group(clamav) Provides: user(clamav) @@ -226,7 +226,7 @@ %pre if [ -n "`/usr/bin/getgid clamav`" ]; then if [ "`/usr/bin/getgid clamav`" != 43 ]; then - echo "Warning: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 + echo "Error: group clamav doesn't have gid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -235,7 +235,7 @@ fi if [ -n "`/bin/id -u clamav 2>/dev/null`" ]; then if [ "`/bin/id -u clamav`" != 43 ]; then - echo "Warning: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 + echo "Error: user clamav doesn't have uid=43. Correct this before installing clamav" 1>&2 exit 1 fi else @@ -369,6 +369,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.131.2.27 2005/08/26 11:44:46 qboosh +- typo, proper error messages + Revision 1.131.2.26 2005/07/28 12:09:20 hawk - release 2 (1 was already built for AC) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.131.2.26&r2=1.131.2.27&f=u From arekm at pld-linux.org Fri Aug 26 11:02:16 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (DEVEL): php.spec - use libtool for installing apache DSOs; ... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:02:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - use libtool for installing apache DSOs; rel 0.x.2 ---- Files affected: SPECS: php.spec (1.467.2.5 -> 1.467.2.6) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.5 SPECS/php.spec:1.467.2.6 --- SPECS/php.spec:1.467.2.5 Fri Aug 26 10:55:18 2005 +++ SPECS/php.spec Fri Aug 26 11:02:09 2005 @@ -76,7 +76,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.%{_rc}.1%{?with_hardening:hardened} +Release: 0.%{_rc}.2%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1705,14 +1705,12 @@ # install apache1 DSO module %if %{with apache1} -# TODO: use libtool here -install sapi/apache/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so +libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/ %endif # install apache2 DSO module %if %{with apache2} -# TODO: use libtool here -install sapi/apache2handler/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so +libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/ %endif libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} @@ -2913,6 +2911,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.6 2005/08/26 09:02:09 arekm +- use libtool for installing apache DSOs; rel 0.x.2 + Revision 1.467.2.5 2005/08/26 08:55:18 arekm - add PDO (base compiled in; database drivers as shared modules) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.5&r2=1.467.2.6&f=u From aredridel at pld-linux.org Thu Aug 25 21:24:49 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: ruby-open4.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Thu Aug 25 19:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ruby-open4.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u /dev/null SPECS/ruby-open4.spec:1.1 --- /dev/null Thu Aug 25 21:24:49 2005 +++ SPECS/ruby-open4.spec Thu Aug 25 21:24:44 2005 @@ -0,0 +1,61 @@ +# $Revision$, $Date$ +%define ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")') +%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') +%define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') +Summary: Ruby open3 with exit reporting +Name: ruby-open4 +Version: 0.1.0 +Release: 1 +License: GPL +Group: Development/Languages +Source0: http://www.codeforpeople.com/lib/ruby/open4/open4-%{version}.tgz +# Source0-md5: aab7035d09a19af38a7468d7f1cb93c9 +URL: http://www.codeforpeople.com/lib/ruby/open4/ +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: setup.rb +Requires: ruby +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ruby open3 with exit reporting. + +%prep +%setup -q -n open4-%{version} + +%build +cp /usr/share/setup.rb . +ruby setup.rb config \ + --rbdir=%{ruby_rubylibdir} \ + --sodir=%{ruby_archdir} + +rdoc --ri -o ri +rdoc -o rdoc + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{ruby_archdir} +install -d $RPM_BUILD_ROOT%{ruby_ridir} + +ruby setup.rb install --prefix=$RPM_BUILD_ROOT + +cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README* rdoc +%{ruby_ridir}/* +%{ruby_rubylibdir}/open4* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 19:24:44 aredridel +- added + ================================================================ From darekr at pld-linux.org Thu Aug 25 22:27:58 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: wondershaper.spec - proper License; sorted %verify flags - C... In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:27:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - proper License;sorted %verify flags - ChangeLog to %doc ---- Files affected: SPECS: wondershaper.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/wondershaper.spec diff -u SPECS/wondershaper.spec:1.3 SPECS/wondershaper.spec:1.4 --- SPECS/wondershaper.spec:1.3 Thu Aug 12 18:04:55 2004 +++ SPECS/wondershaper.spec Thu Aug 25 22:27:53 2005 @@ -4,15 +4,15 @@ Name: wondershaper Version: 1.1a Release: 1 -License: GPL +License: GPL v2 Group: Networking/Utilities Source0: http://lartc.org/wondershaper/%{name}-%{version}.tar.gz # Source0-md5: bbc5a3a4485ab286e337ce8550e7b990 Patch0: %{name}-conf.patch URL: http://lartc.org/wondershaper/ Requires: iproute2 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Many cablemodem and ADSL users experience horrifying latency while @@ -45,8 +45,8 @@ %files %defattr(644,root,root,755) -%doc README ChangeLog -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wshaper.conf +%doc ChangeLog README TODO +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wshaper.conf %attr(755,root,root) %{_bindir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/25 20:27:53 darekr +- proper License;sorted %verify flags +- ChangeLog to %doc + Revision 1.3 2004/08/12 16:04:55 radek - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wondershaper.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Thu Aug 25 20:25:16 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: mysql.spec - updated to 4.1.14 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 18:25:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.1.14 ---- Files affected: SPECS: mysql.spec (1.295 -> 1.296) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.295 SPECS/mysql.spec:1.296 --- SPECS/mysql.spec:1.295 Wed Jul 27 15:51:06 2005 +++ SPECS/mysql.spec Thu Aug 25 20:25:11 2005 @@ -24,11 +24,11 @@ Summary(zh_CN): MySQL???????????? Name: mysql Group: Applications/Databases -Version: 4.1.13 +Version: 4.1.14 Release: 1 License: GPL + MySQL FLOSS Exception Source0: http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz -# Source0-md5: 49d7a7314a2c9cf49e34777e73e66562 +# Source0-md5: 98ba9caea24b0a48ee06bb242ff2e37f Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -551,11 +551,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}comp_err mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump -# not our OS -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.plist -# unuseful stuff -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.spec - # functionality in initscript / rpm rm $RPM_BUILD_ROOT%{_bindir}/mysql_create_system_tables rm $RPM_BUILD_ROOT%{_bindir}/mysql_install_db @@ -565,7 +560,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fill_help_tables.sql rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/{pre,post}install +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure rm $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid # in %doc @@ -877,6 +872,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.296 2005/08/25 18:25:11 glen +- updated to 4.1.14 + Revision 1.295 2005/07/27 13:51:06 glen - guide where are the help tables data (probably it should be instead in iniscript?) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.295&r2=1.296&f=u From arekm at pld-linux.org Thu Aug 25 21:25:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (DEVEL): php.spec - zts is enabled for all SAPIs; --enable-f... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 19:25:18 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN ---- Files affected: SPECS: php.spec (1.467.2.3 -> 1.467.2.4) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.3 SPECS/php.spec:1.467.2.4 --- SPECS/php.spec:1.467.2.3 Thu Aug 25 20:57:03 2005 +++ SPECS/php.spec Thu Aug 25 21:25:13 2005 @@ -75,7 +75,7 @@ Name: php Version: 5.1.0 %define _rc RC1 -Release: 0.1%{?with_hardening:hardened} +Release: 0.%{_rc}.1%{?with_hardening:hardened} Epoch: 4 Group: Libraries License: PHP @@ -1424,6 +1424,7 @@ fi PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL +# Apache SAPIs should be last one listed here sapis=" fcgi cgi cli %if %{with apache1} @@ -1440,13 +1441,13 @@ ` case $sapi in cgi) - echo --enable-discard-path + echo --enable-discard-path --enable-force-cgi-redirect ;; cli) echo --disable-cgi ;; fcgi) - echo --enable-fastcgi --with-fastcgi=/usr + echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect ;; apxs1) ver=%(rpm -q --qf '%%{version}' apache1-apxs) @@ -1454,7 +1455,7 @@ ;; apxs2) ver=%(rpm -q --qf '%%{version}' apache-apxs) - echo --with-apxs2=%{apxs2} --with-apache-version=$ver --enable-maintainer-zts + echo --with-apxs2=%{apxs2} --with-apache-version=$ver ;; esac ` \ @@ -1464,6 +1465,7 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ @@ -1570,9 +1572,6 @@ # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la -# for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -# -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1 -# -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1 %if %{with apache1} %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1 sed -i -e " @@ -1587,19 +1586,18 @@ s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la %endif -%{__make} sapi/cgi/php -f Makefile.fcgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1 -DHAVE_SYS_PARAM_H=1 -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1" +# FCGI +cp -af php_config.h.fcgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.fcgi cp -r sapi/cgi sapi/fcgi rm -rf sapi/cgi/.libs sapi/cgi/*.lo -# notes: -# -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common) -# -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 - -%{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" +# CGI +cp -af php_config.h.cgi main/php_config.h +%{__make} sapi/cgi/php -f Makefile.cgi # CLI +cp -af php_config.h.cli main/php_config.h %{__make} sapi/cli/php -f Makefile.cli %install @@ -2751,6 +2749,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.4 2005/08/25 19:25:13 arekm +- zts is enabled for all SAPIs; --enable-force-cgi-redirect enabled for cgi/fcgi; use php_config.h.sapi instead of hand made CFLAGS_CLEAN + Revision 1.467.2.3 2005/08/25 18:57:03 arekm - -DFORCE_CGI_REDIRECT=1 for cgi version ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.3&r2=1.467.2.4&f=u From cvs at pld-linux.org Fri Aug 26 17:53:10 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6336@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:06 2005 New Revision: 6336 Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:06 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From areq at pld-linux.org Thu Aug 25 22:28:35 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: openvpn.spec - 2.0.2 In-Reply-To: References: Message-ID: Author: areq Date: Thu Aug 25 20:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.2 ---- Files affected: SPECS: openvpn.spec (1.94 -> 1.95) ---- Diffs: ================================================================ Index: SPECS/openvpn.spec diff -u SPECS/openvpn.spec:1.94 SPECS/openvpn.spec:1.95 --- SPECS/openvpn.spec:1.94 Mon Aug 22 11:33:20 2005 +++ SPECS/openvpn.spec Thu Aug 25 22:28:30 2005 @@ -2,12 +2,12 @@ Summary: VPN Daemon Summary(pl): Serwer VPN Name: openvpn -Version: 2.0.1 +Version: 2.0.2 Release: 1 License: GPL Group: Networking/Daemons Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz -# Source0-md5: fad7a08c0d68371c2c0e6428bcb98fa5 +# Source0-md5: 862f8788f080f669b1ae00a74ef68001 Source1: %{name}.init Source2: %{name}.sysconfig URL: http://openvpn.net/ @@ -93,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.95 2005/08/25 20:28:30 areq +- 2.0.2 + Revision 1.94 2005/08/22 09:33:20 glen - simplify %prep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openvpn.spec?r1=1.94&r2=1.95&f=u From arekm at pld-linux.org Thu Aug 25 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (DEVEL): php-lib64.patch - update In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:23:57 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - update ---- Files affected: SOURCES: php-lib64.patch (1.10.4.1 -> 1.10.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10.4.1 SOURCES/php-lib64.patch:1.10.4.2 --- SOURCES/php-lib64.patch:1.10.4.1 Thu Aug 25 19:26:19 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 20:23:51 2005 @@ -10,3 +10,16 @@ MING_DIR=$i break fi +diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag +--- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 ++++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 +@@ -4,7 +4,7 @@ + # + + phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpbuilddir = $(libdir)/php/build + + BUILD_FILES = \ + scripts/phpize.m4 \ + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.1&r2=1.10.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:38:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: siefs.spec - use _sbindir macro In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:38:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _sbindir macro ---- Files affected: SPECS: siefs.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/siefs.spec diff -u SPECS/siefs.spec:1.12 SPECS/siefs.spec:1.13 --- SPECS/siefs.spec:1.12 Tue Apr 5 20:52:00 2005 +++ SPECS/siefs.spec Thu Aug 25 22:38:34 2005 @@ -48,7 +48,6 @@ %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT%{_sbindir} %{__make} install \ @@ -65,7 +64,7 @@ %defattr(644,root,root,755) %doc AUTHORS README* ChangeLog COPYRIGHT.vmo2wav %attr(755,root,root) %{_bindir}/* -/sbin/mount.siefs +%{_sbindir}/mount.siefs %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/25 20:38:34 darekr +- use _sbindir macro + Revision 1.12 2005/04/05 18:52:00 saq - up to 0.5 - lots of various fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/siefs.spec?r1=1.12&r2=1.13&f=u From paszczus at pld-linux.org Fri Aug 26 14:49:19 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: mdadm.spec - use tar.bz2 compression In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 12:49:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use tar.bz2 compression ---- Files affected: SPECS: mdadm.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.39 SPECS/mdadm.spec:1.40 --- SPECS/mdadm.spec:1.39 Fri Aug 26 14:47:29 2005 +++ SPECS/mdadm.spec Fri Aug 26 14:49:14 2005 @@ -14,7 +14,7 @@ Release: 2 License: GPL Group: Base -Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tgz +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 # Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 Source1: %{name}.init Source2: %{name}.sysconfig @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/26 12:49:14 paszczus +- use tar.bz2 compression + Revision 1.39 2005/08/26 12:47:29 paszczus - changed to mirror site, but there are more files than on main site ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.39&r2=1.40&f=u From havner at pld-linux.org Fri Aug 26 10:38:02 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (LINUX_2_6): kernel.spec - atm patches commented out for now... In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 08:38:02 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - atm patches commented out for now, update configs ---- Files affected: SPECS: kernel.spec (1.441.2.1166 -> 1.441.2.1167) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1166 SPECS/kernel.spec:1.441.2.1167 --- SPECS/kernel.spec:1.441.2.1166 Fri Aug 26 01:59:40 2005 +++ SPECS/kernel.spec Fri Aug 26 10:37:56 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -%patch115 -p1 -%patch116 -p1 +#%%patch115 -p1 +#%%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1167 2005/08/26 08:37:56 havner +- atm patches commented out for now, update configs + Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1166&r2=1.441.2.1167&f=u From cvs at pld-linux.org Fri Aug 26 15:46:15 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6334@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:46:11 2005 New Revision: 6334 Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/trunk/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:46:11 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From arekm at pld-linux.org Thu Aug 25 20:57:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (DEVEL): php.spec - -DFORCE_CGI_REDIRECT=1 for cgi version In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:57:09 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - -DFORCE_CGI_REDIRECT=1 for cgi version ---- Files affected: SPECS: php.spec (1.467.2.2 -> 1.467.2.3) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.2 SPECS/php.spec:1.467.2.3 --- SPECS/php.spec:1.467.2.2 Thu Aug 25 20:39:05 2005 +++ SPECS/php.spec Thu Aug 25 20:57:03 2005 @@ -1597,7 +1597,7 @@ # -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 %{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1" + CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=1 -DPHP_WRITE_STDOUT=1" # CLI %{__make} sapi/cli/php -f Makefile.cli @@ -2751,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.3 2005/08/25 18:57:03 arekm +- -DFORCE_CGI_REDIRECT=1 for cgi version + Revision 1.467.2.2 2005/08/25 18:39:05 arekm - fix cli with readline; add xmlreader module; builds ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.2&r2=1.467.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 13:46:15 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: clamav.spec - triggerpostun dep really differs from postun dep In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 11:46:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - triggerpostun dep really differs from postun dep ---- Files affected: SPECS: clamav.spec (1.170 -> 1.171) ---- Diffs: ================================================================ Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.170 SPECS/clamav.spec:1.171 --- SPECS/clamav.spec:1.170 Thu Jul 28 14:18:51 2005 +++ SPECS/clamav.spec Fri Aug 26 13:46:10 2005 @@ -53,9 +53,9 @@ Requires(pre): /usr/sbin/useradd Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel -Requires(postun): sed >= 4.0 Requires(postun,pre): /usr/sbin/usermod Requires(post,preun): /sbin/chkconfig +Requires(triggerpostun): sed >= 4.0 Requires: /usr/sbin/usermod Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: bc @@ -365,6 +365,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.171 2005/08/26 11:46:10 qboosh +- triggerpostun dep really differs from postun dep + Revision 1.170 2005/07/28 12:18:51 hawk - release 3 (2 went to Ra) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.170&r2=1.171&f=u From darekr at pld-linux.org Thu Aug 25 22:01:20 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: words.spec - noreplace for %config - sorted %verify flags In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:01:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - noreplace for %config - sorted %verify flags ---- Files affected: SPECS: words.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/words.spec diff -u SPECS/words.spec:1.28 SPECS/words.spec:1.29 --- SPECS/words.spec:1.28 Sat Sep 25 13:20:55 2004 +++ SPECS/words.spec Thu Aug 25 22:01:14 2005 @@ -55,7 +55,7 @@ %files %defattr(644,root,root,755) %doc usr/dict/{README.linux.words*,README2.linux.words*} -%config %verify(not size mtime md5) %{_datadir}/dict/* +%config(noreplace) %verify(not md5 mtime size) %{_datadir}/dict/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -63,6 +63,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/25 20:01:14 darekr +- noreplace for %config +- sorted %verify flags + Revision 1.28 2004/09/25 11:20:55 radek - cosmetics (spaces -> tabs) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/words.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Thu Aug 25 20:05:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (DEVEL): php-readline.patch (NEW) - new In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:05:39 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - new ---- Files affected: SOURCES: php-readline.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/php-readline.patch diff -u /dev/null SOURCES/php-readline.patch:1.1.2.1 --- /dev/null Thu Aug 25 20:05:39 2005 +++ SOURCES/php-readline.patch Thu Aug 25 20:05:34 2005 @@ -0,0 +1,12 @@ +diff -urN php-5.1.0RC1.org/sapi/cli/config.m4 php-5.1.0RC1/sapi/cli/config.m4 +--- php-5.1.0RC1.org/sapi/cli/config.m4 2005-08-25 19:54:02.051504000 +0200 ++++ php-5.1.0RC1/sapi/cli/config.m4 2005-08-25 19:54:28.699452976 +0200 +@@ -29,7 +29,7 @@ + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" + ;; + *) +- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" + ;; + esac + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" ================================================================ From arekm at pld-linux.org Thu Aug 25 19:59:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (DEVEL): php-nohttpd.patch - fixed In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:59:17 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - fixed ---- Files affected: SOURCES: php-nohttpd.patch (1.1.4.1 -> 1.1.4.2) ---- Diffs: ================================================================ Index: SOURCES/php-nohttpd.patch diff -u SOURCES/php-nohttpd.patch:1.1.4.1 SOURCES/php-nohttpd.patch:1.1.4.2 --- SOURCES/php-nohttpd.patch:1.1.4.1 Thu Aug 25 15:51:01 2005 +++ SOURCES/php-nohttpd.patch Thu Aug 25 19:59:11 2005 @@ -6,10 +6,10 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then -+ if test "$APACHE_VERSION" -gt 0 -a -le 2000000; then ++ if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then -+ elif test "$APACHE_VERSION" -gt 0 -a -lt 2000044; then ++ elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-nohttpd.patch?r1=1.1.4.1&r2=1.1.4.2&f=u From darekr at pld-linux.org Thu Aug 25 22:50:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: cpio.spec - defined _bindir - use it In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:50:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _bindir - use it ---- Files affected: SPECS: cpio.spec (1.60 -> 1.61) ---- Diffs: ================================================================ Index: SPECS/cpio.spec diff -u SPECS/cpio.spec:1.60 SPECS/cpio.spec:1.61 --- SPECS/cpio.spec:1.60 Mon Aug 8 13:37:20 2005 +++ SPECS/cpio.spec Thu Aug 25 22:50:16 2005 @@ -152,13 +152,13 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS TODO -%attr(755,root,root) /bin/cpio -%{_infodir}/cpio.info* -%{_mandir}/man1/cpio.1* +%attr(755,root,root) %{_bindir}/cpio %lang(es) %{_mandir}/es/man1/cpio.1* %lang(hu) %{_mandir}/hu/man1/cpio.1* %lang(ja) %{_mandir}/ja/man1/cpio.1* %lang(pt_BR) %{_mandir}/pt_BR/man1/cpio.1* +%{_infodir}/cpio.info* +%{_mandir}/man1/cpio.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.61 2005/08/25 20:50:16 darekr +- defined _bindir - use it + Revision 1.60 2005/08/08 11:37:20 baggins - release 3 - an lstat, we need or symbolic links copy we will not ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpio.spec?r1=1.60&r2=1.61&f=u From darekr at pld-linux.org Thu Aug 25 22:54:22 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: cpudyn.spec - defined _sbindir to /sbin In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:54:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - defined _sbindir to /sbin ---- Files affected: SPECS: cpudyn.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpudyn.spec diff -u SPECS/cpudyn.spec:1.7 SPECS/cpudyn.spec:1.8 --- SPECS/cpudyn.spec:1.7 Sun May 15 14:28:23 2005 +++ SPECS/cpudyn.spec Thu Aug 25 22:54:17 2005 @@ -11,10 +11,12 @@ Source1: %{name}.init Source2: %{name}.conf URL: http://mnm.uib.es/~gallir/cpudyn/ -PreReq: rc-scripts +Requires: rc-scripts Requires(post,preun): /sbin/chkconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description This program control the speed in Intel SpeedStep, Pentium 4 Mobile and PowerPC machines with the cpufreq compiled in the kernel. @@ -45,12 +47,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},/etc/rc.d/init.d/,%{_mandir}/man8} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/cpudynd install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cpudyn.conf -install cpudynd $RPM_BUILD_ROOT/sbin -install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install cpudynd $RPM_BUILD_ROOT%{_sbindir} +install cpudynd.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -58,8 +60,8 @@ %files %defattr(644,root,root,755) %doc README faq.html -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cpudyn.conf -%attr(755,root,root) /sbin/cpudynd +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cpudyn.conf +%attr(755,root,root) %{_sbindir}/cpudynd %attr(754,root,root) /etc/rc.d/init.d/cpudynd %{_mandir}/man8/* @@ -69,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:54:17 darekr +- defined _sbindir to /sbin + Revision 1.7 2005/05/15 12:28:23 aflinta - up to version 1.0.1, it doesn't require cpufreqd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpudyn.spec?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Fri Aug 26 08:18:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: openoffice.org.spec - up to 1.9.124 In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 06:18:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.9.124 ---- Files affected: SPECS: openoffice.org.spec (1.546 -> 1.547) ---- Diffs: ================================================================ Index: SPECS/openoffice.org.spec diff -u SPECS/openoffice.org.spec:1.546 SPECS/openoffice.org.spec:1.547 --- SPECS/openoffice.org.spec:1.546 Sat Aug 13 16:32:34 2005 +++ SPECS/openoffice.org.spec Fri Aug 26 08:18:30 2005 @@ -21,9 +21,9 @@ %define ver 2.0 %define rel 0 -%define ooobver 1.9.123 +%define ooobver 1.9.124 %define snap SRC680 -%define bver m123 +%define bver m124 %define subver 680 %define fullver %{ver}.%{rel} @@ -35,20 +35,20 @@ Summary(pl): OpenOffice.org - pot??ny pakiet biurowy Name: openoffice.org Version: %{fullver} -Release: 0.6%{?with_vfs:vfs} +Release: 0.7%{?with_vfs:vfs} Epoch: 1 License: GPL/LGPL Group: X11/Applications Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz -# Source0-md5: 7906dcfeb2074971bdc37019582b32f5 +# Source0-md5: a82488bad72ea7006c7b269ad0652660 Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-core.tar.bz2 -# Source1-md5: 4c566ccd4131ceb99fcf7395cbae3d9e +# Source1-md5: 1f79a23b6d6a1339b137d12b156583a6 Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-system.tar.bz2 -# Source2-md5: e223aa4452b2148f657c107392539343 +# Source2-md5: db7079c78028378224aeb0f282cb051e Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-binfilter.tar.bz2 -# Source3-md5: cc5799f480c530e21b2f030e194aae1f +# Source3-md5: a11c3419e5be158056bfbe8f16bcc65a Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-lang.tar.bz2 -# Source4-md5: ec7638b7b508b7da5aa8dcea52fd823a +# Source4-md5: dc8bd51c89a032e9156a53a38039150d Source10: http://go-ooo.org/packages/%{snap}/ooo_custom_images-13.tar.bz2 # Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2 Source11: http://go-ooo.org/packages/%{snap}/ooo_crystal_images-6.tar.bz2 @@ -1447,7 +1447,7 @@ %prep %setup -q -n ooo-build-%{ooobver} -%patch0 -p1 +#%patch0 -p1 install -d src # sources, icons, KDE_icons @@ -2068,6 +2068,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.547 2005/08/26 06:18:30 arekm +- up to 1.9.124 + Revision 1.546 2005/08/13 14:32:34 arekm - up to m123 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.546&r2=1.547&f=u From arekm at pld-linux.org Thu Aug 25 20:50:13 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: php-pecl-cpdf.spec (NEW), php-pecl-dio.spec (NEW) - nothing... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:50:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - nothing; not available yet ---- Files affected: SPECS: php-pecl-cpdf.spec (NONE -> 1.1) (NEW), php-pecl-dio.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u /dev/null SPECS/php-pecl-cpdf.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-cpdf.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,74 @@ +# $Revision$, $Date$ +%define _modname cpdf +%define _status stable + +Summary: %{_modname} - extension module for PHP +Summary(pl): %{_modname} - modu? dla php +Name: php-pecl-%{_modname} +Version: 2.0.0 +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/cpdf/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +Obsoletes: php-pear-%{_modname} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +This is a dynamic shared object (DSO) for PHP that will add PDF +support through libcpdf library. + +In PECL status of this extension is: %{_status}. + +%description -l pl +Modu? PHP dodaj?cy obs?ug? plik?w PDF poprzez bibliotek? libcpdf. + +To rozszerzenie ma w PECL status: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ Index: SPECS/php-pecl-dio.spec diff -u /dev/null SPECS/php-pecl-dio.spec:1.1 --- /dev/null Thu Aug 25 20:50:13 2005 +++ SPECS/php-pecl-dio.spec Thu Aug 25 20:50:08 2005 @@ -0,0 +1,71 @@ +# $Revision$, $Date$ +%define _modname dio +%define _status stable + +Summary: %{_modname} - Direct I/O functions +Name: php-pecl-%{_modname} +Version: not-yet +Release: 1 +License: PHP 2.02 +Group: Development/Languages/PHP +Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz +# Source0-md5: ee90a55b753975faac607f4230ece2b4 +URL: http://pecl.php.net/package/dio/ +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: php-devel >= 3:5.0.0 +Requires: php-common >= 3:5.0.0 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _sysconfdir /etc/php +%define extensionsdir %{_libdir}/php + +%description +PHP supports the direct io functions as described in the Posix +Standard (Section 6) for performing I/O functions at a lower level +than the C-Language stream I/O functions (fopen(), fread(),..). The +use of the DIO functions should be considered only when direct control +of a device is needed. In all other cases, the standard filesystem +functions are more than adequate. + +In PECL status of this extension is: %{_status}. + +%prep +%setup -q -c + +%build +cd %{_modname}-%{version} +phpize +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{extensionsdir} + +install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini + +%preun +if [ "$1" = "0" ]; then + %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini +fi + +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{extensionsdir}/%{_modname}.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 18:50:08 arekm +- nothing; not available yet + ================================================================ From arekm at pld-linux.org Thu Aug 25 20:39:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (DEVEL): php.spec - fix cli with readline; add xmlreader mod... In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 18:39:10 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - fix cli with readline; add xmlreader module; builds ---- Files affected: SPECS: php.spec (1.467.2.1 -> 1.467.2.2) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.1 SPECS/php.spec:1.467.2.2 --- SPECS/php.spec:1.467.2.1 Thu Aug 25 16:09:44 2005 +++ SPECS/php.spec Thu Aug 25 20:39:05 2005 @@ -111,6 +111,7 @@ Patch17: %{name}-no_pear_install.patch Patch18: %{name}-zlib.patch Patch19: %{name}-sybase-fix.patch +Patch20: %{name}-readline.patch Patch21: %{name}-nohttpd.patch Patch22: %{name}-lib64.patch Patch23: %{name}-gd_imagerotate_enable.patch @@ -1280,6 +1281,24 @@ zwi?zanych z tymi plikami. Pozwala on tworzy? analizatory XML-a i nast?pnie definiowa? procedury obs?ugi dla r??nych zdarze? XML. +%package xmlreader +Summary: XML Reader extension module for PHP +Summary(pl): Modu? XML Reader dla PHP +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description xmlreader +This is a dynamic shared object (DSO) for PHP that will add XML Reader +support. The XMLReader extension is an XML Pull parser. The reader +acts as a cursor going forward on the document stream and stopping +at each node on the way. + +%description xmlreader -l pl +Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy +si? naka?dym w??le po drodze. + %package xmlrpc Summary: xmlrpc extension module for PHP Summary(pl): Modu? xmlrpc dla PHP @@ -1360,10 +1379,9 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch21 -p1 -%if "%{_lib}" == "lib64" %patch22 -p1 -%endif %patch23 -p1 %patch24 -p1 %patch25 -p1 @@ -1441,6 +1459,7 @@ esac ` \ --cache-file=config.cache \ + --with-libdir=%{_lib} \ --with-config-file-path=%{_sysconfdir} \ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ @@ -1475,11 +1494,11 @@ --enable-ucd-snmp-hack \ %{?with_wddx:--enable-wddx=shared} \ --enable-xml=shared \ - --with-xmlreader \ + --with-xmlreader=shared \ --with-bz2=shared \ %{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \ %{?with_db3:--with-db3}%{!?with_db3:--with-db4} \ - --with-dbase=shared \ + --enable-dbase=shared \ %if %{with xmlrpc} --with-expat-dir=shared,/usr \ %else @@ -1626,7 +1645,7 @@ ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php -install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +sed -e 's#/usr/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini @@ -2130,6 +2149,12 @@ %postun xml %extension_postun +%post xmlreader +%extension_post + +%postun xmlreader +%extension_postun + %post xmlrpc %extension_post @@ -2367,13 +2392,14 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/phpextdist %attr(755,root,root) %{_bindir}/phpize %attr(755,root,root) %{_bindir}/php-config %attr(755,root,root) %{_libdir}/libphp_common.so %{_libdir}/libphp_common.la %{_includedir}/php %{_libdir}/php/build +%{_mandir}/man1/phpize* +%{_mandir}/man1/php-config* %files bcmath %defattr(644,root,root,755) @@ -2697,6 +2723,11 @@ %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xml.ini %attr(755,root,root) %{extensionsdir}/xml.so +%files xmlreader +%defattr(644,root,root,755) +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/xmlreader.ini +%attr(755,root,root) %{extensionsdir}/xmlreader.so + %if %{with xmlrpc} %files xmlrpc %defattr(644,root,root,755) @@ -2720,6 +2751,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.467.2.2 2005/08/25 18:39:05 arekm +- fix cli with readline; add xmlreader module; builds + Revision 1.467.2.1 2005/08/25 14:09:44 arekm - started 5.1 (cpdf, dbx, dio, fam, mnogosearch, yp moved to PECL); nfy ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.1&r2=1.467.2.2&f=u From cvs at pld-linux.org Fri Aug 26 17:53:41 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Message-ID: <6337@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 17:53:40 2005 New Revision: 6337 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Log: - skb cannot be NULL in ip_ct_refresh_acct call due to events patch Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/net/ipv4/netfilter/ip_conntrack_amanda.c Fri Aug 26 17:53:40 2005 @@ -66,7 +66,7 @@ /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ - ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ); + ip_ct_refresh_acct(ct, ctinfo, *pskb, master_timeout * HZ); /* No data? */ dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr); From paszczus at pld-linux.org Fri Aug 26 15:01:47 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: mdadm.spec - md5 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 13:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - md5 ---- Files affected: SPECS: mdadm.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/mdadm.spec diff -u SPECS/mdadm.spec:1.40 SPECS/mdadm.spec:1.41 --- SPECS/mdadm.spec:1.40 Fri Aug 26 14:49:14 2005 +++ SPECS/mdadm.spec Fri Aug 26 15:01:42 2005 @@ -15,7 +15,7 @@ License: GPL Group: Base Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2 -# Source0-md5: 4de899ddb1ede1d2cafd183794874ce1 +# Source0-md5: 736705240e918294740929518477fc6f Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-degraded.patch @@ -151,6 +151,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.41 2005/08/26 13:01:42 paszczus +- md5 + Revision 1.40 2005/08/26 12:49:14 paszczus - use tar.bz2 compression ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mdadm.spec?r1=1.40&r2=1.41&f=u From darekr at pld-linux.org Thu Aug 25 22:51:08 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: cpg.spec - gpm-friendly Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Thu Aug 25 20:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - gpm-friendly Source0 ---- Files affected: SPECS: cpg.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cpg.spec diff -u SPECS/cpg.spec:1.7 SPECS/cpg.spec:1.8 --- SPECS/cpg.spec:1.7 Mon Aug 30 20:07:24 2004 +++ SPECS/cpg.spec Thu Aug 25 22:51:02 2005 @@ -6,7 +6,7 @@ Release: 1 License: distributable Group: Documentation -Source0: http://www.tldp.org/LDP/%{name}/Custom-Porting-Guide.html.tar.gz +Source0: http://www.tldp.org/LDP/cpg/Custom-Porting-Guide.html.tar.gz # Source0-md5: d3716f3750152305b10cd557e2bdbffd URL: http://www.tldp.org/LDP/cpg/html/index.html BuildArch: noarch @@ -48,6 +48,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/25 20:51:02 darekr +- gpm-friendly Source0 + Revision 1.7 2004/08/30 18:07:24 snurf - typo / formatting / etc. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cpg.spec?r1=1.7&r2=1.8&f=u From baggins at pld-linux.org Fri Aug 26 14:52:10 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (LINUX_2_6): kernel.spec - uncommented atm patches In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 12:52:10 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - uncommented atm patches ---- Files affected: SPECS: kernel.spec (1.441.2.1167 -> 1.441.2.1168) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1167 SPECS/kernel.spec:1.441.2.1168 --- SPECS/kernel.spec:1.441.2.1167 Fri Aug 26 10:37:56 2005 +++ SPECS/kernel.spec Fri Aug 26 14:52:05 2005 @@ -694,8 +694,8 @@ %patch112 -p1 %patch113 -p1 %patch114 -p1 -#%%patch115 -p1 -#%%patch116 -p1 +%patch115 -p1 +%patch116 -p1 %ifarch %{ix86} %if %{with abi} @@ -1490,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1168 2005/08/26 12:52:05 baggins +- uncommented atm patches + Revision 1.441.2.1167 2005/08/26 08:37:56 havner - atm patches commented out for now, update configs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1167&r2=1.441.2.1168&f=u From arekm at pld-linux.org Fri Aug 26 11:34:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: kdebase-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:34:51 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdebase-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdebase-branch.diff diff -u SOURCES/kdebase-branch.diff:1.16 SOURCES/kdebase-branch.diff:1.17 --- SOURCES/kdebase-branch.diff:1.16 Sun Aug 7 10:30:42 2005 +++ SOURCES/kdebase-branch.diff Fri Aug 26 11:34:45 2005 @@ -1,20 +1,7 @@ -Index: kate/plugins/defaultproject/katedefaultproject.desktop -=================================================================== ---- kate/plugins/defaultproject/katedefaultproject.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/plugins/defaultproject/katedefaultproject.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) -@@ -58,7 +58,7 @@ - Name[tr]=??ntan??ml?? Kate Proje Eklentisi - Name[uk]=?????????????? ???????????? ?????????????? Kate - Name[uz]=Kate ???????????? ???????????? ?????????????? --Name[zh_CN]=Kate ?????????????????? -+Name[zh_CN]=Kat ?????????????????? - Comment=Default Plugin for Projects - Comment[af]=Standaard Inprop Module vir Projekte - Comment[ar]=????? ?????? ?????????????????? ????? ?????????? Index: kate/data/x-kate-project.desktop =================================================================== ---- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -58,7 +58,7 @@ Comment[tr]=Kate Proje Dosyas?? Comment[uk]=???????? ?????????????? Kate @@ -26,8 +13,17 @@ Type=QString Index: kdepasswd/kcm/kcm_useraccount.desktop =================================================================== ---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -23,7 +23,7 @@ + Name[es]=Contrase??a y cuenta de usuario + Name[et]=Parool ja kasutaja konto + Name[eu]=Pasahitza eta erabiltzaile kontua +-Name[fi]=Salasanat & k??ytt??j??tilit ++Name[fi]=Salasanat ja k??ytt??j??tilit + Name[fr]=Compte utilisateur et mot de passe + Name[fy]=Wachtwurd en br??kersbehear + Name[ga]=Focal Faire & Cuntas ??s??ideora @@ -41,7 +41,7 @@ Name[nds]=Passwoort & Brukerkonto Name[nl]=Wachtwoord en gebruikerbeheer @@ -48,8 +44,8 @@ Comment[pt_BR]=Informa????es do usu??rio tais como senha, nome e e-mail Index: kpersonalizer/kpersonalizer.desktop =================================================================== ---- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -47,7 +47,7 @@ Name[nl]=KDE's Configuratie Assistent Name[nn]=Vegvisar for skrivebordsoppsett @@ -59,6 +55,19 @@ Name[pl]=Asystent ustawie?? ??rodowiska Name[pt]=Assistente de Configura????o do Ambiente de Trabalho Name[pt_BR]=Assistente de Configura????es para a ??rea de Trabalho +Index: kcontrol/background/background.desktop +=================================================================== +--- kcontrol/background/background.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/background/background.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -125,7 +125,7 @@ + Comment[nso]=Fetosa dipeakanyo tsa bokamorago + Comment[pa]=???????????????????????? ?????????????????? ??????????????? + Comment[pl]=Ustawienia t??a +-Comment[pt]=alterar a configura????o do fundo ++Comment[pt]=Alterar a configura????o do fundo + Comment[pt_BR]=Muda as configura????es do fundo da tela + Comment[ro]=Configureaz?? set??rile fundalului + Comment[ru]=?????????????????? ???????? ???????????????? ?????????? Index: kcontrol/krdb/kcs/Windows2000.kcsrc =================================================================== Cannot display: file marked as a binary type. @@ -75,10 +84,14 @@ =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/x-kcsrc +Index: kcontrol/krdb/kcs/WhiteOnBlack.kcsrc +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-kcsrc Index: kcontrol/usbview/kcmusb.desktop =================================================================== ---- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -185,6 +185,7 @@ Keywords[nl]=USB,devices,viewer,control,weergaveprogramma Keywords[nn]=USB,einingar,visar,kontroll @@ -89,8 +102,8 @@ Keywords[pt_BR]=USB,dispositivos,visualizador,controle Index: kcontrol/taskbar/kcmtaskbar.desktop =================================================================== ---- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nn]=Oppg??velinje Name[nso]=Bar ya Mosongwana @@ -109,10 +122,31 @@ Comment[pl]=Konfiguracja paska zada?? panelu Comment[pt]=Configura????o da barra de tarefas do painel Comment[pt_BR]=Configura a barra de tarefas +Index: kcontrol/kcontrol/searchwidget.cpp +=================================================================== +--- kcontrol/kcontrol/searchwidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kcontrol/searchwidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -124,6 +124,7 @@ + + // get the modules keyword list + QStringList kw = module->keywords(); ++ kw << module->moduleName(); + + // loop through the keyword list to populate _keywords + for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it) Index: kcontrol/nics/nic.desktop =================================================================== ---- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=V??rguliidesed + Name[eu]=Sare interfazeak + Name[fa]=????????????????? ???????? +-Name[fi]=Verkkoliittym??t ++Name[fi]=Verkkoliitynn??t + Name[fr]=Interfaces r??seau + Name[fy]=Netwurkynterfaces + Name[ga]=Comh??adain L??onra @@ -52,7 +52,7 @@ Name[nl]=Netwerkinterfaces Name[nn]=Nettverksgrensesnitt @@ -131,10 +165,113 @@ Comment[pl]=Informacje o interfejsie sieciowym Comment[pt]=Informa????es sobre as interfaces de rede Comment[pt_BR]=Informa????es sobre rede +Index: kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +=================================================================== +--- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -216,6 +216,7 @@ + QString path; + QString ref; + QString query; ++ QString nameFilter; + + if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) { + path = cmd; +@@ -228,7 +229,8 @@ + // but not for "/tmp/a#b", if "a#b" is an existing file, + // or for "/tmp/a?b" (#58990) + if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed +- && QFile::exists(url.path()) ) ++ && QFile::exists(url.path()) ++ && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query + { + path = url.path(); + ref = url.ref(); +@@ -338,6 +340,24 @@ + if( isLocalFullPath && !exists ) + { + exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 ); ++ if ( !exists ) { ++ // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter ++ // If the app using this filter doesn't support it, well, it'll simply error out itself ++ int lastSlash = path.findRev( '/' ); ++ if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments ++ { ++ QString fileName = path.mid( lastSlash + 1 ); ++ QString testPath = path.left( lastSlash + 1 ); ++ if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) ++ && stat( QFile::encodeName(testPath).data(), &buff ) == 0 ) ++ { ++ nameFilter = fileName; ++ kdDebug() << "Setting nameFilter to " << nameFilter << endl; ++ path = testPath; ++ exists = true; ++ } ++ } ++ } + } + + //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl; +@@ -370,7 +390,9 @@ + // Open "uri" as file:/xxx if it is a non-executable local resource. + if( isDir || S_ISREG( buff.st_mode ) ) + { +- //kdDebug() << "Abs path as local file" << endl; ++ //kdDebug() << "Abs path as local file or directory" << endl; ++ if ( !nameFilter.isEmpty() ) ++ u.setFileName( nameFilter ); + setFilteredURI( data, u ); + setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE ); + return true; +Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop +=================================================================== +--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -55,7 +55,7 @@ + Name[uz]=Wikipedia - ?????????? ???????????????????????? + Name[vi]=Wikipedia -B??? t??? ??i???n b??ch khoa m?? n ph?? + Name[wa]=Wikipedia - Li libe eciclopedeye +-Name[zh_CN]=Wikipedia - ? ?????????????? ???? ++Name[zh_CN]=???????????? - ? ?????????????? ???? + Name[zh_TW]=Wikipedia - ? ??????? Encyclopedia + ServiceTypes=SearchProvider + Keys=wp +@@ -66,4 +66,5 @@ + Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Query[pa]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=????????? ++Query[zh_CN]=http://zh.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go + Charset=utf8 +Index: kcontrol/locale/default/entry.desktop +=================================================================== +--- kcontrol/locale/default/entry.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,7 +16,7 @@ + Name[es]=Ingl??s de EEUU + Name[et]=Inglise (US) + Name[eu]=EEBBetako ingelesa +-Name[fi]=US-englanti ++Name[fi]=Yhdysvaltain englanti + Name[fr]=Anglais US + Name[fy]=VS Ingelsk + Name[gl]=Ingl??s de EEUU +Index: kcontrol/locale/language.desktop +=================================================================== +--- kcontrol/locale/language.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/locale/language.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -30,7 +30,7 @@ + Name[et]=Riik/regioon ja keel + Name[eu]=Herrialdea eta hizkuntza + Name[fa]=????????/???????? ?? ? ???????? +-Name[fi]=Maa/alue ja kieli ++Name[fi]=Maa tai alue ja kieli + Name[fr]=Pays & langue + Name[fy]=L??n/regio en taal + Name[ga]=T??r/R??igi??n agus Teanga Index: kcontrol/smserver/kcmsmserver.desktop =================================================================== ---- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -55,7 +55,7 @@ Name[nl]=Sessiebeheer Name[nn]=??kthandsamar @@ -153,10 +290,22 @@ Comment[pl]=Konfiguracja mened??era sesji i ustawie?? wylogowania Comment[pt]=Configura????o do gestor de sess??es e das op????es de finaliza????o Comment[pt_BR]=Configura o gerenciador de sess??o e defini????es de logout +Index: kcontrol/konq/desktop.desktop +=================================================================== +--- kcontrol/konq/desktop.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktop.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -16,6 +16,7 @@ + Name[az]=Masa ??stl??ri + Name[bg]=?????????????? ?????????????? + Name[bn]=?????????????????? ????????????????????? ++Name[br]=Lies burev + Name[bs]=Vi??estruki desktopi + Name[ca]=M??ltiples escriptoris + Name[cs]=Virtu??ln?? plochy Index: kcontrol/konq/desktoppath.desktop =================================================================== ---- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -50,7 +50,7 @@ Name[nl]=Paden Name[nn]=Stiar @@ -186,8 +335,8 @@ Index: kcontrol/konq/webappearance.desktop =================================================================== ---- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -199,8 +348,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filebehavior.desktop =================================================================== ---- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,3 +181,4 @@ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,s??rskilt f??nster,visa f??nster,beteende,minnesanv??ndning,hemadress,n??tverks??tg??rder,f??rloppsdialogruta,papperskorg,ta bort,bekr??ftelse Keywords[ta]=???????????????????????????,?????????????????? ?????????????????????,kfm,?????????????????????????????????,?????????????????? ?????????????????????????????????,????????? ??????????????????,???????????????????????? ??????????????????,??????????????????,?????????????????? ????????????????????????,?????????????????? ????????????????????????????????????,???????????????????????????????????? ????????????????????????????????????, ????????????????????? ????????????????????????,??????????????????????????????????????????, ??????????????????,????????????????????????????????????????????? @@ -208,8 +357,8 @@ +Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,???????????????,??????,????????????,????????????,????????????,??????,?? ?????????,??? URL,????????????,???????????????,?????????,??????,?????? Index: kcontrol/konq/fileappearance.desktop =================================================================== ---- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -221,8 +370,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/konq/filepreviews.desktop =================================================================== ---- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,7 +46,7 @@ Name[nds]=V??ransichten & Meta-Daten Name[nl]=Voorbeelden en meta-data @@ -234,8 +383,8 @@ Name[pt_BR]=Pr??-visualiza????es & Metadados Index: kcontrol/kicker/kicker_config_appearance.desktop =================================================================== ---- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -52,7 +52,7 @@ Name[nl]=Uiterlijk Name[nn]=Utsj??nad @@ -247,8 +396,8 @@ Name[pt_BR]=Apar??ncia Index: kcontrol/privacy/privacy.desktop =================================================================== ---- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -34,7 +34,7 @@ Comment[nds]=Privaatruum - Mit dit Moduul kannst Du dat Systeem vun de Sporen vun't Bruken reenmaken Comment[nl]=Privacy - een configuratiemodule waarmee u ongewenste sporen die gebruikers achterlaten kunt wissen. @@ -275,10 +424,23 @@ Name[pl]=Prywatno???? Name[pt]=Privacidade Name[pt_BR]=Privacidade +Index: kcontrol/kfontinst/thumbnail/FontThumbnail.cpp +=================================================================== +--- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- ThumbCreator *new_creator() ++ KDE_EXPORT ThumbCreator *new_creator() + { + return new KFI::CFontThumbnail; + } Index: kcontrol/kfontinst/lib/FcEngine.cpp =================================================================== ---- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -833,6 +833,7 @@ QString name(url.fileName()); int pos; @@ -289,8 +451,8 @@ if(-1==(pos=name.find(", "))) // No style information... Index: kcontrol/screensaver/testwin.h =================================================================== ---- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,9 +1,9 @@ #ifndef TESTWIN_H #define TESTWIN_H @@ -305,8 +467,8 @@ public: Index: kcontrol/screensaver/screensaver.desktop =================================================================== ---- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -117,7 +117,7 @@ Comment[nl]=Schermbeveiliging instellen Comment[nn]=Innstillingar for skjermsparar @@ -327,7 +489,7 @@ Index: kcontrol/screensaver/configure.in.in =================================================================== --- kcontrol/screensaver/configure.in.in (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,8 @@ +AC_HAVE_GL( + [ @@ -339,8 +501,8 @@ + ) Index: kcontrol/screensaver/kssmonitor.h =================================================================== ---- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,13 +1,12 @@ #ifndef KSSMONITOR_H #define KSSMONITOR_H @@ -361,7 +523,7 @@ Index: kcontrol/screensaver/kswidget.cpp =================================================================== --- kcontrol/screensaver/kswidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,40 @@ +#include + @@ -405,8 +567,8 @@ +#include "kswidget.moc" Index: kcontrol/screensaver/scrnsave.cpp =================================================================== ---- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -46,10 +46,7 @@ #include "scrnsave.h" @@ -422,7 +584,7 @@ Index: kcontrol/screensaver/kswidget.h =================================================================== --- kcontrol/screensaver/kswidget.h (.../tags/KDE/3.4.2/kdebase) (revision 0) -+++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 443740) ++++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -0,0 +1,13 @@ +#ifndef KSWIDGET_H +#define KSWIDGET_H @@ -439,8 +601,8 @@ +#endif Index: kcontrol/screensaver/Makefile.am =================================================================== ---- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -1,11 +1,12 @@ -AM_CPPFLAGS = $(all_includes) @@ -459,8 +621,8 @@ noinst_HEADERS = scrnsave.h Index: kcontrol/screensaver/testwin.cpp =================================================================== ---- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -4,7 +4,7 @@ class QXEmbed; @@ -472,8 +634,8 @@ KWin::setState( winId(), NET::StaysOnTop ); Index: kcontrol/kio/lanbrowser.desktop =================================================================== ---- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -49,7 +49,7 @@ Name[nl]=Lokaal netwerk Name[nn]=Lokalt nettverk @@ -493,8 +655,8 @@ Keywords[pt_BR]=samba,smb,windows,rede Index: kcontrol/kio/proxy.desktop =================================================================== ---- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -40,7 +40,7 @@ Name[nb]=Mellomtjener Name[nn]=Mellomtenar @@ -514,8 +676,8 @@ Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy Index: kcontrol/kio/cookies.desktop =================================================================== ---- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740) -+++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 443740) +--- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462) ++++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 453462) @@ -181,7 +181,7 @@ Keywords[ven]=Cookies,Burousini.Inithenete,WWW> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.16&r2=1.17&f=u From adamg at pld-linux.org Fri Aug 26 18:15:01 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: php-pecl-http.spec, php4-pecl-http.spec, template-php4-pecl... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:15:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - move %define calls to the top of the file ---- Files affected: SPECS: php-pecl-http.spec (1.8 -> 1.9) , php4-pecl-http.spec (1.2 -> 1.3) , template-php4-pecl.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pecl-http.spec diff -u SPECS/php-pecl-http.spec:1.8 SPECS/php-pecl-http.spec:1.9 --- SPECS/php-pecl-http.spec:1.8 Fri Aug 26 17:52:28 2005 +++ SPECS/php-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.8 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/php4-pecl-http.spec diff -u SPECS/php4-pecl-http.spec:1.2 SPECS/php4-pecl-http.spec:1.3 --- SPECS/php4-pecl-http.spec:1.2 Fri Aug 26 17:52:28 2005 +++ SPECS/php4-pecl-http.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,8 @@ %define _modname http %define _fmodname pecl_http %define _status beta +%define _sysconfdir /etc/php4 +%define extensionsdir %(php4-config --extension-dir 2>/dev/null) Summary: %{_modname} - extended HTTP support Summary(pl): %{_modname} - rozszerzona obs?uga protoko?u HTTP @@ -20,9 +22,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/php4 -%define extensionsdir %(php4-config --extension-dir 2>/dev/null) - %description Currently implemented features: - Building absolute URIs @@ -99,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.2 2005/08/26 15:52:28 adamg - updated to 0.12.0 - switched to conf.d ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.3 SPECS/template-php4-pecl.spec:1.4 --- SPECS/template-php4-pecl.spec:1.3 Thu Aug 25 10:31:34 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 18:14:52 2005 @@ -2,6 +2,7 @@ %define _modname - %define _status - %define _sysconfdir /etc/php4 +%define extensionsdir %(php-config --extension-dir 2>/dev/null) Summary: %{_modname} - Summary(pl): %{_modname} - @@ -19,8 +20,6 @@ Obsoletes: php-pear-%{_modname} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define extensionsdir %(php-config --extension-dir 2>/dev/null) - %description In PECL status of this extension is: %{_status}. @@ -73,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 16:14:52 adamg +- move %define calls to the top of the file + Revision 1.3 2005/08/25 08:31:34 glen - typo, merge installs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.3&r2=1.4&f=u From twittner at pld-linux.org Fri Aug 26 19:13:19 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: ocaml.spec - added ocaml-doc-info subpkg (but info page suf... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 17:13:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ocaml-doc-info subpkg (but info page suffer from lack of index). - moved html docs in separate subpkgs: ocaml-doc-html, ocaml-camlp4-doc-html. Updated descriptions. - replace (by editing Makefiles by sed) hardcoded `-O', `-pg', `-DPROFILING' with $(CFLAGS). Allow passing CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 - rel. 2 ---- Files affected: SPECS: ocaml.spec (1.98 -> 1.99) ---- Diffs: ================================================================ Index: SPECS/ocaml.spec diff -u SPECS/ocaml.spec:1.98 SPECS/ocaml.spec:1.99 --- SPECS/ocaml.spec:1.98 Mon Aug 15 17:59:03 2005 +++ SPECS/ocaml.spec Fri Aug 26 19:13:12 2005 @@ -16,7 +16,7 @@ Summary(pl): Kompilator OCamla (Objective Caml) oraz ?rodowisko programistyczne Name: ocaml Version: 3.08.4 -Release: 1 +Release: 2 Epoch: 1 License: distributable Vendor: Group of implementors @@ -39,6 +39,8 @@ # Source7-md5: 567bc681b4cc1cfcbbfb6fa5f012019b Source8: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz # Source8-md5: 77fa1da7375dea1393cc0b6cd802d7e1 +Source9: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz +# Source9-md5: 49b68ec07ccd7ce45eb6bd3f3fdee140 Patch0: %{name}-build.patch Patch1: %{name}-db3.patch Patch2: %{name}-objinfo.patch @@ -51,6 +53,7 @@ %{!?with_db3:BuildRequires: db-devel >= 4.1} %{?with_tk:BuildRequires: tk-devel} %if %{with emacs} +BuildRequires: sed >= 4.0 BuildRequires: xemacs BuildRequires: xemacs-common BuildRequires: xemacs-fsf-compat-pkg @@ -78,17 +81,38 @@ pracy, narz?dzia do tworzenia analizator?w leksykalnych oraz sk?adniowych (ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i biblioteki. +%package doc-html +Summary: HTML documentation for OCaml +Summary(pl): Dokumentacja dla OCamla w formacie HTML +Group: Development/Tools + +%description doc-html +HTML documentation for OCaml. + +%description doc-html -l pl +Dokumentacja dla OCamla w formacie HTML. + %package doc-ps Summary: PostScript documentation for OCaml Summary(pl): Dokumentacja dla OCamla w formacie PostScript Group: Development/Tools %description doc-ps -PostScript documentation for OCaml. HTML documentation is in main package. +PostScript documentation for OCaml. %description doc-ps -l pl -Dokumentacja dla OCamla w formacie PostScript. Dokumentacja HTML jest -w g??wnym pakiecie. +Dokumentacja dla OCamla w formacie PostScript. + +%package doc-info +Summary: Info documentation for OCaml +Summary(pl): Dokumentacja info dla OCamla +Group: Development/Tools + +%description doc-info +Info documentation for OCaml. + +%description doc-info -l pl +Dokumentacja info dla OCamla. %package emacs Summary: Emacs mode for OCaml @@ -215,6 +239,17 @@ poprawionej sk?adni OCamla. Potrafi tak?e t?umaczy? programy z jednej sk?adni na drug?. +%package camlp4-doc-html +Summary: Objective Caml Preprocessor - HTML documentation +Summary(pl): Preprocesor OCamla - dokumentacja HTML +Group: Development/Languages + +%description camlp4-doc-html +Objective Caml Preprocessor - HTML documentation. + +%description camlp4-doc-html -l pl +Preprocesor OCamla - dokumentacja HTML. + %package compiler-objects Summary: Compiled parts of OCaml compiler Summary(pl): Skompilowane cz??ci kompilatora OCamla @@ -278,9 +313,9 @@ mkdir examples tar xjf %{SOURCE7} -C examples tar xzf %{SOURCE8} -C examples +tar xzf %{SOURCE9} # order mess with docs somewhat -mkdir docs -mkdir docs/html +mkdir -p docs/html mv htmlman docs/html/ocaml cp %{SOURCE2} docs/ocaml.ps.gz mv camlp4-%{p4ver}-manual.html docs/html/camlp4 @@ -293,10 +328,18 @@ #%patch3 -p1 %patch4 -p1 -%build +# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS) +Makefiles=$(find . -type f -name Makefile\*) +%{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles +%{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles +%{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles +%{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile +%{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile + +%build cp -f /usr/share/automake/config.sub config/gnu ./configure \ - -cc "%{__cc} %{rpmcflags}" \ + -cc "%{__cc}" \ -bindir %{_bindir} \ -libdir %{_libdir}/%{name} \ -mandir %{_mandir}/man1 \ @@ -305,12 +348,12 @@ -with-pthread \ -x11lib /usr/X11R6/%{_lib} -%{__make} world bootstrap opt.opt -%{__make} -C tools objinfo +%{__make} world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall" +%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_examplesdir}/%{name}-{labltk-,}%{version}} +install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}} %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ @@ -360,9 +403,18 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man3 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp} +# install info pages +cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir} + %clean rm -rf $RPM_BUILD_ROOT +%post doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + +%postun doc-info +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 + %files runtime %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/ocamlrun @@ -378,7 +430,6 @@ %files %defattr(644,root,root,755) %doc LICENSE Changes README Upgrading -%doc docs/html/ocaml %attr(755,root,root) %{_bindir}/ocaml* %{!?_without_tk:%exclude %{_bindir}/ocamlbrowser} %exclude %{_bindir}/ocamlrun @@ -423,7 +474,6 @@ %files camlp4 %defattr(644,root,root,755) -%doc docs/html/camlp4* %attr(755,root,root) %{_bindir}/*camlp4* %attr(755,root,root) %{_bindir}/ocpp # Not installed since 3.05, is is needed? @@ -432,6 +482,10 @@ %{_mandir}/man*/*camlp4* %{_mandir}/man*/*ocpp* +%files camlp4-doc-html +%defattr(644,root,root,755) +%doc docs/html/camlp4* + %if %{with tk} %files labltk-devel %defattr(644,root,root,755) @@ -472,16 +526,34 @@ %{_libdir}/%{name}/ocamldoc/*.cm* %{_libdir}/%{name}/ocamldoc/*.a +%files doc-html +%defattr(644,root,root,755) +%doc docs/html/ocaml/* + %files doc-ps %defattr(644,root,root,755) %doc docs/*.ps.gz +%files doc-info +%defattr(644,root,root,755) +%{_infodir}/ocaml.info* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99 2005/08/26 17:13:12 twittner +- added ocaml-doc-info subpkg (but info page suffer from + lack of index). +- moved html docs in separate subpkgs: ocaml-doc-html, + ocaml-camlp4-doc-html. Updated descriptions. +- replace (by editing Makefiles by sed) hardcoded `-O', + `-pg', `-DPROFILING' with $(CFLAGS). Allow passing + CFLAGS="%%{rpmcflags}" directly to make. BR: sed >= 4.0 +- rel. 2 + Revision 1.98 2005/08/15 15:59:03 qboosh - updated to 3.08.4, removed outdated gcc-pr21291-workaround patch - updated pure-fun and ds-contrib source URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml.spec?r1=1.98&r2=1.99&f=u From baggins at pld-linux.org Fri Aug 26 12:51:18 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (LINUX_2_6): kernel-alpha-smp.config, kernel-alpha.config, ... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 10:51:18 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_ATM_DD=m ---- Files affected: SOURCES: kernel-alpha-smp.config (1.33.10.152 -> 1.33.10.153) , kernel-alpha.config (1.30.6.3.2.144 -> 1.30.6.3.2.145) , kernel-i386-smp.config (1.59.10.103 -> 1.59.10.104) , kernel-i386.config (1.82.10.108 -> 1.82.10.109) , kernel-ia64-smp.config (1.1.2.21 -> 1.1.2.22) , kernel-ia64.config (1.1.2.20 -> 1.1.2.21) , kernel-sparc-smp.config (1.9.2.6.2.80 -> 1.9.2.6.2.81) , kernel-sparc.config (1.37.2.109 -> 1.37.2.110) , kernel-sparc64-smp.config (1.48.2.95 -> 1.48.2.96) , kernel-sparc64.config (1.48.2.82 -> 1.48.2.83) , kernel-x86_64-smp.config (1.1.2.87 -> 1.1.2.88) , kernel-x86_64.config (1.1.2.87 -> 1.1.2.88) , kernel-xen0-x86_32-2.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_32-3.0.config (1.1.2.4 -> 1.1.2.5) , kernel-xen0-x86_64-3.0.config (1.1.2.8 -> 1.1.2.9) , kernel-xenU-x86_32-3.0.config (1.1.2.2 -> 1.1.2.3) , kernel-xenU-x86_64-3.0.config (1.1.2.2 -> 1.1.2.3) ---- Diffs: ================================================================ Index: SOURCES/kernel-alpha-smp.config diff -u SOURCES/kernel-alpha-smp.config:1.33.10.152 SOURCES/kernel-alpha-smp.config:1.33.10.153 --- SOURCES/kernel-alpha-smp.config:1.33.10.152 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha-smp.config Fri Aug 26 12:51:12 2005 @@ -1020,6 +1020,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-alpha.config diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.144 SOURCES/kernel-alpha.config:1.30.6.3.2.145 --- SOURCES/kernel-alpha.config:1.30.6.3.2.144 Wed Aug 17 11:11:31 2005 +++ SOURCES/kernel-alpha.config Fri Aug 26 12:51:12 2005 @@ -1034,6 +1034,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.103 SOURCES/kernel-i386-smp.config:1.59.10.104 --- SOURCES/kernel-i386-smp.config:1.59.10.103 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386-smp.config Fri Aug 26 12:51:12 2005 @@ -1406,6 +1406,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.108 SOURCES/kernel-i386.config:1.82.10.109 --- SOURCES/kernel-i386.config:1.82.10.108 Mon Aug 22 18:20:01 2005 +++ SOURCES/kernel-i386.config Fri Aug 26 12:51:12 2005 @@ -1422,6 +1422,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64-smp.config diff -u SOURCES/kernel-ia64-smp.config:1.1.2.21 SOURCES/kernel-ia64-smp.config:1.1.2.22 --- SOURCES/kernel-ia64-smp.config:1.1.2.21 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64-smp.config Fri Aug 26 12:51:12 2005 @@ -1024,6 +1024,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-ia64.config diff -u SOURCES/kernel-ia64.config:1.1.2.20 SOURCES/kernel-ia64.config:1.1.2.21 --- SOURCES/kernel-ia64.config:1.1.2.20 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-ia64.config Fri Aug 26 12:51:12 2005 @@ -1039,6 +1039,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc-smp.config diff -u SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 SOURCES/kernel-sparc-smp.config:1.9.2.6.2.81 --- SOURCES/kernel-sparc-smp.config:1.9.2.6.2.80 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc-smp.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc.config diff -u SOURCES/kernel-sparc.config:1.37.2.109 SOURCES/kernel-sparc.config:1.37.2.110 --- SOURCES/kernel-sparc.config:1.37.2.109 Thu Jul 28 22:37:31 2005 +++ SOURCES/kernel-sparc.config Fri Aug 26 12:51:12 2005 @@ -677,6 +677,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_SBA=y ================================================================ Index: SOURCES/kernel-sparc64-smp.config diff -u SOURCES/kernel-sparc64-smp.config:1.48.2.95 SOURCES/kernel-sparc64-smp.config:1.48.2.96 --- SOURCES/kernel-sparc64-smp.config:1.48.2.95 Wed Aug 17 18:46:48 2005 +++ SOURCES/kernel-sparc64-smp.config Fri Aug 26 12:51:12 2005 @@ -848,6 +848,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-sparc64.config diff -u SOURCES/kernel-sparc64.config:1.48.2.82 SOURCES/kernel-sparc64.config:1.48.2.83 --- SOURCES/kernel-sparc64.config:1.48.2.82 Thu Aug 18 14:06:12 2005 +++ SOURCES/kernel-sparc64.config Fri Aug 26 12:51:12 2005 @@ -849,6 +849,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64-smp.config diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.87 SOURCES/kernel-x86_64-smp.config:1.1.2.88 --- SOURCES/kernel-x86_64-smp.config:1.1.2.87 Thu Aug 18 14:10:18 2005 +++ SOURCES/kernel-x86_64-smp.config Fri Aug 26 12:51:12 2005 @@ -1181,6 +1181,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-x86_64.config diff -u SOURCES/kernel-x86_64.config:1.1.2.87 SOURCES/kernel-x86_64.config:1.1.2.88 --- SOURCES/kernel-x86_64.config:1.1.2.87 Thu Aug 18 14:10:17 2005 +++ SOURCES/kernel-x86_64.config Fri Aug 26 12:51:13 2005 @@ -1184,6 +1184,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-2.0.config diff -u SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-2.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-2.0.config Fri Aug 26 12:51:13 2005 @@ -1421,6 +1421,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_32-3.0.config diff -u SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.5 --- SOURCES/kernel-xen0-x86_32-3.0.config:1.1.2.4 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -1325,6 +1325,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xen0-x86_64-3.0.config diff -u SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.9 --- SOURCES/kernel-xen0-x86_64-3.0.config:1.1.2.8 Thu Aug 11 18:51:57 2005 +++ SOURCES/kernel-xen0-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -1293,6 +1293,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_ATM_LANAI=m CONFIG_ATM_ENI=m ================================================================ Index: SOURCES/kernel-xenU-x86_32-3.0.config diff -u SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_32-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_32-3.0.config Fri Aug 26 12:51:13 2005 @@ -609,6 +609,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ Index: SOURCES/kernel-xenU-x86_64-3.0.config diff -u SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.3 --- SOURCES/kernel-xenU-x86_64-3.0.config:1.1.2.2 Wed Aug 10 05:57:20 2005 +++ SOURCES/kernel-xenU-x86_64-3.0.config Fri Aug 26 12:51:13 2005 @@ -797,6 +797,7 @@ # # ATM drivers # +CONFIG_ATM_DD=m CONFIG_ATM_TCP=m CONFIG_PPP=m CONFIG_PPP_MULTILINK=y ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-alpha-smp.config?r1=1.33.10.152&r2=1.33.10.153&f=u http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.144&r2=1.30.6.3.2.145&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.103&r2=1.59.10.104&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.108&r2=1.82.10.109&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64-smp.config?r1=1.1.2.21&r2=1.1.2.22&f=u http://cvs.pld-linux.org/SOURCES/kernel-ia64.config?r1=1.1.2.20&r2=1.1.2.21&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc-smp.config?r1=1.9.2.6.2.80&r2=1.9.2.6.2.81&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.109&r2=1.37.2.110&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64-smp.config?r1=1.48.2.95&r2=1.48.2.96&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.82&r2=1.48.2.83&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.87&r2=1.1.2.88&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-2.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_32-3.0.config?r1=1.1.2.4&r2=1.1.2.5&f=u http://cvs.pld-linux.org/SOURCES/kernel-xen0-x86_64-3.0.config?r1=1.1.2.8&r2=1.1.2.9&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_32-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u http://cvs.pld-linux.org/SOURCES/kernel-xenU-x86_64-3.0.config?r1=1.1.2.2&r2=1.1.2.3&f=u From qboosh at pld-linux.org Fri Aug 26 19:59:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: msmtp.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 17:59:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: msmtp.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/msmtp.spec diff -u SPECS/msmtp.spec:1.49 SPECS/msmtp.spec:1.50 --- SPECS/msmtp.spec:1.49 Fri Aug 26 18:50:52 2005 +++ SPECS/msmtp.spec Fri Aug 26 19:59:31 2005 @@ -47,7 +47,8 @@ Wystarczy przekaza? klientowi pocztowemu, aby wywo?ywa? msmtp zamiast /usr/sbin/sendmail (w Mutcie to po prostu dodatkowa linia w pliku -konfiguracyjnym) lub zrobienie symlink-a do /usr/sbin/sendmail. +konfiguracyjnym) lub zrobienie dowi?zania symbolicznego do +/usr/sbin/sendmail. %prep %setup -q @@ -98,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/26 17:59:31 qboosh +- pl fix + Revision 1.49 2005/08/26 16:50:52 wolvverine - 1.4.4 - STBR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/msmtp.spec?r1=1.49&r2=1.50&f=u From glen at pld-linux.org Fri Aug 26 01:04:34 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: mozillaOrgPerson.schema - it's actually v0.6.4 In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:04:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - it's actually v0.6.4 ---- Files affected: SOURCES: mozillaOrgPerson.schema (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u SOURCES/mozillaOrgPerson.schema:1.1 SOURCES/mozillaOrgPerson.schema:1.2 --- SOURCES/mozillaOrgPerson.schema:1.1 Fri Aug 26 01:02:28 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:04:29 2005 @@ -1,5 +1,5 @@ # -# mozillaOrgPerson schema v. 0.6.3 +# mozillaOrgPerson schema v. 0.6.4 # # req. core @@ -174,4 +174,4 @@ mozillaCustom4 ) ) # not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' -# \ No newline at end of file +# ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mozillaOrgPerson.schema?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 01:02:33 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: mozillaOrgPerson.schema (NEW) - saved v0.6.3 from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:02:33 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved v0.6.3 from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaOrgPerson.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaOrgPerson.schema diff -u /dev/null SOURCES/mozillaOrgPerson.schema:1.1 --- /dev/null Fri Aug 26 01:02:33 2005 +++ SOURCES/mozillaOrgPerson.schema Fri Aug 26 01:02:28 2005 @@ -0,0 +1,177 @@ +# +# mozillaOrgPerson schema v. 0.6.3 +# + +# req. core +# req. cosine +# req. inetorgperson + +# attribute defs + +attributetype ( 1.3.6.1.4.1.13769.2.1.1 + NAME ( 'mozillaNickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.2 + NAME ( 'mozillaUseHtmlMail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.3 + NAME 'mozillaSecondEmail' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.4 + NAME 'mozillaHomeLocalityName' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.5 + NAME 'mozillaPostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.6 + NAME 'mozillaHomePostalAddress2' + EQUALITY caseIgnoreListMatch + SUBSTR caseIgnoreListSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.7 + NAME ( 'mozillaHomeState' ) SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.8 + NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.9 + NAME ( 'mozillaHomeCountryName' ) + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.10 + NAME ( 'mozillaHomeFriendlyCountryName' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.11 + NAME ( 'mozillaHomeUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.12 + NAME ( 'mozillaWorkUrl' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# un-comment for all LDAP server NOT supporting SYNTAX 2.16.840.1.113730.3.7.1 +attributetype ( 1.3.6.1.4.1.13769.2.1.13 + NAME ( 'nsAIMid' ) + DESC 'AOL Instant Messenger (AIM) Identity' + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.14 NAME ( 'mozillaHomeStreet' ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +# un-comment for Netscape 6.x and all other LDAP server supporting SYNTAX 2.16.840.1.113730.3.7.1 +# attributeTypes ( 2.16.840.1.113730.3.1.2013 +# NAME ( 'nsAIMid' ) +# DESC 'AOL Instant Messenger (AIM) Identity' +# SYNTAX 2.16.840.1.113730.3.7.1 ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.96 + NAME ( 'mozillaCustom1' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.97 + NAME ( 'mozillaCustom2' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.98 + NAME ( 'mozillaCustom3' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.1.99 + NAME ( 'mozillaCustom4' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# defined in "A Summary of the X.500(96) User Schema for use with LDAPv3" - RFC 2256 +# +# attributetype ( 2.5.4.6 NAME ( 'c' 'countryName' ) +# DESC 'RFC2256: ISO-3166 country 2-letter code' +# SUP name SINGLE-VALUE ) + +# defined in "The COSINE and Internet X.500 Schema" - RFC 1274 +# +# attributetype ( 0.9.2342.19200300.100.1.43 +# NAME ( 'co' 'friendlyCountryName' ) +# DESC 'RFC1274: friendly country name' +# EQUALITY caseIgnoreMatch +# SUBSTR caseIgnoreSubstringsMatch +# SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + + +# objectClass defs + +objectclass ( 1.3.6.1.4.1.13769.2.2.1 + NAME 'mozillaOrgPerson' + SUP top + AUXILIARY + MAY ( + sn $ + givenName $ + cn $ + displayName $ + mozillaNickname $ + title $ + telephoneNumber $ + facsimileTelephoneNumber $ + mobile $ + pager $ + homePhone $ + street $ + postalCode $ + mozillaPostalAddress2 $ + mozillaHomeStreet $ + mozillaHomePostalAddress2 $ + l $ + mozillaHomeLocalityName $ + st $ + mozillaHomeState $ + mozillaHomePostalCode $ + c $ + mozillaHomeCountryName $ + co $ + mozillaHomeFriendlyCountryName $ + ou $ + o $ + mail $ + mozillaSecondEmail $ + mozillaUseHtmlMail $ + nsAIMid $ + mozillaHomeUrl $ + mozillaWorkUrl $ + description $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 ) ) + +# not part of the official Mozilla schema but read by Mozilla: 'departmentNumber' and 'postOfficeBox' +# \ No newline at end of file ================================================================ From havner at pld-linux.org Fri Aug 26 16:07:08 2005 From: havner at pld-linux.org (havner) Date: Tue Dec 20 10:39:37 2005 Subject: CVSROOT: users - ares's mail change (on his request) In-Reply-To: References: Message-ID: Author: havner Date: Fri Aug 26 14:07:08 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - ares's mail change (on his request) ---- Files affected: CVSROOT: users (1.386 -> 1.387) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.386 CVSROOT/users:1.387 --- CVSROOT/users:1.386 Fri Aug 26 12:39:16 2005 +++ CVSROOT/users Fri Aug 26 16:07:03 2005 @@ -14,7 +14,7 @@ arekm:miskiewicz@beep.pl:Arkadiusz Mi?kiewicz:arekm@jabber.bnet.pl arekmat:arekmat@amba.bydg.pdi.net:Arkadiusz Grz?dzicki areq:areq@areq.eu.org:Arkadiusz Patyk -ares:ares@betanet.pl:Piotr Siwicki +ares:p.siwicki@mpoczta.net:Piotr Siwicki arturs:arturs@linuxpl.org:Artur Skura averne:averne@pld-dc.org:Marcin Doli?ski:averne@kamp.pl baggins:baggins@sith.mimuw.edu.pl:Jan R?korajski ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.386&r2=1.387&f=u From glen at pld-linux.org Fri Aug 26 00:31:11 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: mozillaAddressBookEntry.schema (NEW) - saved from https:/... In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 22:31:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - saved from https://bugzilla.mozilla.org/show_bug.cgi?id=116692 ---- Files affected: SOURCES: mozillaAddressBookEntry.schema (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mozillaAddressBookEntry.schema diff -u /dev/null SOURCES/mozillaAddressBookEntry.schema:1.1 --- /dev/null Fri Aug 26 00:31:11 2005 +++ SOURCES/mozillaAddressBookEntry.schema Fri Aug 26 00:31:06 2005 @@ -0,0 +1,147 @@ +# Mozilla: @VERSION@ +# +# mozillaAddressBookEntry +# +# This file contains LDAPv3 schema for use with the Mozilla Address Book +# and is intended to ... + +# Depends upon +# Definition of an X.500 Attribute Type and an Object Class to Hold +# Uniform Resource Identifiers (URIs) [RFC2079], and A Summary of +# the X.500(96) User Schema for use with LDAPv3 [RFC2256] (core.schema) +# +# The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema) +# +# The InetOrgPerson Schema [RFC2798] (inetorgperson.schema) + +# 1.3.6.1.4.1.13769.4.x - Mozilla AB 'Other' tab + +attributetype ( 1.3.6.1.4.1.13769.4.1 NAME 'mozillaCustom1' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.2 NAME 'mozillaCustom2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.3 NAME 'mozillaCustom3' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.4.4 NAME 'mozillaCustom4' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + + +# 1.3.6.1.4.1.13769.3.x - Mozilla AB 'Address' tab + +attributetype ( 1.3.6.1.4.1.13769.3.1 NAME 'mozillaHomeStreet' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.2 NAME 'mozillaHomeStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.3 NAME 'mozillaHomeLocalityName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.4 NAME 'mozillaHomeState' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.5 NAME 'mozillaHomePostalCode' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.6 NAME 'mozillaHomeCountryName' + SUP name SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.7 NAME 'mozillaHomeUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.8 NAME 'mozillaWorkStreet2' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.3.9 NAME 'mozillaWorkUrl' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} SINGLE-VALUE ) + +# 1.3.6.1.4.1.13769.2.x - Mozilla AB 'Contact' tab + +attributetype ( 1.3.6.1.4.1.13769.2.1 + NAME ( 'mozillaNickname' 'xmozillanickname' ) + SUP name ) + +attributetype ( 1.3.6.1.4.1.13769.2.2 + NAME ( 'mozillaSecondEmail' 'xmozillasecondemail' ) + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.13769.2.3 + NAME ( 'mozillaUseHtmlMail' 'xmozillausehtmlmail' ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) + +# AOL Instant Messenger (AIM) Identity +attributetype ( 1.3.6.1.4.1.13769.2.4 + NAME ( 'nsAIMid' 'nscpaimscreenname' ) + EQUALITY telephoneNumberMatch + SUBSTR telephoneNumberSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 ) + +# 1.3.6.1.4.1.13769.9 - Mozilla AB objectclasses + +# The mozillaAddressBookEntry object class is used to define entries +# representing Cards in the Mozilla Address Book. The commonName attribute +# is used for naming entries of this object class, but may not be unique. + +objectclass ( 1.3.6.1.4.1.13769.9.1 NAME 'mozillaAddressBookEntry' + SUP top AUXILIARY + MUST ( cn ) + MAY( c $ + department $ + description $ + fax $ + givenName $ + homeTelephoneNumber $ + l $ + mail $ + mobile $ + mozillaCustom1 $ + mozillaCustom2 $ + mozillaCustom3 $ + mozillaCustom4 $ + mozillaHomeCountryName $ + mozillaHomeLocalityName $ + mozillaHomePostalCode $ + mozillaHomeState $ + mozillaHomeStreet $ + mozillaHomeStreet2 $ + mozillaHomeUrl $ + mozillaNickname $ + mozillaSecondeMail $ + mozillaUseHtmlMail $ + mozillaWorkStreet2 $ + mozillaWorkUrl $ + nsAIMid $ + o $ + ou $ + pager $ + postalCode $ + postOfficeBox $ + sn $ + st $ + street $ + telephoneNumber $ + title ) ) + ================================================================ From arekm at pld-linux.org Fri Aug 26 18:07:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: kdelibs.spec - rel 3; rebuild In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 16:07:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3; rebuild ---- Files affected: SPECS: kdelibs.spec (1.415 -> 1.416) ---- Diffs: ================================================================ Index: SPECS/kdelibs.spec diff -u SPECS/kdelibs.spec:1.415 SPECS/kdelibs.spec:1.416 --- SPECS/kdelibs.spec:1.415 Thu Aug 11 11:46:18 2005 +++ SPECS/kdelibs.spec Fri Aug 26 18:07:07 2005 @@ -21,7 +21,7 @@ Summary(uk): K Desktop Environment - ?????????? Name: kdelibs Version: %{_ver} -Release: 2 +Release: 3 Epoch: 9 License: LGPL Group: X11/Libraries @@ -959,6 +959,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.416 2005/08/26 16:07:07 arekm +- rel 3; rebuild + Revision 1.415 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.415&r2=1.416&f=u From jajcus at pld-linux.org Fri Aug 26 10:43:12 2005 From: jajcus at pld-linux.org (jajcus) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: Zope3.spec (NEW) - new, based on Zope.spec, NFY In-Reply-To: References: Message-ID: Author: jajcus Date: Fri Aug 26 08:43:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new, based on Zope.spec, NFY ---- Files affected: SPECS: Zope3.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u /dev/null SPECS/Zope3.spec:1.1 --- /dev/null Fri Aug 26 10:43:12 2005 +++ SPECS/Zope3.spec Fri Aug 26 10:43:05 2005 @@ -0,0 +1,255 @@ +# $Revision$, $Date$ + +Summary: An application server and portal toolkit for building Web sites +Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web +Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW +Summary(pt_BR): Um servidor de aplica??es e um conjunto de ferramentas para constru??o de sites Web +Name: Zope3 +Version: 3.1.0 +%define sub_ver c1 +Release: 0.%{sub_ver}.0.1 +License: Zope Public License (ZPL) +Group: Networking/Daemons +Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz +# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +Source1: %{name}.init +Source2: %{name}.sysconfig +Source3: %{name}.logrotate +URL: http://dev.zope.org/Zope3 +BuildRequires: python-devel >= 1:2.4.1 +BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.213 +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(post,preun): /sbin/chkconfig +Requires: expat >= 1.95.7 +Requires: logrotate +Requires: python >= 2.4.1 +Requires: python-modules >= 2.4.1 +Requires: python-libs >= 2.4.1 +Requires: python-zope-interface = %{epoch}:%{version}-%{release} +%pyrequires_eq python +Provides: group(zope) +Provides: user(zope) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define zope_dir /usr/lib/zope3 + +%description +The Z Object Programming Environment (Zope) is a free, Open Source +Python-based application server for building high-performance, dynamic +web sites, using a powerful and simple scripting object model and +high-performance, integrated object database. + +This project is a redesign of Zope 2 and seeks to improve the Zope development +experience through the use of Interfaces and Components. + +%description -l es +Zope es una aplicaci?n basada en Python, Open Source[tm], para la +construcci?n de sitios din?micos, usa un modelo de escritura de +guiones poderoso y sencillo. Para instalar la aplicaci?n Zope, instale +ese paquete y despu?s, Zope-server, para un servidor HTTP integrado +simple, Zope-pcgi, para uso con el servidor Apache. Si desea instalar +solamente algunas partes de la aplicaci?n Zope, est?n diponibles otros +subpaquetes, usted debe instalar ?stos en vez de ese RPM. + +%description -l pl +Zope (Z Object Programming Environment - Obiektowe ?rodowisko +Programistyczne Z) jest opartym o Pythona serwerem aplikacji do +tworzenia wysoko wydajnych, dynamicznych serwis?w WWW, przy u?yciu +u?ytecznego i prostego modelu obiektowego skrypt?w oraz wysoko +wydajnej zintegrowanej obiektowej bazy danych. + +%description -l pt_BR +Zope ? uma aplica??o baseada em Python, Open Source[tm], para +constru??o de sites din?micos, usando um modelo de scripting poderoso +e simples Para instalar o Zope, instale esse pacote e depois, ou o +Zope-server, para um servidor HTTP integrado simples, ou Zope-pcgi, +para uso com o Apache. Se voc? quiser instalar apenas algumas partes +do Zope, outros sub-pacotes est?o dispon?veis, e voc? deveria instalar +eles ao inv?s desse RPM. + +%package -n python-zope +Summary: Python packages developed as part of the Zope 3 project. +Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Group: Development/Tools +Obsoletes: ZopeInterface +Provides: ZopeInterface +Provides: python-zope-cachedescriptors +Provides: python-zope-component +Provides: python-zope-configuration +Provides: python-zope-deprecation +Provides: python-zope-documenttemplate +Provides: python-zope-event +Provides: python-zope-exceptions +Provides: python-zope-hookable +Provides: python-zope-i18n +Provides: python-zope-i18nmessageid +Provides: python-zope-index +Provides: python-zope-interface +Provides: python-zope-modulealias +Provides: python-zope-pagetemplate +Provides: python-zope-proxy +Provides: python-zope-publisher +Provides: python-zope-schema +Provides: python-zope-security +Provides: python-zope-server +Provides: python-zope-structuredtext +Provides: python-zope-tal +Provides: python-zope-tales +Provides: python-zope-testing +Provides: python-zope-thread + +%description -n python-zope +The "zope" package is a pure namespace package holding packages developed as +part of the Zope 3 project. + +Generally, the immediate subpackages of the "zope" package should be useful and +usable outside of the Zope application server. Subpackages of the "zope" +package should have minimal interdependencies, although most depend on +"zope.interface". + +%prep +%setup -q -n Zope-%{version}%{sub_ver} + +%build +./configure \ + --prefix=%{zope_dir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT{%{py_sitedir},%{_sbindir}} \ + $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ + $RPM_BUILD_ROOT{/var/lib/zope3/main,/var/run/zope3,/var/log/zope3/main} \ + $RPM_BUILD_ROOT%{_sysconfdir}/zope3/main + +python install.py -q install --skip-build --home "%{zope_dir}" --root "$RPM_BUILD_ROOT" +mv $RPM_BUILD_ROOT%{zope_dir}/lib/python/zope $RPM_BUILD_ROOT%{py_sitedir} + +find $RPM_BUILD_ROOT%{py_sitedir}/zope -name '*.txt' -o -name '*.cfg' | xargs rm + +%py_comp $RPM_BUILD_ROOT%{py_sitedir}/zope +%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/zope + +ln -sf %{zope_dir}/bin/mkzopeinstance $RPM_BUILD_ROOT%{_sbindir}/mkzope3instance +for f in zconfig zconfig_schema2html zopetest ; do + ln -sf %{zope_dir}/bin/"$f" $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done +for f in mkzeoinst runzeo zdctl zdrun zeoctl zeopasswd ; do + ln -sf %{zope_dir}/bin/"$f".py $RPM_BUILD_ROOT%{_sbindir}/"$f"3 +done + +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/zope3 +install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/zope3 +install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/zope3 + +touch $RPM_BUILD_ROOT/var/log/zope3/main/event.log +touch $RPM_BUILD_ROOT/var/log/zope3/main/Z2.log + + +#install -d $RPM_BUILD_ROOT{/var/lib/zope/main,/var/run/zope,/var/log/zope/main} \ +# $RPM_BUILD_ROOT{/etc/logrotate.d,/etc/sysconfig,/etc/rc.d/init.d} \ +# $RPM_BUILD_ROOT{%{_sysconfdir}/zope/main,%{_sbindir}} \ +# $RPM_BUILD_ROOT%{zope_dir}/bin +# +#ln -sfn /usr/bin/python $RPM_BUILD_ROOT%{zope_dir}/bin/python +# +#%{__make} install \ +# INSTALL_FLAGS="--root $RPM_BUILD_ROOT" +# +#mv $RPM_BUILD_ROOT%{zope_dir}/bin/zpasswd.py $RPM_BUILD_ROOT%{_sbindir}/zpasswd +#mv $RPM_BUILD_ROOT%{zope_dir}/skel $RPM_BUILD_ROOT%{_sysconfdir}/zope +#mv $RPM_BUILD_ROOT{%{zope_dir}/import/*,%{_sysconfdir}/zope/skel/import} +# +#rm -rf $RPM_BUILD_ROOT%{zope_dir}/doc +#rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/log +#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/zope/skel/bin/{runzope.bat,zopeservice.py}.in +# +#install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/mkzopeinstance +#install %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}/mkzeoinstance +#install %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/runzope +#install %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/zopectl +#install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/installzopeproduct +# + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +%groupadd -g 112 zope +%useradd -u 112 -d /var/lib/zope/main -s /bin/false -c "Zope User" -g zope zope + +%post +/sbin/chkconfig --add zope +if [ ! -f /etc/zope/main/zope.conf ] ; then + echo "Creating initial 'main' instance..." + /usr/sbin/mkzope3instance main zope:zope + echo "Instance created. Listening on 127.0.0.1:8080, initial user: 'zope' with password: 'zope'" +fi + +%preun +if [ "$1" = "0" ]; then + if [ -f /var/lock/subsys/zope ]; then + /etc/rc.d/init.d/zope stop + fi + /sbin/chkconfig --del zope +fi + +%postun +if [ "$1" = "0" ] ; then + %userremove zope + %groupremove zope +fi + +%files +%defattr(644,root,root,755) +%doc Zope/doc/* +%attr(754,root,root) /etc/rc.d/init.d/zope3 +%attr(755,root,root) %{_sbindir}/* +%dir %{zope_dir} +%dir %{zope_dir}/bin +%attr(755,root,root) %{zope_dir}/bin/* +%{zope_dir}/include +%{zope_dir}/lib +%dir %{zope_dir}/zopeskel +%dir %{zope_dir}/zopeskel/bin +%attr(755,root,root) %{zope_dir}/zopeskel/bin/* +%{zope_dir}/zopeskel/etc +%{zope_dir}/zopeskel/lib +%{zope_dir}/zopeskel/log +%{zope_dir}/zopeskel/var +%{zope_dir}/zopeskel/README.txt +%{py_sitedir}/zope/app +%attr(775,zope,zope) %dir /var/run/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3 +%attr(775,zope,zope) %dir /var/lib/zope3/main +%attr(775,zope,zope) %dir /var/log/zope3 +%attr(775,zope,zope) %dir /var/log/zope3/main +%attr(640,root,root) %dir /etc/zope3 +%attr(640,root,root) %dir /etc/zope3/main +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/zope3 +%attr(640,root,root) /etc/sysconfig/zope3 +%ghost /var/log/zope3/main/event.log +%ghost /var/log/zope3/main/Z2.log + +%files -n python-zope +%defattr(644,root,root,755) +%{py_sitedir}/zope +%exclude %{py_sitedir}/zope/app + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/26 08:43:05 jajcus +- new, based on Zope.spec, NFY + ================================================================ From baggins at pld-linux.org Fri Aug 26 17:54:53 2005 From: baggins at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (LINUX_2_6): kernel-netfilter.config CONFIG_IP_NF_PPTP dis... In-Reply-To: References: Message-ID: Author: baggins Date: Fri Aug 26 15:54:53 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: CONFIG_IP_NF_PPTP disabled as it's sure to cause Oops ---- Files affected: SOURCES: kernel-netfilter.config (1.34.2.43 -> 1.34.2.44) ---- Diffs: ================================================================ Index: SOURCES/kernel-netfilter.config diff -u SOURCES/kernel-netfilter.config:1.34.2.43 SOURCES/kernel-netfilter.config:1.34.2.44 --- SOURCES/kernel-netfilter.config:1.34.2.43 Thu Jul 28 22:33:41 2005 +++ SOURCES/kernel-netfilter.config Fri Aug 26 17:54:48 2005 @@ -77,8 +77,8 @@ CONFIG_IP_NF_NAT_H323=m CONFIG_IP_NF_H323=m CONFIG_IP_NF_CT_PROTO_GRE=m -CONFIG_IP_NF_PPTP=m -CONFIG_IP_NF_NAT_PPTP=m +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_NAT_PPTP is not set CONFIG_IP_NF_NAT_PROTO_GRE=m CONFIG_IP_NF_MATCH_IPV4OPTIONS=m CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP=m ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.43&r2=1.34.2.44&f=u From paszczus at pld-linux.org Fri Aug 26 16:33:03 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: ocaml-lablgl.spec - rel up for rebuild with ocaml 3.08.4 In-Reply-To: References: Message-ID: Author: paszczus Date: Fri Aug 26 14:33:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel up for rebuild with ocaml 3.08.4 ---- Files affected: SPECS: ocaml-lablgl.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/ocaml-lablgl.spec diff -u SPECS/ocaml-lablgl.spec:1.18 SPECS/ocaml-lablgl.spec:1.19 --- SPECS/ocaml-lablgl.spec:1.18 Thu Mar 17 09:36:09 2005 +++ SPECS/ocaml-lablgl.spec Fri Aug 26 16:32:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Wi?zania OpenGL dla OCamla Name: ocaml-lablgl Version: 1.01 -Release: 3 +Release: 4 License: BSD Group: Libraries Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz @@ -243,6 +243,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/26 14:32:56 paszczus +- rel up for rebuild with ocaml 3.08.4 + Revision 1.18 2005/03/17 08:36:09 paszczus - release up for rebuild with ocaml ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.18&r2=1.19&f=u From adamg at pld-linux.org Fri Aug 26 18:25:17 2005 From: adamg at pld-linux.org (adamg) Date: Tue Dec 20 10:39:37 2005 Subject: admin: distfiles/README, distfiles/file-fetcher.pl - Don't check t... In-Reply-To: References: Message-ID: Author: adamg Date: Fri Aug 26 16:25:17 2005 GMT Module: admin Tag: HEAD ---- Log message: - Don't check the server certificate against the available certificate authorities (wget 1.10 refused to download lkcp sources) ---- Files affected: admin/distfiles: README (1.2 -> 1.3) , file-fetcher.pl (1.38 -> 1.39) ---- Diffs: ================================================================ Index: admin/distfiles/README diff -u admin/distfiles/README:1.2 admin/distfiles/README:1.3 --- admin/distfiles/README:1.2 Tue May 27 03:33:29 2003 +++ admin/distfiles/README Fri Aug 26 18:25:12 2005 @@ -1,6 +1,8 @@ Skrypty w tym katalogu zawieraj? automatyczny zasysacz plik?w do repozytorium distfiles. +Wymagania: wget >= 1.10 + Jak to dzia?a? S? dwie cz??ci: ================================================================ Index: admin/distfiles/file-fetcher.pl diff -u admin/distfiles/file-fetcher.pl:1.38 admin/distfiles/file-fetcher.pl:1.39 --- admin/distfiles/file-fetcher.pl:1.38 Thu Feb 3 18:20:47 2005 +++ admin/distfiles/file-fetcher.pl Fri Aug 26 18:25:12 2005 @@ -212,8 +212,8 @@ my $all_out = ""; my $bn = basename($url); my $local = "$tmp_dir/$md5/$bn"; - my $cmd = "wget -nv -O $local \"$url\""; - my $cmd2 = "wget -nv --passive-ftp -O $local \"$url\""; + my $cmd = "wget -nv --no-check-certificate -O $local \"$url\""; + my $cmd2 = "wget -nv --no-check-certificate --passive-ftp -O $local \"$url\""; push @files, $bn; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/admin/distfiles/README?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/admin/distfiles/file-fetcher.pl?r1=1.38&r2=1.39&f=u From mguevara at pld-linux.org Fri Aug 26 01:59:46 2005 From: mguevara at pld-linux.org (mguevara) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (LINUX_2_6): kernel.spec - patch 145 linux-2.6-cx88-blackbir... In-Reply-To: References: Message-ID: Author: mguevara Date: Thu Aug 25 23:59:46 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird based tv tuner cards (Winfast PVR2000) - rel 0.4 ---- Files affected: SPECS: kernel.spec (1.441.2.1165 -> 1.441.2.1166) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1165 SPECS/kernel.spec:1.441.2.1166 --- SPECS/kernel.spec:1.441.2.1165 Thu Aug 25 19:09:47 2005 +++ SPECS/kernel.spec Fri Aug 26 01:59:40 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.3 +%define _rel 0.4 %define _netfilter_snap 20050801 @@ -260,6 +260,9 @@ # derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/ Patch135: linux-2.6-unix-abi.patch +# derived from http://www.spinics.net/lists/vfl/msg15217.html +Patch145: linux-2.6-cx88-blackbird.patch + # derived from http://www.grsecurity.net/grsecurity-2.1.5-2.6.11.7-200504111924.patch.gz Patch200: grsecurity-2.1.5-2.6.11.7-200504111924.patch # http://openmosix.snarc.org/files/releases/2.6/ @@ -698,6 +701,7 @@ %if %{with abi} %patch135 -p1 %endif +%patch145 -p0 %endif %if %{with grsecurity} @@ -1486,6 +1490,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1166 2005/08/25 23:59:40 mguevara +- patch 145 linux-2.6-cx88-blackbird.patch adds support for some cx88-blackbird + based tv tuner cards (Winfast PVR2000) +- rel 0.4 + Revision 1.441.2.1165 2005/08/25 17:09:47 baggins - ATM TODO done ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1165&r2=1.441.2.1166&f=u From glen at pld-linux.org Fri Aug 26 01:05:12 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec (NEW) - created In-Reply-To: References: Message-ID: Author: glen Date: Thu Aug 25 23:05:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - created ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u /dev/null SPECS/openldap-schema-mozillaorgperson.spec:1.1 --- /dev/null Fri Aug 26 01:05:12 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Fri Aug 26 01:05:07 2005 @@ -0,0 +1,82 @@ +# $Revision$, $Date$ +Summary: Mozilla LDAP schema +Name: openldap-schema-mozillaorgperson +Version: 0.6.3 +Release: 0.2 +Epoch: 0 +License: ? +Group: Networking/Daemons +Source0: mozillaOrgPerson.schema +URL: https://bugzilla.mozilla.org/show_bug.cgi?id=116692 +Requires(post,postun): sed >= 4.0 +Requires: openldap-servers +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define schemadir /usr/share/openldap/schema + +%description +This package contains LDAPv3 schema for use with the Mozilla Address +Book. + +%prep +%setup -q -c -T +cp %{SOURCE0} . + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{schemadir} + +install *.schema $RPM_BUILD_ROOT%{schemadir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if ! grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*local.schema/{ + i\ +include %{schemadir}/mozillaOrgPerson.schema + } + + # enable dependant schemas: cosine, inetorgperson and core + /^#include.*\(cosine\|inetorgperson\|core\)\.schema/{ + s/^#// + } + ' /etc/openldap/slapd.conf +fi + +if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : +fi + +%postun +if [ "$1" = "0" ]; then + if grep -q %{schemadir}/mozillaOrgPerson.schema /etc/openldap/slapd.conf; then + sed -i -e ' + /^include.*\/usr\/share\/openldap\/schema\/mozillaOrgPerson\.schema/d + + # for symmetry it would be nice if we disable enabled schemas in post, + # but we really can not do that, it would break something else. + ' /etc/openldap/slapd.conf + fi + + if [ -f /var/lock/subsys/ldap ]; then + /etc/rc.d/init.d/ldap restart >&2 || : + fi +fi + +%files +%defattr(644,root,root,755) +%{schemadir}/*.schema + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/25 23:05:07 glen +- created + ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:18:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: pcre-cxx.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:18:31 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pcre-cxx.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From andree at pld-linux.org Fri Aug 26 20:19:30 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: clamsmtp.spec - updated to 1.5 In-Reply-To: References: Message-ID: Author: andree Date: Fri Aug 26 18:19:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.5 ---- Files affected: SPECS: clamsmtp.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/clamsmtp.spec diff -u SPECS/clamsmtp.spec:1.14 SPECS/clamsmtp.spec:1.15 --- SPECS/clamsmtp.spec:1.14 Fri May 13 01:25:48 2005 +++ SPECS/clamsmtp.spec Fri Aug 26 20:19:22 2005 @@ -2,12 +2,12 @@ Summary: clamav-based antivirus SMTP-level gateway Summary(pl): Oparta na clamavie bramka antywirusowa SMTP Name: clamsmtp -Version: 1.4.1 +Version: 1.5 Release: 1 License: BSD Group: Applications/Networking Source0: http://memberwebs.com/nielsen/software/clamsmtp/%{name}-%{version}.tar.gz -# Source0-md5: 4eb6311f5f46bf76e9b7490247ba59ed +# Source0-md5: 521e43f5872cab8e53c21285041a759f Source1: %{name}.init Patch0: %{name}-config.patch URL: http://memberwebs.com/nielsen/software/clamsmtp/ @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/26 18:19:22 andree +- updated to 1.5 + Revision 1.14 2005/05/12 23:25:48 zbyniu - up to 1.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/clamsmtp.spec?r1=1.14&r2=1.15&f=u From andree at pld-linux.org Fri Aug 26 20:19:42 2005 From: andree at pld-linux.org (andree) Date: Tue Dec 20 10:39:37 2005 Subject: DISTFILES: clamsmtp-1.5.tar.gz Message-ID: <4034.1125080382@distfiles.pld-linux.org> Files fetched: 1 STORED: http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-1.5.tar.gz 521e43f5872cab8e53c21285041a759f clamsmtp-1.5.tar.gz Size: 148067 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 20:20:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: evolution-data-server.spec - pl for openldap-schema- In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:20:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for openldap-schema- ---- Files affected: SPECS: evolution-data-server.spec (1.54 -> 1.55) ---- Diffs: ================================================================ Index: SPECS/evolution-data-server.spec diff -u SPECS/evolution-data-server.spec:1.54 SPECS/evolution-data-server.spec:1.55 --- SPECS/evolution-data-server.spec:1.54 Sat Aug 20 14:36:25 2005 +++ SPECS/evolution-data-server.spec Fri Aug 26 20:20:52 2005 @@ -56,12 +56,16 @@ %package -n openldap-schema-evolutionperson Summary: evolutionperson LDAP schema +Summary(pl): Schemat LDAP evolutionperson Group: Networking/Daemons Requires(post,postun): sed >= 4.0 Requires: openldap-servers %description -n openldap-schema-evolutionperson -This package contains evolutionperson.schema for openldap. +This package contains evolutionperson.schema for openldap server. + +%description -n openldap-schema-evolutionperson -l pl +Ten pakiet zawiera evolutionperson.schema dla serwera openldap. %package devel Summary: Evolution data server development files @@ -180,7 +184,7 @@ fi if [ -f /var/lock/subsys/ldap ]; then - /etc/rc.d/init.d/ldap restart >&2 + /etc/rc.d/init.d/ldap restart >&2 fi %postun -n openldap-schema-evolutionperson @@ -243,6 +247,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.55 2005/08/26 18:20:52 qboosh +- pl for openldap-schema- + Revision 1.54 2005/08/20 12:36:25 glen - created openldap-schema-evolutionperson subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.54&r2=1.55&f=u From arekm at pld-linux.org Thu Aug 25 19:26:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES (DEVEL): php-lib64.patch - up for php 5.1 In-Reply-To: References: Message-ID: Author: arekm Date: Thu Aug 25 17:26:25 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - up for php 5.1 ---- Files affected: SOURCES: php-lib64.patch (1.10 -> 1.10.4.1) ---- Diffs: ================================================================ Index: SOURCES/php-lib64.patch diff -u SOURCES/php-lib64.patch:1.10 SOURCES/php-lib64.patch:1.10.4.1 --- SOURCES/php-lib64.patch:1.10 Tue Mar 15 18:38:12 2005 +++ SOURCES/php-lib64.patch Thu Aug 25 19:26:19 2005 @@ -1,455 +1,12 @@ -diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4 ---- php-5.0.4RC1.orig/acinclude.m4 2005-03-15 18:21:05.158404416 +0100 -+++ php-5.0.4RC1/acinclude.m4 2005-03-15 18:22:03.101595712 +0100 -@@ -1723,6 +1723,9 @@ - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib - fi -+ if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then -+ OPENSSL_LIBDIR=$i/lib64 -+ fi - test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break - done - -diff -burN php-5.0.4RC1.orig/ext/cpdf/config.m4 php-5.0.4RC1/ext/cpdf/config.m4 ---- php-5.0.4RC1.orig/ext/cpdf/config.m4 2005-03-15 18:21:04.537498808 +0100 -+++ php-5.0.4RC1/ext/cpdf/config.m4 2005-03-15 18:23:06.693928208 +0100 -@@ -4,7 +4,7 @@ - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then -+ if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then - CPDF_JPEG_DIR=$i - break; - fi -@@ -13,11 +13,11 @@ - AC_MSG_ERROR([libjpeg.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_JPEG_DIR/lib -+ -L$CPDF_JPEG_DIR/lib64 - ]) - ],) - ]) -@@ -26,7 +26,7 @@ - AC_ARG_WITH(tiff-dir, - [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ - for i in $withval /usr/local /usr; do -- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then -+ if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then - CPDF_TIFF_DIR=$i - break; - fi -@@ -35,11 +35,11 @@ - AC_MSG_ERROR([libtiff.(a|so) not found.]) - fi - PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ -- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD) - ] ,[ - AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) - ], [ -- -L$CPDF_TIFF_DIR/lib -+ -L$CPDF_TIFF_DIR/lib64 - ]) - ],) - ]) -@@ -65,13 +65,13 @@ - ], [ - AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - ], [ -- -L$i/lib $CPDF_SHARED_LIBADD -+ -L$i/lib64 $CPDF_SHARED_LIBADD - ]) - -- PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD) - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) - break -diff -burN php-5.0.4RC1.orig/ext/dba/config.m4 php-5.0.4RC1/ext/dba/config.m4 ---- php-5.0.4RC1.orig/ext/dba/config.m4 2005-03-15 18:21:04.484506864 +0100 -+++ php-5.0.4RC1/ext/dba/config.m4 2005-03-15 18:22:03.103595408 +0100 -@@ -21,7 +21,7 @@ - dnl Assign INCLUDE/LFLAGS from PREFIX - AC_DEFUN([PHP_DBA_STD_ASSIGN],[ - if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then -- THIS_LFLAGS=$THIS_PREFIX/lib -+ THIS_LFLAGS=$THIS_PREFIX/lib64 - fi - ]) - -@@ -120,7 +120,7 @@ - AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) - THIS_LIBS=gdbm -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - fi - - PHP_DBA_STD_ASSIGN -@@ -152,7 +152,7 @@ - AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_NDBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -170,8 +170,8 @@ - dnl parameters(version, library list, function) - AC_DEFUN([PHP_DBA_DB_CHECK],[ - for LIB in $2; do -- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then -- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ -+ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then -+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ - AC_TRY_LINK([ - #include "$THIS_INCLUDE" - ],[ -@@ -366,7 +366,7 @@ - fi - AC_DEFINE(DBA_DBM, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -@@ -408,7 +408,7 @@ - AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_CDB, 1, [ ]) - THIS_LIBS=$LIB -- ], [], [-L$THIS_PREFIX/lib]) -+ ], [], [-L$THIS_PREFIX/lib64]) - if test -n "$THIS_LIBS"; then - break - fi -diff -burN php-5.0.4RC1.orig/ext/gd/config.m4 php-5.0.4RC1/ext/gd/config.m4 ---- php-5.0.4RC1.orig/ext/gd/config.m4 2005-03-15 18:21:04.469509144 +0100 -+++ php-5.0.4RC1/ext/gd/config.m4 2005-03-15 18:22:03.104595256 +0100 -@@ -51,7 +51,7 @@ - if test "$PHP_JPEG_DIR" != "no"; then - - for i in $PHP_JPEG_DIR /usr/local /usr; do -- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break -+ test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break - done - - if test -z "$GD_JPEG_DIR"; then -@@ -61,11 +61,11 @@ - PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, - [ - PHP_ADD_INCLUDE($GD_JPEG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_JPEG_DIR/lib -+ -L$GD_JPEG_DIR/lib64 - ]) - else - AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) -@@ -76,7 +76,7 @@ - if test "$PHP_PNG_DIR" != "no"; then - - for i in $PHP_PNG_DIR /usr/local /usr; do -- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break -+ test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break - done - - if test -z "$GD_PNG_DIR"; then -@@ -94,12 +94,12 @@ - PHP_CHECK_LIBRARY(png,png_write_image, - [ - PHP_ADD_INCLUDE($GD_PNG_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) - ],[ -- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib -+ -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64 - ]) - - else -@@ -111,7 +111,7 @@ - if test "$PHP_XPM_DIR" != "no"; then - - for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do -- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break -+ test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break - done - - if test -z "$GD_XPM_DIR"; then -@@ -129,12 +129,12 @@ - PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, - [ - PHP_ADD_INCLUDE($GD_XPM_INC) -- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_XPM_DIR/lib -lX11 -+ -L$GD_XPM_DIR/lib64 -lX11 - ]) - else - AC_MSG_RESULT(If configure fails try --with-xpm-dir=) -@@ -163,7 +163,7 @@ - fi - if test -n "$TTF_DIR" ; then - AC_DEFINE(HAVE_LIBTTF,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD) - fi - if test -z "$TTF_INC_DIR"; then - TTF_INC_DIR=$TTF_DIR/include -@@ -188,7 +188,7 @@ - done - - if test -n "$FREETYPE2_DIR" ; then -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD) - PHP_ADD_INCLUDE($FREETYPE2_DIR/include) - PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) - AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -@@ -216,11 +216,11 @@ - [ - AC_DEFINE(HAVE_LIBT1,1,[ ]) - PHP_ADD_INCLUDE($GD_T1_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD) - ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_T1_DIR/lib -+ -L$GD_T1_DIR/lib64 - ]) - fi - ]) -@@ -365,7 +365,7 @@ - done - - dnl Library path -- for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do -+ for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do - test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" - done - -diff -burN php-5.0.4RC1.orig/ext/imap/config.m4 php-5.0.4RC1/ext/imap/config.m4 ---- php-5.0.4RC1.orig/ext/imap/config.m4 2005-03-15 18:21:04.545497592 +0100 -+++ php-5.0.4RC1/ext/imap/config.m4 2005-03-15 18:22:03.105595104 +0100 -@@ -148,13 +148,13 @@ - - if test -r "$IMAP_DIR/c-client/c-client.a"; then - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test -r "$IMAP_DIR/lib/c-client.a"; then -- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 -+ elif test -r "$IMAP_DIR/lib64/c-client.a"; then -+ ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1 - fi - - for lib in c-client4 c-client imap; do - IMAP_LIB=$lib -- IMAP_LIB_CHK(lib) -+ IMAP_LIB_CHK(lib64) - IMAP_LIB_CHK(c-client) - done - -diff -burN php-5.0.4RC1.orig/ext/ldap/config.m4 php-5.0.4RC1/ext/ldap/config.m4 ---- php-5.0.4RC1.orig/ext/ldap/config.m4 2005-03-15 18:21:04.551496680 +0100 -+++ php-5.0.4RC1/ext/ldap/config.m4 2005-03-15 18:22:03.107594800 +0100 -@@ -6,15 +6,15 @@ - if test -f $1/include/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/include/umich-ldap/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/include/umich-ldap -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - elif test -f $1/ldap/public/ldap.h; then - LDAP_DIR=$1 - LDAP_INCDIR=$1/ldap/public -- LDAP_LIBDIR=$1/lib -+ LDAP_LIBDIR=$1/lib64 - fi - ]) - -diff -burN php-5.0.4RC1.orig/ext/ming/config.m4 php-5.0.4RC1/ext/ming/config.m4 ---- php-5.0.4RC1.orig/ext/ming/config.m4 2005-03-15 18:21:04.555496072 +0100 -+++ php-5.0.4RC1/ext/ming/config.m4 2005-03-15 18:22:03.108594648 +0100 +diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 +--- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 ++++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 19:23:28.356268128 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) for i in $PHP_MING /usr/local /usr; do - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then -+ if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then ++ if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libming.a; then MING_DIR=$i break fi -@@ -34,11 +34,11 @@ - ],[ - AC_MSG_ERROR([Ming library 0.2a or greater required.]) - ],[ -- -L$MING_DIR/lib -+ -L$MING_DIR/lib64 - ]) - - PHP_ADD_INCLUDE($MING_INC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) - - AC_MSG_CHECKING([for destroySWFBlock]) - AC_TRY_RUN([ -diff -burN php-5.0.4RC1.orig/ext/mssql/config.m4 php-5.0.4RC1/ext/mssql/config.m4 ---- php-5.0.4RC1.orig/ext/mssql/config.m4 2005-03-15 18:21:04.646482240 +0100 -+++ php-5.0.4RC1/ext/mssql/config.m4 2005-03-15 18:22:03.108594648 +0100 -@@ -32,12 +32,12 @@ - fi - fi - -- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then -- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) -+ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then -+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.[a|so]) - fi - - MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include -- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib -+ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 - - PHP_ADD_INCLUDE($MSSQL_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) -diff -burN php-5.0.4RC1.orig/ext/mysql/config.m4 php-5.0.4RC1/ext/mysql/config.m4 ---- php-5.0.4RC1.orig/ext/mysql/config.m4 2005-03-15 18:21:04.649481784 +0100 -+++ php-5.0.4RC1/ext/mysql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -17,7 +17,7 @@ - /var/run/mysqld/mysqld.sock \ - /var/tmp/mysql.sock \ - /var/run/mysql/mysql.sock \ -- /var/lib/mysql/mysql.sock \ -+ /var/lib64/mysql/mysql.sock \ - /var/mysql/mysql.sock \ - /usr/local/mysql/var/mysql.sock \ - /Private/tmp/mysql.sock \ -@@ -84,7 +84,7 @@ - Note that the MySQL client library is not bundled anymore.]) - fi - -- for i in lib lib/mysql; do -+ for i in lib64 lib64/mysql; do - MYSQL_LIB_CHK($i) - done - -@@ -100,9 +100,9 @@ - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ - AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) - ], [ -- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR -+ -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR - ]) -- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" -+ MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" - else - PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ -diff -burN php-5.0.4RC1.orig/ext/pgsql/config.m4 php-5.0.4RC1/ext/pgsql/config.m4 ---- php-5.0.4RC1.orig/ext/pgsql/config.m4 2005-03-15 18:21:04.658480416 +0100 -+++ php-5.0.4RC1/ext/pgsql/config.m4 2005-03-15 18:22:03.109594496 +0100 -@@ -44,7 +44,7 @@ - fi - done - -- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do -+ for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then - PGSQL_LIBDIR=$i/$j - fi -diff -burN php-5.0.4RC1.orig/ext/xml/config.m4 php-5.0.4RC1/ext/xml/config.m4 ---- php-5.0.4RC1.orig/ext/xml/config.m4 2005-03-15 18:21:04.530499872 +0100 -+++ php-5.0.4RC1/ext/xml/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -30,7 +30,7 @@ - dnl - if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR; do -- if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then -+ if test -f "$i/lib64/libexpat.a" -o -f "$i/lib64/libexpat.$SHLIB_SUFFIX_NAME"; then - EXPAT_DIR=$i - break - fi -@@ -41,7 +41,7 @@ - fi - - PHP_ADD_INCLUDE($EXPAT_DIR/include) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - fi - -diff -burN php-5.0.4RC1.orig/ext/xmlrpc/config.m4 php-5.0.4RC1/ext/xmlrpc/config.m4 ---- php-5.0.4RC1.orig/ext/xmlrpc/config.m4 2005-03-15 18:21:04.902443328 +0100 -+++ php-5.0.4RC1/ext/xmlrpc/config.m4 2005-03-15 18:22:03.110594344 +0100 -@@ -23,9 +23,9 @@ - - testval=no - for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then -+ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then - AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) -- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) - PHP_ADD_INCLUDE($i/include) - testval=yes - break -@@ -90,6 +90,6 @@ - PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) - XMLRPC_MODULE_TYPE=external - PHP_ADD_INCLUDE($XMLRPC_DIR) -- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) - fi - -diff -burN php-5.0.4RC1.orig/php.ini php-5.0.4RC1/php.ini ---- php-5.0.4RC1.orig/php.ini 2005-03-15 18:21:05.162403808 +0100 -+++ php-5.0.4RC1/php.ini 2005-03-15 18:22:03.111594192 +0100 -@@ -514,7 +514,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "/usr/lib/php" -+extension_dir = "/usr/lib64/php" - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -diff -burN php-5.0.4RC1.orig/scripts/Makefile.frag php-5.0.4RC1/scripts/Makefile.frag ---- php-5.0.4RC1.orig/scripts/Makefile.frag 2005-03-15 18:21:05.145406392 +0100 -+++ php-5.0.4RC1/scripts/Makefile.frag 2005-03-15 18:22:03.112594040 +0100 -@@ -4,7 +4,7 @@ - # - - phpincludedir = $(includedir)/php --phpbuilddir = $(prefix)/lib/php/build -+phpbuilddir = $(libdir)/php/build - - BUILD_FILES = \ - scripts/phpize.m4 \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10&r2=1.10.4.1&f=u From cvs at pld-linux.org Fri Aug 26 15:47:01 2005 From: cvs at pld-linux.org (baggins) Date: Tue Dec 20 10:39:37 2005 Subject: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Message-ID: <6335@svn.pld-linux.org> Author: baggins Date: Fri Aug 26 15:47:00 2005 New Revision: 6335 Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Log: - shift sock options for ipt_ACCOUNT to avoid overlap Modified: netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h ============================================================================== --- netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h (original) +++ netfilter-2.6/patch-o-matic-ng/branches/patched-2.6.11.x/include/linux/netfilter_ipv4/ip_tables.h Fri Aug 26 15:47:00 2005 @@ -167,11 +167,11 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 3) -#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 4) -#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 5) -#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 6) -#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ (IPT_BASE_CTL + 5) +#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (IPT_BASE_CTL + 6) +#define IPT_SO_GET_ACCOUNT_GET_DATA (IPT_BASE_CTL + 7) +#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (IPT_BASE_CTL + 8) +#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES (IPT_BASE_CTL + 9) #define IPT_SO_GET_ACCOUNT_MAX IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES /* CONTINUE verdict for targets */ From megabajt at pld-linux.org Fri Aug 26 16:53:18 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: GeoIP.spec - up to 1.3.13 In-Reply-To: References: Message-ID: Author: megabajt Date: Fri Aug 26 14:53:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.3.13 ---- Files affected: SPECS: GeoIP.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/GeoIP.spec diff -u SPECS/GeoIP.spec:1.20 SPECS/GeoIP.spec:1.21 --- SPECS/GeoIP.spec:1.20 Mon Jul 25 11:10:57 2005 +++ SPECS/GeoIP.spec Fri Aug 26 16:53:12 2005 @@ -2,12 +2,12 @@ Summary: Library to find what country an IP address or hostnames originate from Summary(pl): Biblioteka do sprawdzenia z jakiego kraju pochodzi adres IP lub domena Name: GeoIP -Version: 1.3.12 +Version: 1.3.13 Release: 1 License: GPL v2 Group: Libraries Source0: http://www.maxmind.com/download/geoip/api/c/%{name}-%{version}.tar.gz -# Source0-md5: a22ae6197c3bbe280dbc4055cc29ec1f +# Source0-md5: 59fc9a6adfbde13cee33c88668f3f400 # note: "c" is a filename, do not add '/' URL: http://www.maxmind.com/app/c BuildRequires: autoconf @@ -119,6 +119,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.21 2005/08/26 14:53:12 megabajt +- up to 1.3.13 + Revision 1.20 2005/07/25 09:10:57 blekot - up to 1.3.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/GeoIP.spec?r1=1.20&r2=1.21&f=u From arekm at pld-linux.org Fri Aug 26 11:43:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SOURCES: kdepim-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:43:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdepim-branch.diff (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SOURCES/kdepim-branch.diff diff -u SOURCES/kdepim-branch.diff:1.8 SOURCES/kdepim-branch.diff:1.9 --- SOURCES/kdepim-branch.diff:1.8 Tue Aug 2 08:09:29 2005 +++ SOURCES/kdepim-branch.diff Fri Aug 26 11:43:22 2005 @@ -1,7 +1,56 @@ +Index: akregator/src/pageviewer.cpp +=================================================================== +--- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -361,7 +361,7 @@ + if (copylinkaddress) + { + copylinkaddress->plug( &popup); +- popup.insertSeparator(); ++ //popup.insertSeparator(); + } + } + else // we are not on a link +Index: kresources/egroupware/kabc_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kabc_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kabc_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/knotes_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/knotes_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/knotes_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) +Index: kresources/egroupware/kcal_xmlrpc.desktop +=================================================================== +--- kresources/egroupware/kcal_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/egroupware/kcal_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -11,6 +11,7 @@ + Name[et]=eGroupware server (XML-RPC vahendusel) + Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) + Name[fr]=Serveur eGroupware (via XML-RPC) ++Name[ga]=Freastala?? eGroupware (via XML-RPC) + Name[hu]=eGroupware-kiszolg??l?? (XML-RPC-n kereszt??l) + Name[is]=eGroupware ??j??nn (gegnum XML-RPC) + Name[it]=Server eGroupware (via XML-RPC) Index: kresources/exchange/exchange.desktop =================================================================== ---- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -17,6 +17,7 @@ Name[et]=Exchange 2000 server Name[eu]=Exchange 2000 zerbitzaria @@ -12,8 +61,8 @@ Name[is]=Exchange 2000 ??j??nn Index: kresources/slox/kcal_slox.desktop =================================================================== ---- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -24,8 +73,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/slox/webdavhandler.cpp =================================================================== ---- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,8 @@ #endif #endif @@ -55,8 +104,8 @@ } Index: kresources/slox/kabc_slox.desktop =================================================================== ---- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -11,6 +11,7 @@ Name[et]=SUSE LINUX Openexchange server Name[eu]=SUSE LINUX Openexchange zerbitzaria @@ -67,8 +116,8 @@ Name[it]=Server SUSE LINUX Openexchange Index: kresources/groupdav/kabc_groupdav.desktop =================================================================== ---- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -79,8 +128,8 @@ Name[it]=Server GroupDAV (per es. OpenGroupware) Index: kresources/groupdav/kcal_groupdav.desktop =================================================================== ---- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -12,6 +12,7 @@ Name[et]=GroupDAV server (nt. OpenGroupware) Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) @@ -89,10 +138,46 @@ Name[hu]=GroupDAV-kiszolg??l?? (pl. OpenGroupware) Name[is]=GroupDAV ??j??nn (t.d. OpenGroupware) Name[it]=Server GroupDAV (per es. OpenGroupware) +Index: kresources/kolab/kabc/kolab.desktop +=================================================================== +--- kresources/kolab/kabc/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Aadressiraamat IMAP-serveril (KMaili vahendusel) + Name[eu]=Helbide-liburua IMAP zerbitzarian KMail-en bidez + Name[fr]=Carnet d'adresse sur serveur IMAP (via KMail) ++Name[ga]=Leabhar Seolta?? ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt c??mjegyz??k a KMailen kereszt??l + Name[is]=Vistfangaskr?? ?? IMAP ??j??ni gegnum KMail + Name[it]=Rubrica indirizzi su server IMAP via KMail +Index: kresources/kolab/knotes/kolabresource.desktop +=================================================================== +--- kresources/kolab/knotes/kolabresource.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/knotes/kolabresource.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=IMAP-server (KMaili vahendusel) + Name[eu]=IMAP zerbitzaria KMail-en bidez + Name[fr]=Serveur IMAP (via KMail) ++Name[ga]=Freastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l?? a KMailen kereszt??l + Name[is]=IMAP ??j??nn gegnum KMail + Name[it]=Server IMAP via KMail +Index: kresources/kolab/kcal/kolab.desktop +=================================================================== +--- kresources/kolab/kcal/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -12,6 +12,7 @@ + Name[et]=Kalender IMAP-serveril (KMaili vahendusel) + Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez + Name[fr]=Agenda sur serveur IMAP (via KMail) ++Name[ga]=F??ilire ar Fhreastala?? IMAP via KMail + Name[hu]=IMAP-kiszolg??l??n t??rolt napt??r a KMailen kereszt??l + Name[is]=Dagatal ?? IMAP ??j??ni gegnum KMail + Name[it]=Calendario su server IMAP via KMail Index: kresources/kolab/kcal/resourcekolab.cpp =================================================================== ---- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -487,10 +487,18 @@ mUidMap[ uid ] = StorageReference( subResource, sernum ); } else { @@ -116,8 +201,8 @@ /* Add to the cache if the add didn't come from KOrganizer, in which case Index: kresources/groupware/kabc_groupware.desktop =================================================================== ---- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -128,8 +213,8 @@ Name[is]=Groupware ??j??nn Index: kresources/groupware/kcal_groupware.desktop =================================================================== ---- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -10,6 +10,7 @@ Name[et]=Grupit???? server Name[eu]=Groupware zerbitzaria @@ -140,8 +225,8 @@ Name[is]=Groupware ??j??nn Index: kresources/remote/remote.desktop =================================================================== ---- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -15,6 +15,7 @@ Name[eu]=Egutegia urruneko fitxategi batean Name[fi]=Kalenteri et??tiedostossa @@ -150,10 +235,22 @@ Name[hi]=??????????????? ??????????????? ????????? ???????????????????????? Name[hu]=T??voli f??jlban t??rolt napt??r Name[is]=Dagatal ?? fjarl??gri skr?? +Index: kresources/newexchange/kcal_newexchange_final.desktop +=================================================================== +--- kresources/newexchange/kcal_newexchange_final.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kresources/newexchange/kcal_newexchange_final.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -13,6 +13,7 @@ + Name[et]=Kalender Exchange-serveril + Name[eu]=Egutegia Exchange zerbitzari batean + Name[fr]=Agenda sur un serveur Exchange ++Name[ga]=F??ilire ar Fhreastala?? Exchange + Name[hu]=Exchange 2000-kiszolg??l?? napt??ra + Name[is]=Dagatal ?? Exchange ??j??ni + Name[it]=Calendario su un server Exchange Index: kmail/kmailicalifaceimpl.cpp =================================================================== ---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -848,7 +848,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum ) @@ -163,10 +260,23 @@ return; // kdDebug(5006) << "KMailICalIfaceImpl::slotIncidenceAdded" << endl; +Index: kmail/kmail_config_composer.desktop +=================================================================== +--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -109,7 +109,7 @@ + Keywords[he]=kmail,???????? + Keywords[hi]=??????-?????????,???????????????????????? + Keywords[hu]=kmail,szerkeszt?? +-Keywords[is]=kmail,composer,ritill ++Keywords[is]=kmail,ritill + Keywords[it]=kmail,compositore + Keywords[lt]=kmail,composer,redaktorius + Keywords[nb]=kmail,komposer Index: kmail/partNode.cpp =================================================================== ---- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -36,6 +36,7 @@ #include "kmmimeparttree.h" #include @@ -184,10 +294,74 @@ return this; if( mChild ) found = mChild->findNodeForDwPart( part ); +Index: kmail/eventsrc +=================================================================== +--- kmail/eventsrc (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -10,6 +10,7 @@ + [new-mail-arrived] + Name=New Mail Arrived + Name[bg]=?????????? ???????? ?????????? ++Name[br]=Deuet eo ur postel nevez + Name[bs]=Stigla vam je nova po??ta + Name[ca]=Ha arribat correu nou + Name[cs]=P??i??la nov?? po??ta +Index: kmail/avscripts/kmail_sav.sh +=================================================================== +--- kmail/avscripts/kmail_sav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_sav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_fprot.sh +=================================================================== +--- kmail/avscripts/kmail_fprot.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_fprot.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_antivir.sh +=================================================================== +--- kmail/avscripts/kmail_antivir.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_antivir.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE +Index: kmail/avscripts/kmail_clamav.sh +=================================================================== +--- kmail/avscripts/kmail_clamav.sh (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/avscripts/kmail_clamav.sh (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -28,7 +28,7 @@ + # your version. + # + TEMPFILE=`mktemp` +-if [ $? ] ; then ++if [ $? != 0 ] ; then + TEMPFILE=`mktemp /tmp/kmail.XXXXXX` + fi + export TEMPFILE Index: kmail/keyresolver.cpp =================================================================== ---- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -1171,6 +1171,17 @@ for ( uint i = 0; i < items.size(); ++i ) { ContactPreferences& pref = lookupContactPreferences( items[i].address ); @@ -208,8 +382,8 @@ } Index: kmail/kmsender.cpp =================================================================== ---- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -519,8 +519,10 @@ .arg(mCurrentMsg->subject())); if (!mSendProc->send(mCurrentMsg)) @@ -246,10 +420,46 @@ mCurrentMsg = 0; mFailedMessages++; // Sending of message failed. +Index: knode/knode_config_identity.desktop +=================================================================== +--- knode/knode_config_identity.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -58,6 +58,7 @@ + Comment=Personal Information + Comment[be]=???????????????????????? ???????????????????? + Comment[bg]=???????????????????? ???? ?????????????? ???????????????????? ++Comment[br]=Titouro?? diouzhin + Comment[bs]=Li??ne informacije + Comment[ca]=Informaci?? personal + Comment[cs]=Osobn?? informace +Index: knode/knode_config_cleanup.desktop +=================================================================== +--- knode/knode_config_cleanup.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,6 +25,7 @@ + Name[eu]=Garbiketa + Name[fi]=Siivoaminen + Name[fr]=Nettoyage ++Name[ga]=Glan + Name[gl]=Limpeza + Name[hi]=????????????-???????????? + Name[hu]=Tiszt??t??s +Index: knode/knarticlewidget.cpp +=================================================================== +--- knode/knarticlewidget.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ knode/knarticlewidget.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include Index: kalarm/alarmcalendar.h =================================================================== ---- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -46,7 +46,7 @@ void startUpdate(); void endUpdate(); @@ -262,7 +472,7 @@ Index: Makefile.cvs =================================================================== --- Makefile.cvs (.../tags/KDE/3.4.2/kdepim) (revision 0) -+++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 442272) ++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -0,0 +1,16 @@ + +all: @@ -288,8 +498,8 @@ Index: libemailfunctions/email.cpp =================================================================== ---- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -697,14 +697,24 @@ // and outside of quoted text behind the trailing '>'. bInComment = false; @@ -329,10 +539,22 @@ break; default: if( ' ' != c ) +Index: korn/KOrn.desktop +=================================================================== +--- korn/KOrn.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ korn/KOrn.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -16,6 +16,7 @@ + GenericName[eu]=Mail abisua + GenericName[fi]=Saapuneen s??hk??postin ilmoitus + GenericName[fr]=Surveillance du courrier ??lectronique ++GenericName[ga]=F??gairt R??omhphoist + GenericName[gl]=Alerta de Correo-e + GenericName[hi]=????????? ??????????????? + GenericName[hr]=Upozorenje na nove poruke Index: kmailcvt/filters.hxx =================================================================== ---- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -85,6 +85,57 @@ }; @@ -394,8 +616,8 @@ -// vim: ts=2 sw=2 et Index: kmailcvt/filter_thunderbird.cxx =================================================================== ---- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -198,7 +198,7 @@ tmp.close(); first_msg = false; @@ -407,8 +629,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_evolution_v2.cxx =================================================================== ---- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -201,7 +201,7 @@ tmp.close(); first_msg = false; @@ -420,8 +642,8 @@ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd"); Index: kmailcvt/filter_outlook.cxx =================================================================== ---- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -52,7 +52,7 @@ info->addLog(i18n("Importing new mail files...")); info->addLog(i18n("No files found for import.")); @@ -433,8 +655,8 @@ QStringList files = importDir.entryList("*.[pP][sS][tT]", QDir::Files, QDir::Name); Index: kmailcvt/filter_pmail.cxx =================================================================== ---- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -320,13 +320,13 @@ QString FilterPMail::getFolderName(QString ID) { @@ -454,8 +676,8 @@ if(_ID == search) { Index: kmailcvt/filter_oe.cxx =================================================================== ---- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -138,7 +138,7 @@ folderName = "OE-" + mailfileinfo.baseName(TRUE); if(parsedFolder) { @@ -513,8 +735,8 @@ } Index: kmailcvt/filter_mbox.cxx =================================================================== ---- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -69,8 +69,9 @@ while ( ! mbox.atEnd() ) { @@ -544,8 +766,8 @@ first_msg = false; Index: kmailcvt/filter_pmail.hxx =================================================================== ---- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -50,8 +50,18 @@ QDir dir; /** pointer to the info */ @@ -569,8 +791,8 @@ bool folderParsed; Index: kmailcvt/filter_oe.hxx =================================================================== ---- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 442272) +--- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -61,8 +61,17 @@ bool parsedFolder; /** true if the current parsing file is the folder file */ @@ -590,10 +812,73 @@ /** name of the current folder */ QString folderName; +Index: kaddressbook/interfaces/kaddressbook_xxport.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_xxport.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -21,7 +21,7 @@ + Comment[he]=???????? ??????????/???????? ???????? ???????? ?????????????? + Comment[hi]=??????-??????????????????-????????? ????????????/????????????????????? ?????????????????? + Comment[hu]=KAddressBook import??l??si/export??l??si b??v??t??modul +-Comment[is]=??forrit til a?? f??ra inn ??/??t ??r KAddressbook ++Comment[is]=KAddressbook flytja inn/??t ??forrit + Comment[it]=Plugin importa/esporta di KAddressbook + Comment[ja]=KAddressbook ???????????????/????????????????????????????????? + Comment[lt]=KAddressBook importo/eksporto priedas +Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop +=================================================================== +--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -17,7 +17,7 @@ + Comment[fr]=Module d'??dition de contacts de KAddressBook + Comment[hi]=??????-??????????????????-????????? ????????????????????? ?????????????????? ??????????????? ?????????????????? + Comment[hu]=KAddressBook n??vjegyszerkeszt?? b??v??t??modul +-Comment[is]=KAddressbook tengili??aritils-??forrit ++Comment[is]=KAddressbook tengili??aritils ??forrit + Comment[it]=Plugin editor dei contatti di KAddressbook + Comment[ja]=KAddressbook ??????????????? ???????????? ?????????????????? ??????????????? + Comment[lt]=KAddressBook kontakt?? redaktoriaus valdikli?? priedas +Index: kaddressbook/csv-templates/yahoo.desktop +=================================================================== +--- kaddressbook/csv-templates/yahoo.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/csv-templates/yahoo.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -25,7 +25,7 @@ + Name[he]=???????? ?????????? ???? Yahoo! + Name[hi]=????????????! ????????? ???????????????????????? + Name[hu]=Yahoo! c??mjegyz??k +-Name[is]=Yahoo! P??stfangaskr?? ++Name[is]=Yahoo! p??stfangaskr?? + Name[it]=Rubrica indirizzi Yahoo! + Name[ja]=Yahoo! ??????????????? + Name[lt]=Yahoo! Adres?? knygut?? +Index: kaddressbook/editors/protocols/smsprotocol.desktop +=================================================================== +--- kaddressbook/editors/protocols/smsprotocol.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/editors/protocols/smsprotocol.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -19,6 +19,7 @@ + Comment[eu]=SMS protokoloa + Comment[fi]=SMS-protokolla + Comment[fr]=Protocole SMS ++Comment[ga]=Pr??tacal SMS + Comment[gl]=Protocolo SMS + Comment[he]=???????????????? SMS + Comment[hi]=?????????????????? ??????????????????????????? +Index: kaddressbook/features/distributionlist.desktop +=================================================================== +--- kaddressbook/features/distributionlist.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ kaddressbook/features/distributionlist.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) +@@ -4,6 +4,7 @@ + Name=KAB Distribution List Plugin + Name[ar]=? ?????? ??????? ?? ?????????? KAB + Name[be]=?????????????????????? KAB "?????????? ????????????????????????????????" ++Name[br]=Lugent roll ingaladur evit KAB + Name[bs]=KAB dodatak za distribucione liste + Name[ca]=Endollable de la llista de distribuci?? KAB + Name[cs]=Modul distribu??n??ho seznamu Index: libkdepim/komposer/plugins/default/defaulteditor.desktop =================================================================== ---- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272) -+++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 442272) +--- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465) ++++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 453465) @@ -28,6 +28,7 @@ Name[et]=Komposeri redaktor <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Fri Aug 26 10:55:23 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS (DEVEL): php.spec - add PDO (base compiled in; database driv... In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 08:55:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - add PDO (base compiled in; database drivers as shared modules) ---- Files affected: SPECS: php.spec (1.467.2.4 -> 1.467.2.5) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.467.2.4 SPECS/php.spec:1.467.2.5 --- SPECS/php.spec:1.467.2.4 Thu Aug 25 21:25:13 2005 +++ SPECS/php.spec Fri Aug 26 10:55:18 2005 @@ -13,15 +13,16 @@ # - make additional headers added by mail patch configurable # - apply -hardened patch by default ? # - ftp module needs to be linked with -lssl if openssl module is enabled +# - shared pdo base # # Conditional build: %bcond_with db3 # use db3 packages instead of db (4.x) for Berkeley DB support -%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib) +%bcond_with fdf # with FDF (PDF forms) module (BR:proprietary lib) %bcond_with hardening # build with hardening patch applied (http://www.hardened-php.net/) -%bcond_with hwapi # with Hw API support (BR: proprietary libs) -%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) -%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) -%bcond_with oracle # with oracle extension module (BR: proprietary libs) +%bcond_with hwapi # with Hw API support (BR:proprietary libs) +%bcond_with interbase_inst # use InterBase install., not Firebird (BR:proprietary libs) +%bcond_with oci8 # with Oracle oci8 extension module (BR:proprietary libs) +%bcond_with oracle # with oracle extension module (BR:proprietary libs) %bcond_without mysqli # with mysqli support (Requires mysql > 4.1) %bcond_without curl # without CURL extension module %bcond_without imap # without IMAP extension module @@ -267,7 +268,7 @@ Summary: PHP DSO module for apache 1.3.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 1.3.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires(post,preun): %{apxs1} Requires(post,preun): %{__perl} Requires: apache1(EAPI) >= 1.3.33-2 @@ -289,7 +290,7 @@ Summary: PHP DSO module for apache 2.x Summary(pl): Modu? DSO (Dynamic Shared Object) php dla apache 2.x Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: apache >= 2.0.52-2 Requires: apache(modules-api) = %{apache_modules_api} Provides: %{name} = %{epoch}:%{version}-%{release} @@ -309,7 +310,7 @@ Summary: php as FastCGI program Summary(pl): php jako program FastCGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description fcgi @@ -322,7 +323,7 @@ Summary: php as CGI program Summary(pl): php jako program CGI Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cgi @@ -335,7 +336,7 @@ Summary: php as CLI interpreter Summary(pl): php jako interpreter dzia?aj?cy z linii polece? Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php-program = %{epoch}:%{version}-%{release} %description cli @@ -976,6 +977,81 @@ Modu? PHP umo?liwiaj?cy korzystanie z perlowych wyra?e? regularnych (Perl Compatible Regular Expressions) +%package pdo-dblib +Summary: PHP Data Objects (PDO) FreeTDS support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do FreeTDS +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-dblib +This is a dynamic shared object (DSO) for PHP that will add PDO +FreeTDS support. + +%description pdo-dblib -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych FreeTDS za po?rednictwem +interfejsu PDO. + +%package pdo-mysql +Summary: PHP Data Objects (PDO) MySQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do MySQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-mysql +This is a dynamic shared object (DSO) for PHP that will add PDO MySQL +support. + +%description pdo-mysql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych MySQL za po?rednictwem +interfejsu PDO. + +%package pdo-odbc +Summary: PHP Data Objects (PDO) ODBC support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do ODBC +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-odbc +This is a dynamic shared object (DSO) for PHP that will add PDO ODBC +support. + +%description pdo-odbc -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych ODBC za po?rednictwem +interfejsu PDO. + +%package pdo-pgsql +Summary: PHP Data Objects (PDO) PostgreSQL support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do PostgreSQL +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-pgsql +This is a dynamic shared object (DSO) for PHP that will add PDO +PostgreSQL support. + +%description pdo-pgsql -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych PostgreSQL za +po?rednictwem interfejsu PDO. + +%package pdo-sqlite +Summary: PHP Data Objects (PDO) SQLite support +Summary(pl): Modu? PHP Data Objects (PDO) z wsparciem do SQLite +Group: Libraries +Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description pdo-sqlite +This is a dynamic shared object (DSO) for PHP that will add PDO SQLite +support. + +%description pdo-sqlite -l pl +Modu? dla PHP dodaj?cy obs?ug? dla baz danych SQLite za po?rednictwem +interfejsu PDO. + %package pgsql Summary: PostgreSQL database module for PHP Summary(pl): Modu? bazy danych PostgreSQL dla PHP @@ -1140,22 +1216,24 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} %description sqlite -SQLite is a C library that implements an embeddable SQL database engine. -Programs that link with the SQLite library can have SQL database access -without running a separate RDBMS process. - -SQLite is not a client library used to connect to a big database server. -SQLite is the server. The SQLite library reads and writes directly to -and from the database files on disk. +SQLite is a C library that implements an embeddable SQL database +engine. Programs that link with the SQLite library can have SQL +database access without running a separate RDBMS process. + +SQLite is not a client library used to connect to a big database +server. SQLite is the server. The SQLite library reads and writes +directly to and from the database files on disk. %description sqlite -l pl SQLite jest napisan? w C bibliotek? implementuj?c? osadzalny silnik bazodanowy SQL. Program linkuj?cy si? z bibliotek? SQLite mo?e mie? -dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu RDBMS. +dost?p do bazy SQL bez potrzeby uruchamiania dodatkowego procesu +RDBMS. SQLite to nie klient baz danych - biblioteka nie ??czy si? z serwerami -baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i zapisuje -dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na dysku. +baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i +zapisuje dane bezpo?rednio z/do plik?w baz danych znajduj?cych si? na +dysku. %package sybase Summary: Sybase DB extension module for PHP @@ -1167,8 +1245,9 @@ %description sybase This is a dynamic shared object (DSO) for PHP that will add Sybase and -MS SQL databases support through SYBDB library. Currently Sybase module -is not maintained. Using Sybase-CT module is recommended instead. +MS SQL databases support through SYBDB library. Currently Sybase +module is not maintained. Using Sybase-CT module is recommended +instead. %description sybase -l pl Modu? PHP dodaj?cy obs?ug? baz danych Sybase oraz MS SQL poprzez @@ -1252,8 +1331,8 @@ Summary: wddx extension module for PHP Summary(pl): Modu? wddx dla PHP Group: Libraries -PreReq: %{name}-session = %{epoch}:%{version}-%{release} -PreReq: %{name}-xml = %{epoch}:%{version}-%{release} +Requires: %{name}-session = %{epoch}:%{version}-%{release} +Requires: %{name}-xml = %{epoch}:%{version}-%{release} Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -1291,13 +1370,13 @@ %description xmlreader This is a dynamic shared object (DSO) for PHP that will add XML Reader support. The XMLReader extension is an XML Pull parser. The reader -acts as a cursor going forward on the document stream and stopping -at each node on the way. +acts as a cursor going forward on the document stream and stopping at +each node on the way. %description xmlreader -l pl Modu? PHP umo?liwiaj?cy parsowanie plik?w XML w trybie Pull. Czytnik -dzia?a jako kursor przechodz?cy przez strumie? dokumentu i zatrzymuj?cy -si? naka?dym w??le po drodze. +dzia?a jako kursor przechodz?cy przez strumie? dokumentu i +zatrzymuj?cy si? naka?dym w??le po drodze. %package xmlrpc Summary: xmlrpc extension module for PHP @@ -1465,12 +1544,15 @@ --with-config-file-scan-dir=%{_sysconfdir}/conf.d \ --with-exec-dir=%{_bindir} \ --%{!?debug:dis}%{?debug:en}able-debug \ + --enable-zend-multibyte \ --enable-maintainer-zts \ --enable-memory-limit \ --enable-bcmath=shared \ --enable-calendar=shared \ --enable-ctype=shared \ --enable-dba=shared \ + --with-inifile \ + --with-flatfile \ --enable-dom=shared \ --enable-exif=shared \ --enable-filepro=shared \ @@ -1481,6 +1563,18 @@ --enable-mbstring=shared,all \ --enable-mbregex \ --enable-pcntl=shared \ + --enable-pdo \ +%if %{with mssql} || %{with sybase} || %{with sybase_ct} + --with-pdo-dblib=shared \ +%endif +%if %{with interbase} && %{without interbase_inst} + --with-pdo-firebird=shared \ +%endif + --with-pdo-mysql=shared \ + %{?with_oracle:--with-pdo-oci=shared} \ + %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ + %{?with_pgsql:--with-pdo-pgsql=shared} \ + %{?with_sqlite:--with-pdo-sqlite=shared} \ --enable-posix=shared \ --enable-session \ --enable-shared \ @@ -1624,7 +1718,7 @@ libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} # install the apache modules' files -make install-headers install-build install-modules install-programs \ +%{__make} install-headers install-build install-modules install-programs \ INSTALL_ROOT=$RPM_BUILD_ROOT # install CGI @@ -2018,6 +2112,36 @@ %postun pcre %extension_postun +%post pdo-dblib +%extension_post + +%postun pdo-dblib +%extension_postun + +%post pdo-mysql +%extension_post + +%postun pdo-mysql +%extension_postun + +%post pdo-odbc +%extension_post + +%postun pdo-odbc +%extension_postun + +%post pdo-pgsql +%extension_post + +%postun pdo-pgsql +%extension_postun + +%post pdo-sqlite +%extension_post + +%postun pdo-sqlite +%extension_postun + %post pgsql %extension_post @@ -2341,8 +2465,8 @@ %if %{with apache1} %files -n apache1-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini %attr(755,root,root) %{_libdir}/apache1/libphp5.so /home/services/apache/icons/* %endif @@ -2350,8 +2474,8 @@ %if %{with apache2} %files -n apache-mod_php %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini %attr(755,root,root) %{_libdir}/apache/libphp5.so /home/services/httpd/icons/* %endif @@ -2359,18 +2483,18 @@ %files fcgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.fcgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi-fcgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini %files cgi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cgi -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi.ini %files cli %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php.cli %attr(755,root,root) %{_bindir}/php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini %{_mandir}/man1/php.1* %files common @@ -2382,7 +2506,7 @@ %dir %{_sysconfdir} %dir %{_sysconfdir}/conf.d -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini +%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini %attr(770,root,http) %dir %verify(not group mode) /var/run/php %attr(755,root,root) %{_sbindir}/php-module-install %attr(755,root,root) %{_libdir}/libphp_common-*.so @@ -2401,168 +2525,168 @@ %files bcmath %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bcmath.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini %attr(755,root,root) %{extensionsdir}/bcmath.so %files bzip2 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/bz2.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini %attr(755,root,root) %{extensionsdir}/bz2.so %files calendar %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/calendar.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{extensionsdir}/calendar.so %files ctype %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ctype.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini %attr(755,root,root) %{extensionsdir}/ctype.so %if %{with curl} %files curl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/curl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini %attr(755,root,root) %{extensionsdir}/curl.so %endif %files dba %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dba.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini %attr(755,root,root) %{extensionsdir}/dba.so %files dbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dbase.ini %attr(755,root,root) %{extensionsdir}/dbase.so %files dom %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/dom.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{extensionsdir}/dom.so %if %{with fdf} %files fdf %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/fdf.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fdf.ini %attr(755,root,root) %{extensionsdir}/fdf.so %endif %files exif %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/exif.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini %attr(755,root,root) %{extensionsdir}/exif.so %files filepro %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/filepro.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filepro.ini %attr(755,root,root) %{extensionsdir}/filepro.so %files ftp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ftp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini %attr(755,root,root) %{extensionsdir}/ftp.so %files gd %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gd.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini %attr(755,root,root) %{extensionsdir}/gd.so %files gettext %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gettext.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini %attr(755,root,root) %{extensionsdir}/gettext.so %files gmp %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/gmp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini %attr(755,root,root) %{extensionsdir}/gmp.so %if %{with hwapi} %files hwapi %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/hwapi.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hwapi.ini %attr(755,root,root) %{extensionsdir}/hwapi.so %endif %files iconv %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/iconv.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini %attr(755,root,root) %{extensionsdir}/iconv.so %if %{with imap} %files imap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/imap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini %attr(755,root,root) %{extensionsdir}/imap.so %endif %if %{with interbase} %files interbase %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/interbase.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini %attr(755,root,root) %{extensionsdir}/interbase.so %endif %if %{with ldap} %files ldap %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ldap.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini %attr(755,root,root) %{extensionsdir}/ldap.so %endif %files mbstring %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mbstring.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini %attr(755,root,root) %{extensionsdir}/mbstring.so %files mcrypt %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mcrypt.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini %attr(755,root,root) %{extensionsdir}/mcrypt.so %if %{with mhash} %files mhash %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mhash.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mhash.ini %attr(755,root,root) %{extensionsdir}/mhash.so %endif %files mime_magic %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mime_magic.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini %attr(755,root,root) %{extensionsdir}/mime_magic.so %if %{with ming} %files ming %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/ming.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ming.ini %attr(755,root,root) %{extensionsdir}/ming.so %endif %if %{with msession} %files msession %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/msession.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini %attr(755,root,root) %{extensionsdir}/msession.so %endif %if %{with mssql} %files mssql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mssql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mssql.ini %attr(755,root,root) %{extensionsdir}/mssql.so %endif %files mysql %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini %attr(755,root,root) %{extensionsdir}/mysql.so %if %{with mysqli} %files mysqli %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/mysqli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini %attr(755,root,root) %{extensionsdir}/mysqli.so %endif @@ -2573,28 +2697,28 @@ %if %{with oci8} %files oci8 %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oci8.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini %attr(755,root,root) %{extensionsdir}/oci8.so %endif %if %{with odbc} %files odbc %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/odbc.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini %attr(755,root,root) %{extensionsdir}/odbc.so %endif %if %{with openssl} %files openssl %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/openssl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini %attr(755,root,root) %{extensionsdir}/openssl.so %endif %if %{with oracle} %files oracle %defattr(644,root,root,755) -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/oracle.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oracle.ini %attr(755,root,root) %{extensionsdir}/oracle.so %endif @@ -2605,26 +2729,66 @@ %if %{with pcre} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.4&r2=1.467.2.5&f=u From twittner at pld-linux.org Fri Aug 26 18:26:46 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: man.spec - moved R: FHS >= 2.3-12 i proper place - newest F... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:26:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - moved R: FHS >= 2.3-12 i proper place - newest FHS is required only by man-man2html-cgi package ---- Files affected: SPECS: man.spec (1.105 -> 1.106) ---- Diffs: ================================================================ Index: SPECS/man.spec diff -u SPECS/man.spec:1.105 SPECS/man.spec:1.106 --- SPECS/man.spec:1.105 Tue Aug 23 22:10:58 2005 +++ SPECS/man.spec Fri Aug 26 18:26:40 2005 @@ -41,7 +41,6 @@ Requires(post,preun): fileutils Requires: %{name}-config = %{version}-%{release} Requires: /bin/awk -Requires: FHS >= 2.3-12 Requires: groff Requires: gzip Requires: less @@ -168,6 +167,7 @@ Group: Applications/System Requires: %{name}-whatis = %{version}-%{release} Requires: man2html = %{version}-%{release} +Requires: FHS >= 2.3-12 %description -n man2html-cgi These scripts allows read man pages throught WWW browser. It uses @@ -430,6 +430,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.106 2005/08/26 16:26:40 twittner +- moved R: FHS >= 2.3-12 i proper place - newest FHS is required only + by man-man2html-cgi package + Revision 1.105 2005/08/23 20:10:58 twittner - force make -j1 - simultaneous builds fail (reported by paszczus, confirmed by me) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/man.spec?r1=1.105&r2=1.106&f=u From twittner at pld-linux.org Fri Aug 26 18:34:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:37 2005 Subject: SPECS: kdevelop.spec - added `BuildConflicts: star'. gnutar (which... In-Reply-To: References: Message-ID: Author: twittner Date: Fri Aug 26 16:34:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks builds: gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ ChangeLog INSTALL NEWS README TODO No such file or directory. Cannot stat 'ChangeLog'. gnutar: No such file or directory. Cannot stat 'INSTALL'. [...] with gtar (tar pkg) everything goes OK. ---- Files affected: SPECS: kdevelop.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/kdevelop.spec diff -u SPECS/kdevelop.spec:1.101 SPECS/kdevelop.spec:1.102 --- SPECS/kdevelop.spec:1.101 Thu Jul 28 20:45:06 2005 +++ SPECS/kdevelop.spec Fri Aug 26 18:34:36 2005 @@ -42,6 +42,7 @@ BuildRequires: subversion-devel >= 1.2.0-4 #BuildRequires: unsermake >= 040511 BuildRequires: zlib-devel +BuildConflicts: star Requires: kdebase-core >= 9:%{_kdever} Requires: kdesdk-libcvsservice >= 3:%{_kdever} Requires: kdoc @@ -191,6 +192,16 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/26 16:34:36 twittner +- added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks + builds: + gnutar -cf gnu.tar -C ./gnu AUTHORS COPYING \ + ChangeLog INSTALL NEWS README TODO + No such file or directory. Cannot stat 'ChangeLog'. + gnutar: No such file or directory. Cannot stat 'INSTALL'. + [...] + with gtar (tar pkg) everything goes OK. + Revision 1.101 2005/07/28 18:45:06 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kdevelop.spec?r1=1.101&r2=1.102&f=u From arekm at pld-linux.org Fri Aug 26 11:38:32 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: kdelibs-branch.diff - updated In-Reply-To: References: Message-ID: Author: arekm Date: Fri Aug 26 09:38:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated ---- Files affected: SOURCES: kdelibs-branch.diff (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SOURCES/kdelibs-branch.diff diff -u SOURCES/kdelibs-branch.diff:1.16 SOURCES/kdelibs-branch.diff:1.17 --- SOURCES/kdelibs-branch.diff:1.16 Tue Aug 2 08:02:29 2005 +++ SOURCES/kdelibs-branch.diff Fri Aug 26 11:38:27 2005 @@ -1,7 +1,7 @@ Index: libkscreensaver/kscreensaver.cpp =================================================================== ---- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- libkscreensaver/kscreensaver.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ libkscreensaver/kscreensaver.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -65,6 +65,7 @@ if ( w == 0 ) w = 600; if ( h == 0 ) h = 420; @@ -26,8 +26,8 @@ bool KScreenSaver::eventFilter( QObject *o, QEvent *e ) Index: kate/part/katesearch.cpp =================================================================== ---- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kate/part/katesearch.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kate/part/katesearch.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -130,6 +130,7 @@ searchFlags.replace = false; searchFlags.finished = false; @@ -44,10 +44,23 @@ searchFlags.backward = searchFlags.backward != back; searchFlags.fromBeginning = false; +Index: mimetypes/audio/x-scpls.desktop +=================================================================== +--- mimetypes/audio/x-scpls.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/audio/x-scpls.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -31,7 +31,7 @@ + Comment[hu]=MP3 ShoutCast-lej??tsz??si lista + Comment[id]=Playlist MP3 ShoutCast + Comment[is]=Mp3 ShoutCast lagalisti +-Comment[it]=Playlist MP3 ShoutCast ++Comment[it]=Scaletta MP3 ShoutCast + Comment[ja]=MP3 ShoutCast ?????????????????? + Comment[ko]=MP3 ?????????????????? ?????? ?????? + Comment[lt]=MP3 ShoutCast gaidara??tis Index: mimetypes/application/x-gettext.desktop =================================================================== ---- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- mimetypes/application/x-gettext.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-gettext.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -6,6 +6,7 @@ Comment[az]=GNU Gettext ??smar???? Kataloqu Comment[bg]=?????????????????? ???? ???????????? (GNU Gettext) @@ -56,10 +69,130 @@ Comment[bs]=GNU Gettext katalog poruka Comment[ca]=Cat??leg de missatges Gettext de GNU Comment[cs]=Katalog zpr??v (Gettext) +Index: mimetypes/application/xsd.desktop +=================================================================== +--- mimetypes/application/xsd.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/xsd.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -3,6 +3,7 @@ + Comment=W3C XML Schema + Comment[af]=W3C XML Skema + Comment[bg]=??? ?????? W3C XML ++Comment[br]=Steu??v XML W3C + Comment[bs]=W3C XML ??ema + Comment[ca]=Esquema XML W3C + Comment[cs]=W3C XML sch??ma +Index: mimetypes/application/x-executable.desktop +=================================================================== +--- mimetypes/application/x-executable.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -6,6 +6,7 @@ + Comment[az]=??cra???? Fayl + Comment[bg]=???????????????? ???????? + Comment[bn]=???????????????????????????????????? ???????????? ++Comment[br]=Restr sevenadus + Comment[bs]=Izvr??na datoteka + Comment[ca]=Fitxer executable + Comment[cs]=Spustiteln?? soubor +Index: mimetypes/application/x-executable-script.desktop +=================================================================== +--- mimetypes/application/x-executable-script.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/x-executable-script.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Comment[af]=Skrip (moontlik uitvoerbaar) + Comment[bg]=???????????? (???????????????? ????????????????) + Comment[bn]=??????????????????????????? (?????????????????? ????????????????????????????????????) ++Comment[br]=Urzhiaoueg (marteze ur sevenadus) + Comment[bs]=Skripta (mo??da izvr??iva) + Comment[ca]=Gui?? (possiblement executable) + Comment[cs]=Pravd??podobn?? spustiteln?? skript +Index: mimetypes/application/vnd.stardivision.writer-global.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.writer-global.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.writer-global.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -8,6 +8,7 @@ + Comment[af]=StarOffice skrywer Meester Dokument + Comment[bg]=???????????? ???????????????? ???? StarOffice Writer + Comment[bn]=???????????????-?? ????????? ?????????????????? ????????????????????? ????????? ++Comment[br]=Teul mestr StarOffice Writer + Comment[bs]=StarOffice Writer glavni dokument + Comment[ca]=Document mestre de l'StarOffice Writer + Comment[cs]=Hlavn?? dokument aplikace StarOffice Writer +Index: mimetypes/application/vnd.stardivision.draw.desktop +=================================================================== +--- mimetypes/application/vnd.stardivision.draw.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ mimetypes/application/vnd.stardivision.draw.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[be]=?????????????? StarOffice + Comment[bg]=?????????????????????? ???? StarOffice Drawing + Comment[bn]=???????????????-?? ????????? ?????????????????? ++Comment[br]=Tresaner StarOffice + Comment[bs]=StarOffice crte?? + Comment[ca]=Dibuix de StarOffice + Comment[cs]=Kreslen?? aplikace StarOffice Draw +Index: kioslave/file/file.cc +=================================================================== +--- kioslave/file/file.cc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/file/file.cc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -1445,7 +1445,7 @@ + QString pmountProg = KGlobal::dirs()->findExe("pmount", path); + + if (pmountProg.isEmpty()) +- pmountProg = "pmount"; ++ return false; + + QCString buffer; + buffer.sprintf( "%s %s", QFile::encodeName(pmountProg).data(), +Index: kioslave/http/kcookiejar/kcookiejar.cpp +=================================================================== +--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -773,14 +773,24 @@ + while ((*cookieStr == ';') || (*cookieStr == ' ')) + { + cookieStr++; +- ++ + // Name-Value pair follows + cookieStr = parseNameValue(cookieStr, Name, Value); + + QCString cName = Name.lower().latin1(); + if (cName == "domain") + { +- lastCookie->mDomain = Value.lower(); ++ QString dom = Value.lower(); ++ // RFC2965 3.2.2: If an explicitly specified value does not ++ // start with a dot, the user agent supplies a leading dot ++ if(dom.length() && dom[0] != '.') ++ dom.prepend("."); ++ // remove a trailing dot ++ if(dom.length() > 2 && dom[dom.length()-1] == '.') ++ dom = dom.left(dom.length()-1); ++ ++ if(dom.contains('.') > 1 || dom == ".local") ++ lastCookie->mDomain = dom; + } + else if (cName == "max-age") + { +Index: kioslave/http/kcookiejar/tests/cookie_rfc.test +=================================================================== +--- kioslave/http/kcookiejar/tests/cookie_rfc.test (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/http/kcookiejar/tests/cookie_rfc.test (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,6 +38,11 @@ + COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=; Version=1; Path="/"; Max-Age=0 + CHECK http://w.y.z/ Cookie: $Version=1; some_value2=foobar; $Path="/" + CLEAR COOKIES ++## Check if we prepend domain with a dot ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value2; Version=1; Path="/"; Domain=.y.z; Max-Age=3600 ++COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Domain=y.z.; Max-Age=3600 ++CHECK http://w.y.z/ Cookie: $Version=1; some_value=value3; $Path="/"; $Domain=".y.z" ++CLEAR COOKIES + ## Check if multiple cookies on a single line work + ## FIXME + #COOKIE ASK http://w.y.z/ Set-Cookie2: some_value=value3; Version=1; Path="/"; Max-Age=3600, some_value2=foobar; Version=1; Path="/"; Max-Age=3600 Index: kioslave/ftp/ftp.protocol =================================================================== ---- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kioslave/ftp/ftp.protocol (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kioslave/ftp/ftp.protocol (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -10,6 +10,7 @@ writing=true makedir=true @@ -68,10 +201,45 @@ ProxiedBy=http Icon=ftp maxInstances=2 +Index: kimgio/psd.h +=================================================================== +--- kimgio/psd.h (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kimgio/psd.h (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -10,11 +10,13 @@ + #ifndef KIMG_PSD_H + #define KIMG_PSD_H + ++#include ++ + class QImageIO; + + extern "C" { +-void kimgio_psd_read( QImageIO * ); +-void kimgio_psd_write( QImageIO * ); ++KDE_EXPORT void kimgio_psd_read( QImageIO * ); ++KDE_EXPORT void kimgio_psd_write( QImageIO * ); + } + + #endif +Index: kio/kio/connection.cpp +=================================================================== +--- kio/kio/connection.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/connection.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -252,6 +252,10 @@ + kdError(7017) << "Data read failed, errno=" << errno << endl; + return -1; + } ++ if ( !n ) { // 0 indicates end of file ++ kdError(7017) << "Connection ended unexpectedly (" << n << "/" << bytesToGo << ")" << endl; ++ return -1; ++ } + + bytesRead += n; + bytesToGo -= n; Index: kio/kio/kmimemagic.cpp =================================================================== ---- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/kio/kmimemagic.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/kio/kmimemagic.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2262,6 +2262,15 @@ tmp += "src"; r->setMimeType(tmp); @@ -90,8 +258,8 @@ KMimeMagicResult * Index: kio/misc/kpac/eventsrc =================================================================== ---- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kio/misc/kpac/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kio/misc/kpac/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -77,7 +77,7 @@ Name[cy]=Sgript dirprwy annilys Name[da]=Ugyldigt proxy-script @@ -110,10 +278,254 @@ Comment[eo]=La ??ar??ita prokuragordoskript estas nevalida Comment[es]=El procedimiento descargado para la configuraci??n del proxy es inv??lido Comment[et]=Alla laaditud proxy seadistuse skript on vigane +Index: kstyles/themes/light-v2.themerc +=================================================================== +--- kstyles/themes/light-v2.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v2.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 2-ci burax??l???? + Name[bn]=???????????? ??????????????????, ????????????????????? ????????????????????? ++Name[br]=Giz sklerijenn, eil stumm + Name[bs]=Light stil, druga revizija + Name[ca]=Estil Light, 2ona revisi?? + Name[cs]=Light Style, druh?? verze +Index: kstyles/themes/light-v3.themerc +=================================================================== +--- kstyles/themes/light-v3.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/light-v3.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -4,6 +4,7 @@ + Name[ar]=??? ?? ?????????? ?????????????? ???????????? + Name[az]=Y??ng??l T??rz, 3-c?? burax??l???? + Name[bn]=???????????? ??????????????????, ??????????????? ????????????????????? ++Name[br]=Giz sklerijenn, trede stumm + Name[bs]=Light stil, tre??a revizija + Name[ca]=Estil Light, 3era revisi?? + Name[cs]=Light Style, t??et?? verze +Index: kstyles/themes/highcolor.themerc +=================================================================== +--- kstyles/themes/highcolor.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/highcolor.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -62,6 +62,7 @@ + Comment[az]=Klassik t??rzin z??ngin r??ngli burax??l?????? + Comment[bg]=???????????????????? ???????? ???? ?????? ?? ???????????? ???????????????? ???? ?????????????????? + Comment[bn]=????????????????????? ???????????????????????? ?????????-??????????????? ????????????????????? ++Comment[br]=Stumm livio?? uhel ar c'hiz da gustum + Comment[bs]=Highcolor verzija klasi??nog stila + Comment[ca]=Versi?? Highcolor de l'estil cl??ssic + Comment[cs]=Mnohobarevn?? verze klasick??ho stylu +Index: kstyles/themes/beos.themerc +=================================================================== +--- kstyles/themes/beos.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/themes/beos.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -9,6 +9,7 @@ + Comment[az]=??rt??ks??z BeOS b??nz??ri t??rz + Comment[be]=?????????? ?????????????? ???? BeOS (?????? ??????) + Comment[bg]=???????? ?????? ????????, ?????????????? ???? BeOS ++Comment[br]=Giz evel BeOS anwisket + Comment[bs]=Stil bez teme, sli??an Beos-u + Comment[ca]=Estil del tipus BeOS sense temes + Comment[cs]=Styl podobn?? BeOS (bez motivu) +Index: kstyles/web/web.themerc +=================================================================== +--- kstyles/web/web.themerc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kstyles/web/web.themerc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -73,6 +73,7 @@ + Comment[az]=Veb p??nc??r??cik t??rzi + Comment[bg]=????????, ???????????????? ???? ?????? ???????????????? ???????????? + Comment[bn]=???????????? ??????????????? ?????????????????? ++Comment[br]=Giz widget gwiad + Comment[bs]=Stil ukrasa na webu + Comment[ca]=Estil d'objectes web + Comment[cs]=Styl prvk?? webu +Index: kabc/formats/binaryformat.cpp +=================================================================== +--- kabc/formats/binaryformat.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kabc/formats/binaryformat.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -38,7 +38,7 @@ + + extern "C" + { +- FormatPlugin *format() ++ KDE_EXPORT FormatPlugin *format() + { + return new BinaryFormat; + } +Index: knewstuff/downloaddialog.cpp +=================================================================== +--- knewstuff/downloaddialog.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ knewstuff/downloaddialog.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -50,6 +50,7 @@ + { + QString m_providerlist; + QWidget *m_page; ++ KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; + }; + + class NumSortListViewItem : public KListViewItem +@@ -206,7 +207,6 @@ + KTabCtl *ctl; + QWidget *w_d, *w_r, *w_l; + QWidget *w2; +- KListView *lvtmp_r, *lvtmp_d, *lvtmp_l; + QTextBrowser *rt; + QString tmp; + int ret; +@@ -244,27 +244,27 @@ + QHBoxLayout *box = new QHBoxLayout(frame); + box->add(ctl); + +- lvtmp_r = new KListView(w_r); +- lvtmp_r->addColumn(i18n("Name")); +- lvtmp_r->addColumn(i18n("Version")); +- lvtmp_r->addColumn(i18n("Rating")); +- lvtmp_r->setSorting(2, false); ++ d->m_lvtmp_r = new KListView(w_r); ++ d->m_lvtmp_r->addColumn(i18n("Name")); ++ d->m_lvtmp_r->addColumn(i18n("Version")); ++ d->m_lvtmp_r->addColumn(i18n("Rating")); ++ d->m_lvtmp_r->setSorting(2, false); + +- lvtmp_d = new KListView(w_d); +- lvtmp_d->addColumn(i18n("Name")); +- lvtmp_d->addColumn(i18n("Version")); +- lvtmp_d->addColumn(i18n("Downloads")); +- lvtmp_d->setSorting(2, false); ++ d->m_lvtmp_d = new KListView(w_d); ++ d->m_lvtmp_d->addColumn(i18n("Name")); ++ d->m_lvtmp_d->addColumn(i18n("Version")); ++ d->m_lvtmp_d->addColumn(i18n("Downloads")); ++ d->m_lvtmp_d->setSorting(2, false); + +- lvtmp_l = new KListView(w_l); +- lvtmp_l->addColumn(i18n("Name")); +- lvtmp_l->addColumn(i18n("Version")); +- lvtmp_l->addColumn(i18n("Release Date")); +- lvtmp_l->setSorting(2, false); ++ d->m_lvtmp_l = new KListView(w_l); ++ d->m_lvtmp_l->addColumn(i18n("Name")); ++ d->m_lvtmp_l->addColumn(i18n("Version")); ++ d->m_lvtmp_l->addColumn(i18n("Release Date")); ++ d->m_lvtmp_l->setSorting(2, false); + +- connect(lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); +- connect(lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_r, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_d, SIGNAL(selectionChanged()), SLOT(slotSelected())); ++ connect(d->m_lvtmp_l, SIGNAL(selectionChanged()), SLOT(slotSelected())); + + rt = new QTextBrowser(frame); + rt->setMinimumWidth(150); +@@ -285,14 +285,14 @@ + connect(de, SIGNAL(clicked()), SLOT(slotDetails())); + + QVBoxLayout *box2 = new QVBoxLayout(w_r); +- box2->add(lvtmp_r); ++ box2->add(d->m_lvtmp_r); + QVBoxLayout *box3 = new QVBoxLayout(w_d); +- box3->add(lvtmp_d); ++ box3->add(d->m_lvtmp_d); + QVBoxLayout *box4 = new QVBoxLayout(w_l); +- box4->add(lvtmp_l); ++ box4->add(d->m_lvtmp_l); + + QValueList *v = new QValueList; +- *v << lvtmp_r << lvtmp_d << lvtmp_l; ++ *v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l; + m_map[frame] = v; + m_rts[frame] = rt; + QValueList *vb = new QValueList; +@@ -300,7 +300,7 @@ + m_buttons[frame] = vb; + m_providers[frame] = p; + +- kdDebug() << "addProvider()/end; lvtmp_r = " << lvtmp_r << endl; ++ kdDebug() << "addProvider()/end; d->m_lvtmp_r = " << d->m_lvtmp_r << endl; + + if(m_engine) slotPage(frame); + +@@ -353,7 +353,7 @@ + QDate date; + QString datestring; + int installed; +- ++ + kapp->config()->setGroup("KNewStuffStatus"); + datestring = kapp->config()->readEntry(entry->name()); + if(datestring.isNull()) installed = 0; +@@ -456,6 +456,9 @@ + { + Entry *e = getEntry(); + if(!e) return; ++ d->m_lvtmp_r->setEnabled( false ); ++ d->m_lvtmp_l->setEnabled( false ); ++ d->m_lvtmp_d->setEnabled( false ); + + kdDebug() << "download entry now" << endl; + +@@ -467,9 +470,7 @@ + else + { + m_s = new KNewStuffGeneric(e->type(), this); +- + m_entry = e; +- + KURL source = e->payload(); + KURL dest = KURL(m_s->downloadDestination(e)); + +@@ -492,7 +493,7 @@ + m_entryitem = lv_l->findItem(m_entryname, 0); + if(m_entryitem) m_entryitem->setPixmap(0, pix); + +- ++ + QPushButton *in; + in = *(m_buttons[d->m_page]->at(0)); + if(in) in->setEnabled(false); +@@ -502,7 +503,6 @@ + { + bool ret = (job->error() == 0); + KIO::FileCopyJob *cjob; +- + if(ret) + { + cjob = static_cast(job); +@@ -520,6 +520,9 @@ + KMessageBox::information(this, i18n("Installation successful."), i18n("Installation")); + } + else KMessageBox::error(this, i18n("Installation failed."), i18n("Installation")); ++ d->m_lvtmp_r->setEnabled( true ); ++ d->m_lvtmp_l->setEnabled( true ); ++ d->m_lvtmp_d->setEnabled( true ); + + delete m_s; + } +Index: kdecore/eventsrc +=================================================================== +--- kdecore/eventsrc (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kdecore/eventsrc (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -625,7 +625,7 @@ + Comment[cy]=Methu agor y ffeil penodol i'w ddarllen neu i'w ysgrifennu. + Comment[da]=Den valgte fil kan ikke ??bnes til l??sning eller skrivning + Comment[de]=Die gew??hlte Datei kann nicht zum Lesen oder Schreiben ge??ffnet werden. +-Comment[el]=???? ???????????????????? ???????????? ???? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? ++Comment[el]=???? ???????????????????? ???????????? ?????? ???????????? ???? ???????????????? ?????? ?????????????? ?? ???????????????? + Comment[eo]=La elektita dosiero ne estas malfermebla por legado a?? skribado + Comment[es]=El archivo seleccionado no se puede abrir para leer o escribir. + Comment[et]=Valitud faili pole v??imalik avada lugemiseks v??i kirjutamiseks. +@@ -1605,6 +1605,7 @@ + Name[be]=?????????????????????????? ?????????????????????????? + Name[bg]=???????????????????? + Name[bn]=?????????????????????????????? ++Name[br]=Kemennad a titouro?? + Name[bs]=Informativna poruka + Name[ca]=Missatge informatiu + Name[cs]=Informa??n?? zpr??va Index: khtml/khtmlview.cpp =================================================================== ---- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/khtmlview.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/khtmlview.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -2238,7 +2238,9 @@ guard = node; } @@ -126,8 +538,8 @@ emit m_part->nodeActivated(Node(node)); Index: khtml/html/html_formimpl.cpp =================================================================== ---- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/html/html_formimpl.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/html/html_formimpl.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -954,16 +954,15 @@ if (!evt->defaultHandled() && m_render && m_render->isWidget()) { @@ -151,8 +563,8 @@ } Index: khtml/ecma/kjs_events.cpp =================================================================== ---- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/ecma/kjs_events.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/ecma/kjs_events.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -635,6 +635,9 @@ return Boolean(static_cast(event).metaKey()); case Button: @@ -165,8 +577,8 @@ int domButton = static_cast(event).button(); Index: khtml/rendering/render_list.cpp =================================================================== ---- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_list.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_list.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -402,7 +402,7 @@ m_markerWidth = m_width = 0; @@ -178,8 +590,8 @@ m_width = m_markerWidth; Index: khtml/rendering/render_object.cpp =================================================================== ---- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_object.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_object.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -1697,21 +1697,22 @@ { // vertical align for table cells has a different meaning @@ -209,8 +621,8 @@ int fontheight = ref->lineHeight( firstLine ); Index: khtml/rendering/render_replaced.cpp =================================================================== ---- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- khtml/rendering/render_replaced.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ khtml/rendering/render_replaced.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -513,7 +513,7 @@ QWidget* const w = ::qt_cast(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { @@ -226,8 +638,8 @@ svn:mime-type = application/x-jar Index: kresources/kresources.desktop =================================================================== ---- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 442272) -+++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 442272) +--- kresources/kresources.desktop (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ kresources/kresources.desktop (.../branches/KDE/3.4/kdelibs) (revision 453462) @@ -14,6 +14,7 @@ Name[af]=KDE Hulpbronne Name[bg]=???????????????? ?????????????? @@ -244,10 +656,201 @@ Comment[bs]=Podesite KDE resurse Comment[ca]=Configura els recursos KDE Comment[cs]=Nastaven?? zdroj?? KDE +Index: dcop/dcopsignals.cpp +=================================================================== +--- dcop/dcopsignals.cpp (.../tags/KDE/3.4.2/kdelibs) (revision 453462) ++++ dcop/dcopsignals.cpp (.../branches/KDE/3.4/kdelibs) (revision 453462) +@@ -154,7 +154,7 @@ + + list->append( current ); + conn->signalConnectionList()->append(current); +- if (senderConn) ++ if (senderConn && senderConn != conn) + senderConn->signalConnectionList()->append(current); + return true; + #else //!Q_OS_UNIX +Index: pics/crystalsvg/cr64-action-player_play.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = image/png + +Property changes on: pics/crystalsvg/cr64-action-player_play.png +___________________________________________________________________ +Name: svn:mime-type + + image/png + +Index: kdoctools/customization/pl/user.entities +=================================================================== +--- kdoctools/customization/pl/user.entities (.../tags/KDE/3.4.2/kdelibs) (revision 453462) <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Fri Aug 26 20:33:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: cairo-bug4110.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:33:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: cairo-bug4110.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 20:46:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: cairo.spec - updated deps (ac/am, freetype for ps/pdf backe... In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:46:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) and xcb backend (on bcond - requires not released yet xcb) - -devel doesn't obsolete standalone libpixman-devel ---- Files affected: SPECS: cairo.spec (1.34 -> 1.35) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.34 SPECS/cairo.spec:1.35 --- SPECS/cairo.spec:1.34 Fri Aug 26 05:55:49 2005 +++ SPECS/cairo.spec Fri Aug 26 20:46:28 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with xcb # enable XCB backend (XCB not released yet) +# Summary: Cairo - multi-platform 2D graphics library Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo @@ -10,16 +14,16 @@ # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ BuildConflicts: libpixman-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 2.54 +BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel -BuildRequires: freetype-devel >= 2.1.0 +BuildRequires: freetype-devel >= 2.1.4 BuildRequires: glitz-devel >= 0.4.4 BuildRequires: gtk-doc >= 1.3 BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: pkgconfig -#BuildRequires: xcb-devel (http://freedesktop.org/software/xcb - CVS only, not released yet) +%{?with_xcb:BuildRequires: xcb-devel} BuildRequires: xrender-devel >= 0.6 BuildRequires: zlib-devel Requires: freetype >= 2.1.0 @@ -73,11 +77,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: fontconfig-devel -Requires: freetype-devel >= 2.1.0 +Requires: freetype-devel >= 2.1.4 Requires: glitz-devel >= 0.4.4 Requires: libpng-devel +%{?with_xcb:Requires: xcb-devel} Requires: xrender-devel >= 0.6 -Obsoletes: libpixman-devel %description devel Development files for Cairo library. @@ -108,8 +112,7 @@ %{__automake} %configure \ --enable-gtk-doc \ - --enable-quartz \ - --enable-xcb \ + %{?with_xcb:--enable-xcb} \ --enable-glitz \ --enable-ps \ --enable-pdf \ @@ -152,6 +155,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.35 2005/08/26 18:46:28 qboosh +- updated deps (ac/am, freetype for ps/pdf backends) +- don't try to enable quartz backend (not available on Linux) + and xcb backend (on bcond - requires not released yet xcb) +- -devel doesn't obsolete standalone libpixman-devel + Revision 1.34 2005/08/26 03:55:49 aredridel - up to 1.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.34&r2=1.35&f=u From qboosh at pld-linux.org Fri Aug 26 20:54:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: gnome-bluetooth-pygtk.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 18:54:28 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: gnome-bluetooth-pygtk.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:09:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: grabcartoons.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:09:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: grabcartoons.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/grabcartoons.spec diff -u SPECS/grabcartoons.spec:1.1 SPECS/grabcartoons.spec:1.2 --- SPECS/grabcartoons.spec:1.1 Mon Aug 22 08:52:36 2005 +++ SPECS/grabcartoons.spec Fri Aug 26 21:09:36 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: commic-summarizing utility +Summary(pl): Narz?dzie do streszczania komiks?w Name: grabcartoons Version: 1.11 Release: 0.1 @@ -16,6 +17,10 @@ GrabCartoons is a comic-summarizing utility. It is modular, and it is very easy to write modules for new comics. +%description -l pl +GrabCartoons to narz?dzie do streszczania komiks?w. Jest modularne i +?atwo do niego dopisywa? modu?y do nowych komiks?w. + %prep %setup -q %patch0 -p1 @@ -33,7 +38,7 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* -/usr/lib/grabcartoons +%{_prefix}/lib/grabcartoons %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -41,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:09:36 qboosh +- pl + Revision 1.1 2005/08/22 06:52:36 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/grabcartoons.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:20:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: gsutil.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:20:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: gsutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/gsutil.spec diff -u SPECS/gsutil.spec:1.1 SPECS/gsutil.spec:1.2 --- SPECS/gsutil.spec:1.1 Fri Aug 19 09:39:35 2005 +++ SPECS/gsutil.spec Fri Aug 26 21:20:51 2005 @@ -1,29 +1,32 @@ # $Revision$, $Date$ Summary: A utility to save, restore and reboot Grandstream Budgetone phones +Summary(pl): Narz?dzie do zapisywania, odtwarzania i restartowania telefon?w Grandstream Budgetone Name: gsutil Version: 2.1 Release: 1 +License: GPL Group: Applications/System Source0: http://www.pkts.ca/%{name}-%{version}.tar.gz # Source0-md5: 28010ee2e2881dd6597e27659174ee6a -License: GPL URL: http://www.pkts.ca/gsutil.shtml -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -BuildArch: noarch Requires: perl Requires: perl-libwww Provides: gsutil +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A utility to dump and restore the configuration of the Grandstream Budgetone VOIP telephone, up to and including version 1.0.6.7 of the firmware. +%description -l pl +Narz?dzie do zrzucania i odtwarzania konfiguracji telefon?w VOIP +Grandstream Budgetone do wersji firmware'u 1.0.6.7 w??cznie. + %prep %setup -q -%build - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_bindir} @@ -34,8 +37,8 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/gsutil %doc README Changelog +%attr(755,root,root) %{_bindir}/gsutil %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -43,6 +46,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 19:20:51 qboosh +- pl, unified + Revision 1.1 2005/08/19 07:39:35 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsutil.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: xprobe2-0.3.tar.gz Message-ID: <16445.1125084444@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xprobe/xprobe2-0.3.tar.gz 3ebb89ed9380038d368327816e34ec54 xprobe2-0.3.tar.gz Size: 533636 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:27:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: xprobe2.spec - updated URLs In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:27:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URLs ---- Files affected: SPECS: xprobe2.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.9 SPECS/xprobe2.spec:1.10 --- SPECS/xprobe2.spec:1.9 Fri Aug 19 10:08:34 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:27:18 2005 @@ -6,10 +6,10 @@ Release: 0.1 License: GPL Group: Networking -Source0: http://www.sys-security.com/archive/tools/xprobe2/%{name}-%{version}.tar.gz +Source0: http://dl.sourceforge.net/xprobe/%{name}-%{version}.tar.gz # Source0-md5: 3ebb89ed9380038d368327816e34ec54 Patch0: %{name}-paths.patch -URL: http://www.sys-security.com/html/projects/X.html +URL: http://www.sys-security.com/index.php?page=xprobe BuildRequires: autoconf BuildRequires: libpcap-devel BuildRequires: libstdc++-devel @@ -61,7 +61,7 @@ %doc README CHANGELOG docs/modules_howto.txt %attr(755,root,root) %{_bindir}/xprobe2 %{_mandir}/man1/* -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xprobe2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xprobe2.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/26 19:27:18 qboosh +- updated URLs + Revision 1.9 2005/08/19 08:08:34 grzegorz - ups md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.9&r2=1.10&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: xprobe2.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: xprobe2.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/xprobe2.spec diff -u SPECS/xprobe2.spec:1.10 SPECS/xprobe2.spec:1.11 --- SPECS/xprobe2.spec:1.10 Fri Aug 26 21:27:18 2005 +++ SPECS/xprobe2.spec Fri Aug 26 21:28:05 2005 @@ -33,7 +33,7 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 %build cp -f /usr/share/automake/config.sub cfg-scripts/config.sub @@ -49,7 +49,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT install -D etc/xprobe2.conf $RPM_BUILD_ROOT%{_sysconfdir}/xprobe2.conf @@ -69,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/26 19:28:05 qboosh +- cosmetics + Revision 1.10 2005/08/26 19:27:18 qboosh - updated URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xprobe2.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Fri Aug 26 21:28:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: xprobe2-gcc33.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:28:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: xprobe2-gcc33.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Fri Aug 26 21:34:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: idesk.spec - updated pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:34:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated pl ---- Files affected: SPECS: idesk.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/idesk.spec diff -u SPECS/idesk.spec:1.17 SPECS/idesk.spec:1.18 --- SPECS/idesk.spec:1.17 Mon Aug 22 18:05:09 2005 +++ SPECS/idesk.spec Fri Aug 26 21:34:23 2005 @@ -22,14 +22,18 @@ %description Idesk allows creation of desktop icons. Feature quite nice, and not provided by all window managers. The icon graphics are either from a -png or svg (vector) file and support some eyecandy effects like -transparency. Each icon can be confgured to run one or more shell +PNG or SVG (vector) file and support some eyecandy effects like +transparency. Each icon can be configured to run one or more shell commands and the actions which run those commands are completely configurable. %description -l pl Idesk umo?liwia tworzenie ikon na pulpicie - cecha przydatna, ale nie -oferowana przez wszystkie window managery. +oferowana przez wszystkich zarz?dc?w okien. Grafiki ikon pochodz? z +plik?w PNG lub (wektorowych) SVG i wspieraj? niekt?re efekty takie +jak przezroczysto??. Ka?da ikona mo?e by? skonfigurowana do +uruchamiania jednego lub wi?kszej liczby polece? pow?oki, a akcje +uruchamiaj?ce te polecenia s? w pe?ni konfigurowalne. %prep %setup -q @@ -64,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/26 19:34:23 qboosh +- updated pl + Revision 1.17 2005/08/22 16:05:09 spider - extended description ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/idesk.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Fri Aug 26 21:35:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: rlocate-0.3.2.tar.gz Message-ID: <21604.1125084920@distfiles.pld-linux.org> Files fetched: 0 ALREADY GOT: http://dl.sourceforge.net/rlocate/rlocate-0.3.2.tar.gz e3c8371a6659bf1e0d9d1fe02c0efe6d rlocate-0.3.2.tar.gz -- Virtually Yours: distfiles. From qboosh at pld-linux.org Fri Aug 26 21:45:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: kchmviewer.spec - pl, unified In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:45:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, unified ---- Files affected: SPECS: kchmviewer.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/kchmviewer.spec diff -u SPECS/kchmviewer.spec:1.3 SPECS/kchmviewer.spec:1.4 --- SPECS/kchmviewer.spec:1.3 Mon Aug 22 15:07:58 2005 +++ SPECS/kchmviewer.spec Fri Aug 26 21:45:09 2005 @@ -4,7 +4,8 @@ %bcond_with kde # enable KDE support %bcond_without arts # build without aRts default=no # -Summary: KchmViewer is a chm (MS HTML help file format) viewer +Summary: KchmViewer - a CHM (MS HTML help file format) viewer +Summary(pl): KchmViewer - przegl?darka CHM (formatu plik?w pomocy MS HTML) Name: kchmviewer Version: 1.0 Release: 0.6 @@ -13,20 +14,27 @@ Source0: http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz # Source0-md5: 0f9595cbb13eb950261e660c168dc033 URL: http://kchmviewer.sourceforge.net/ +%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel -BuildRequires: zlib-devel -%{?with_kde:BuildRequires: kdelibs-devel} BuildRequires: qt-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +KchmViewer is a CHM (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or Gnome. However, it may be +library, and does not depend on KDE or GNOME. However, it may be compiled with full KDE support, including KDE widgets and KIO/KHTML. +%description -l pl +KchmViewer to przegl?darka CHM (formatu plik?w pomocy MS HTML) +napisana w C++. W przeciwie?stwie do wi?kszo?ci istniej?cych +przegl?darek CHM dla Uniksa u?ywa biblioteki widget?w Trolltecha Qt i +nie zale?y od KDE czy GNOME. Jednak mo?e by? skompilowana z pe?nym +wsparciem dla KDE, w??cznie z widgetami KDE i KIO/KHTML. + %prep %setup -q @@ -56,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 19:45:09 qboosh +- pl, unified + Revision 1.3 2005/08/22 13:07:58 spider - spaces -> tabs @@ -64,4 +75,3 @@ Revision 1.1 2005/08/22 10:45:44 spider - init - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kchmviewer.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Fri Aug 26 21:48:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: kde-icons-gartoon.spec - pl, missing defattr In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:48:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, missing defattr ---- Files affected: SPECS: kde-icons-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-icons-gartoon.spec diff -u SPECS/kde-icons-gartoon.spec:1.2 SPECS/kde-icons-gartoon.spec:1.3 --- SPECS/kde-icons-gartoon.spec:1.2 Sat Aug 20 21:29:44 2005 +++ SPECS/kde-icons-gartoon.spec Fri Aug 26 21:48:19 2005 @@ -21,13 +21,22 @@ %description Fun looking icons with bright colors and bold outlines. +%description -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. + %package blue Summary: KDE icons - %{_name} blue +Summary(pl): Motyw ikon do KDE - %{_name} blue Group: Themes %description blue Fun looking icons with bright colors and bold outlines. Blue theme. +%description blue -l pl +?miesznie wygl?daj?ce ikony z jasnymi kolorami i grubymi liniami +otaczaj?cymi. Motyw niebieski. + %prep %install @@ -45,6 +54,7 @@ %{_iconsdir}/%{_name} %files blue +%defattr(644,root,root,755) %{_iconsdir}/%{_name}-blue %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +63,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:48:19 qboosh +- pl, missing defattr + Revision 1.2 2005/08/20 19:29:44 glen - use SVG. seems to work ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-icons-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:49:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: kde-splash-gartoon.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:49:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: kde-splash-gartoon.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/kde-splash-gartoon.spec diff -u SPECS/kde-splash-gartoon.spec:1.2 SPECS/kde-splash-gartoon.spec:1.3 --- SPECS/kde-splash-gartoon.spec:1.2 Mon Aug 22 09:54:49 2005 +++ SPECS/kde-splash-gartoon.spec Fri Aug 26 21:49:16 2005 @@ -17,6 +17,9 @@ %description gartoon splash screen. +%description -l pl +Ekran startowy gartoon. + %prep %setup -q -n gartoonss @@ -40,6 +43,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/26 19:49:16 qboosh +- pl desc + Revision 1.2 2005/08/22 07:54:49 glen - rel 0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kde-splash-gartoon.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Fri Aug 26 21:58:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: shared-mime-info.spec - updated URL In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 19:58:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated URL ---- Files affected: SPECS: shared-mime-info.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/shared-mime-info.spec diff -u SPECS/shared-mime-info.spec:1.31 SPECS/shared-mime-info.spec:1.32 --- SPECS/shared-mime-info.spec:1.31 Wed Aug 17 20:14:47 2005 +++ SPECS/shared-mime-info.spec Fri Aug 26 21:57:54 2005 @@ -6,7 +6,7 @@ Release: 1 License: GPL Group: X11/Applications -#Source0: http://freedesktop.org/Software/%{name}/%{name}-%{version}.tar.gz +#Source0: http://freedesktop.org/software/shared-mime-info/%{name}-%{version}.tar.gz Source0: http://freedesktop.org/~jrb/%{name}-%{version}.tar.gz # Source0-md5: 255a20bae753ebd41e2286b01e7b86d0 Patch0: %{name}-dtd_path.patch @@ -14,6 +14,7 @@ Patch2: %{name}-dicom.patch Patch3: %{name}-polish.patch Patch4: %{name}-word.patch +URL: http://www.freedesktop.org/wiki/Software/shared-mime-info BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-dtd412-xml @@ -21,7 +22,6 @@ BuildRequires: glib2-devel BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: pkgconfig -URL: http://www.freedesktop.org/software/shared-mime-info BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.32 2005/08/26 19:57:54 qboosh +- updated URL + Revision 1.31 2005/08/17 18:14:47 adgor - 0.16 (unofficial) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/shared-mime-info.spec?r1=1.31&r2=1.32&f=u From qboosh at pld-linux.org Fri Aug 26 22:00:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: libcontainer.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 20:00:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libcontainer.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libcontainer.spec diff -u SPECS/libcontainer.spec:1.1 SPECS/libcontainer.spec:1.2 --- SPECS/libcontainer.spec:1.1 Sun Aug 21 00:53:13 2005 +++ SPECS/libcontainer.spec Fri Aug 26 22:00:08 2005 @@ -3,8 +3,8 @@ # Conditional build: %bcond_without static_libs # don't build static libraries # -Summary: Simple C library that provides linked lists, stacks, queues and binary trees. -Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych. +Summary: Simple C library that provides linked lists, stacks, queues and binary trees +Summary(pl): Prosta biblioteka C dostarczaj?ca list wi?zanych, stos?w, kolejek i drzew binarnych Name: libcontainer Version: 0.1.0 Release: 0.1 @@ -25,7 +25,12 @@ bubble sort at the moment). There is a slight lack of documentation but there are some examples in the test/ directory. -#%%description -l pl +%description -l pl +Libcontainer to prosta biblioteka C, kt?rej mo?na u?ywa? w aplikacjach +do obs?ugi list wi?zanych, stos?w, kolejek i drzew binarnych. Autor +chcia?by jeszcze popracowa? nad ni? nieco wi?cej (listy wi?zane +obs?uguj? aktualnie tylko sortowanie b?belkowe). S? pewne braki w +dokumentacji, ale jest troch? przyk?ad?w w katalogu test/. %package devel Summary: Header files for libcontainer library @@ -98,7 +103,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 20:00:08 qboosh +- pl desc + Revision 1.1 2005/08/20 22:53:13 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libcontainer.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Fri Aug 26 22:17:19 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: template-php-pecl.spec, template-php4-pecl.spec - add neede... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:17:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add needed rpmbuild(macros) >= 1.228 for %service macro ---- Files affected: SPECS: template-php-pecl.spec (1.11 -> 1.12) , template-php4-pecl.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.11 SPECS/template-php-pecl.spec:1.12 --- SPECS/template-php-pecl.spec:1.11 Fri Aug 26 18:15:39 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php-devel >= 3:5.0.0 +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php-common php-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.11 2005/08/26 16:15:39 adamg - conf.d support ================================================================ Index: SPECS/template-php4-pecl.spec diff -u SPECS/template-php4-pecl.spec:1.4 SPECS/template-php4-pecl.spec:1.5 --- SPECS/template-php4-pecl.spec:1.4 Fri Aug 26 18:14:52 2005 +++ SPECS/template-php4-pecl.spec Fri Aug 26 22:17:12 2005 @@ -15,6 +15,7 @@ URL: http://pecl.php.net/package/Modname/ BuildRequires: libtool BuildRequires: php4-devel +BuildRequires: rpmbuild(macros) >= 1.230 Requires: %{_sysconfdir}/conf.d %requires_eq_to php4-common php4-devel Obsoletes: php-pear-%{_modname} @@ -72,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/26 20:17:12 glen +- add needed rpmbuild(macros) >= 1.228 for %service macro + Revision 1.4 2005/08/26 16:14:52 adamg - move %define calls to the top of the file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/SPECS/template-php4-pecl.spec?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Fri Aug 26 22:18:01 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: template-php-pecl.spec - this is for php5 In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 20:18:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - this is for php5 ---- Files affected: SPECS: template-php-pecl.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/template-php-pecl.spec diff -u SPECS/template-php-pecl.spec:1.12 SPECS/template-php-pecl.spec:1.13 --- SPECS/template-php-pecl.spec:1.12 Fri Aug 26 22:17:12 2005 +++ SPECS/template-php-pecl.spec Fri Aug 26 22:17:55 2005 @@ -52,13 +52,13 @@ rm -rf $RPM_BUILD_ROOT %post -[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart -[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart +[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart %postun if [ "$1" = 0 ]; then - [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart - [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart + [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart fi %files @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/26 20:17:55 glen +- this is for php5 + Revision 1.12 2005/08/26 20:17:12 glen - add needed rpmbuild(macros) >= 1.228 for %service macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/template-php-pecl.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Fri Aug 26 23:01:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: libsl.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:01:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: libsl.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libsl.spec diff -u SPECS/libsl.spec:1.1 SPECS/libsl.spec:1.2 --- SPECS/libsl.spec:1.1 Sun Aug 21 01:08:17 2005 +++ SPECS/libsl.spec Fri Aug 26 23:01:28 2005 @@ -6,7 +6,7 @@ %bcond_without static_libs # don't build static libraries # Summary: A small and flexible linked list implementation -Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej. +Summary(pl): Ma?a i elastyczna implementacja listy wi?zanej Name: libsl Version: 0.3.2 Release: 0.1 @@ -30,7 +30,16 @@ nodes. It also means that a push can't fail because memory couldn't be allocated for the container node. -#%%description -l pl +%description -l pl +sl to wydajna pami?ciowo biblioteka og?lnych list wi?zanych. Nie u?ywa +w?z??w kontenerowych. Zamiast tego wymaga wska?nika do nast?pnego +elementu bezpo?rednio w strukturze danych, z kt?rej chce si? utworzy? +listy (lub stosy). Mo?e to da? znacz?c? oszcz?dno?? pami?ci przy +tworzeniu d?ugich list ma?ych struktur. Pozwala tak?e na szybkie +operacje "push" i "pop", jako ?e nie ma potrzeby przydzielania i +zwalniania pami?ci dla w?z??w kontenerowych. Oznacza to tak?e, ?e +operacja "push" nie mo?e nie powie?? si? z powodu niemo?no?ci +przydzielenia pami?ci na w?ze? kontenerowy. %package devel Summary: Header files for libsl library @@ -104,7 +113,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/26 21:01:28 qboosh +- pl desc + Revision 1.1 2005/08/20 23:08:17 twittner - added - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsl.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Fri Aug 26 23:30:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: lighttpd.spec - pl for new mod_* subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 21:30:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new mod_* subpackages ---- Files affected: SPECS: lighttpd.spec (1.123 -> 1.124) ---- Diffs: ================================================================ Index: SPECS/lighttpd.spec diff -u SPECS/lighttpd.spec:1.123 SPECS/lighttpd.spec:1.124 --- SPECS/lighttpd.spec:1.123 Thu Aug 25 08:40:33 2005 +++ SPECS/lighttpd.spec Fri Aug 26 23:29:59 2005 @@ -117,6 +117,7 @@ %package mod_compress Summary: Output Compression +Summary(pl): Kompresja wyj?cia Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/compress.html Requires: %{name} = %{version}-%{release} @@ -127,11 +128,21 @@ Only static content is supported up to now. -The server negotiates automaticly which compression method is used. +The server negotiates automatically which compression method is used. Supported are gzip, deflate, bzip. +%description mod_compress -l pl +Kompresja wyj?cia zmniejsza obci??enie sieci i mo?e poprawi? ca?kowit? +przepustowo?? serwera WWW. + +Jak na razie obs?ugiwana jest tylko statyczna tre??. + +Serwer automatycznie negocjuje, kt?ra metoda kompresji jest u?ywana. +Obs?ugiwane s? gzip, deflate i bzip. + %package mod_cml Summary: Cache Meta Language module +Summary(pl): Modu? Cache Meta Language Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/cml.html Requires: %{name} = %{version}-%{release} @@ -141,8 +152,13 @@ side and building a page from its fragments on the other side using LUA. +%description mod_cml -l pl +CML to metaj?zyk s?u??cy z jednej strony do opisu zale?no?ci strony i +z drugiej strony do budowania strony z fragment?w przy u?yciu LUA. + %package mod_mysql_vhost Summary: MySQL based vhosting +Summary(pl): vhosty oparte na MySQL-u Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/mysqlvhost.html Requires: %{name} = %{version}-%{release} @@ -150,8 +166,12 @@ %description mod_mysql_vhost This module provides virtual hosts (vhosts) based on a MySQL table. +%description mod_mysql_vhost -l pl +Ten modu? udost?pnia wirtualne hosty (vhosty) oparte na tabeli MySQL. + %package mod_trigger_b4_dl Summary: Trigger before Download +Summary(pl): Wyzwalacz przed ?ci?ganiem Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/trigger_b4_dl.html Requires: %{name} = %{version}-%{release} @@ -159,8 +179,12 @@ %description mod_trigger_b4_dl Another anti hot-linking module. +%description mod_trigger_b4_dl -l pl +Jeszcze jeden modu? blokuj?cy bezpo?rednie linkowanie. + %package mod_webdav Summary: WebDAV module for lighttpd +Summary(pl): Modu? WebDAV dla libghttpd Group: Networking/Daemons URL: http://www.lighttpd.net/documentation/webdav.html Requires: %{name} = %{version}-%{release} @@ -181,6 +205,20 @@ So far mounting a webdav resource into Windows XP works and the basic litmus tests are passed. +%description mod_webdav -l pl +Modu? WebDAV to bardzo minimalistyczna implementacja RFC 2518. +Minimalistyczna oznacza, ?e jeszcze nie wszystkie operacje s? +zaimplementowane. Jak na razie s?: +- PROPFIND +- OPTIONS +- MKCOL +- DELETE +- PUT +oraz zwyk?e GET, POST, HEAD z HTTP/1.1. + +Jak na razie montowanie zasobu webdav pod Windows XP dzia?a i +podstawowe testy lakmusowe przechodz?. + %package -n spawn-fcgi Summary: Spawn fcgi-process directly Summary(pl): Bezpo?rednie uruchamianie proces?w fcgi @@ -352,6 +390,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.124 2005/08/26 21:29:59 qboosh +- pl for new mod_* subpackages + Revision 1.123 2005/08/25 06:40:33 aredridel - add openssl fix (Changeset 621) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.123&r2=1.124&f=u From qboosh at pld-linux.org Sat Aug 27 00:25:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: mysql-connector-j.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Fri Aug 26 22:25:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: mysql-connector-j.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/mysql-connector-j.spec diff -u SPECS/mysql-connector-j.spec:1.3 SPECS/mysql-connector-j.spec:1.4 --- SPECS/mysql-connector-j.spec:1.3 Mon Aug 22 12:29:40 2005 +++ SPECS/mysql-connector-j.spec Sat Aug 27 00:25:06 2005 @@ -1,6 +1,10 @@ # $Revision$, $Date$ +# +# Conditional build: %bcond_without bindist # don't use binary distribution (not finished) -Summary: MySQL Connector/J +# +Summary: MySQL Connector/J - JDBC driver for MySQL +Summary(pl): MySQL Connector/J - sterownik JDBC dla MySQL-a Name: mysql-connector-j Version: 3.1.10 Release: 0.1 @@ -24,13 +28,28 @@ MySQL Connector/J is the official JDBC driver for MySQL. +%description -l pl +MySQL Connector/J to natywny sterownik Javy konwertuj?cy wywo?ania +JDBC (Java Database Connectivity) na protok?? sieciowy u?ywany przez +baz? danych MySQL. Pozwala programistom pracowa? z u?yciem j?zyka +programowania Java ?atwo tworz?c programy i aplety wsp??pracuj?ce z +MySQL-em i ??czy? wszystkie zbiorcze dane, nawet w ?rodowisku +heterogenicznym. MySQL Connector/J jest sterownikiem JDBC typu IV i ma +pe?ny zbi?r mo?liwo?ci JDBC obs?uguj?cy MySQL-a. + +MySQL Connector/J to oficjalny sterownik JDBC dla MySQL-a. + %package doc Summary: Documentation for MySQL Connector/J +Summary(pl): Dokumentacja dla MySQL Connector/J Group: Documentation %description doc Documentation for MySQL Connector/J. +%description doc -l pl +Dokumentacja dla MySQL Connector/J. + %prep %setup -q -n mysql-connector-java-%{version} rm -f docs/README # duplicate @@ -67,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/26 22:25:06 qboosh +- pl + Revision 1.3 2005/08/22 10:29:40 glen - adapterized, no extra subdir on -doc package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-connector-j.spec?r1=1.3&r2=1.4&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:45 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: poppler.spec - 0.4.1 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:52:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.1 ---- Files affected: SPECS: poppler.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.16 SPECS/poppler.spec:1.17 --- SPECS/poppler.spec:1.16 Tue Aug 16 10:04:29 2005 +++ SPECS/poppler.spec Sat Aug 27 00:52:39 2005 @@ -9,12 +9,12 @@ Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF Name: poppler -Version: 0.4.0 +Version: 0.4.1 Release: 1 License: GPL Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: e7c7488788b8240ada090fa0406a3784 +# Source0-md5: 000c069ce0700318ba3cc1f7c4bff87f Patch0: %{name}-link.patch URL: http://poppler.freedesktop.org/ BuildRequires: autoconf >= 2.59 @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/26 22:52:39 aflinta +- 0.4.1 + Revision 1.16 2005/08/16 08:04:29 freetz - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.16&r2=1.17&f=u From aflinta at pld-linux.org Sat Aug 27 00:52:52 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: poppler-0.4.1.tar.gz Message-ID: <16709.1125096772@distfiles.pld-linux.org> Files fetched: 1 STORED: http://poppler.freedesktop.org/poppler-0.4.1.tar.gz 000c069ce0700318ba3cc1f7c4bff87f poppler-0.4.1.tar.gz Size: 776378 bytes -- Virtually Yours: distfiles. From aflinta at pld-linux.org Sat Aug 27 00:57:50 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: evince.spec - 0.4.0 In-Reply-To: References: Message-ID: Author: aflinta Date: Fri Aug 26 22:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.4.0 ---- Files affected: SPECS: evince.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.28 SPECS/evince.spec:1.29 --- SPECS/evince.spec:1.28 Wed Aug 17 23:33:36 2005 +++ SPECS/evince.spec Sat Aug 27 00:57:44 2005 @@ -5,21 +5,21 @@ Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince -Version: 0.3.4 +Version: 0.4.0 Release: 0.9 License: GPL v2 Group: X11/Applications/Graphics -Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.3/%{name}-%{version}.tar.bz2 -# Source0-md5: 2c3177f60e6d8ed0b73168ebf9f726a5 +Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 +# Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -Patch2: %{name}-disable_dbus.patch +#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake # NOTE: disabled until less broken release -#BuildRequires: dbus-glib-devel >= 0.33 +BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -34,7 +34,7 @@ BuildRequires: libtiff-devel BuildRequires: nautilus-devel BuildRequires: pkgconfig -BuildRequires: poppler-glib-devel >= 0.4.0 +BuildRequires: poppler-glib-devel >= 0.4.1 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -72,7 +72,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -83,6 +83,7 @@ %configure \ --disable-static \ --disable-schemas-install \ + --enable-dbus \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -144,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/26 22:57:44 aflinta +- 0.4.0 + Revision 1.28 2005/08/17 21:33:36 freetz - forced fixed cairo version in R:, fixed subpackage descriptions, TODO added, more BRs, rel. 0.9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.28&r2=1.29&f=u From aflinta at pld-linux.org Sat Aug 27 00:57:53 2005 From: aflinta at pld-linux.org (aflinta) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: evince-0.4.0.tar.bz2 Message-ID: <23056.1125097073@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/evince-0.4.0.tar.bz2 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 Size: 891605 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:33:54 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: trean.spec - let BUILD dir identify source snap (to compare... In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:33:54 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - let BUILD dir identify source snap (to compare them) ---- Files affected: SPECS: trean.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.5 SPECS/trean.spec:1.6 --- SPECS/trean.spec:1.5 Thu Jul 21 00:07:56 2005 +++ SPECS/trean.spec Sat Aug 27 01:33:47 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ -%define _snap 2005-05-11 -%define _rel 1.1 +%define _snap 2005-08-01 +%define _rel 1 %include /usr/lib/rpm/macros.php Summary: Horde Bookmarks application @@ -11,13 +11,13 @@ Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL Group: Applications/WWW -Source0: http://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 # NoSource0-md5: 20f5a96682d04444d48f9307ebb08515 -# don't put snapshots to df -NoSource: 0 Source1: %{name}.conf URL: http://www.horde.org/trean/ BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: tar >= 1:1.15.1 Requires: apache >= 1.3.33-2 Requires: apache(mod_access) # docs say it requires 3.1, but seems work in 3.0 too @@ -36,14 +36,14 @@ %description The Trean (Bookmarks) application allows you to store, organize and manage, and most importantly access your web browser bookmarks on-line -and in one central place accessible from any web browser. +and in one central place accessible from any web browser. By storing your bookmarks here, you can access them from any browser on any machine that can access the Horde applications. This means you can easily access your bookmarks from multiple browsers, multiple machines, remote locations, etc. And if you upgrade, switch, or test out browsers, you don't have to worry about what happens to your -bookmarks or how to import them into the new browser. +bookmarks or how to import them into the new browser. The Horde Project writes web applications in PHP and releases them under the GNU General Public License. For more information (including @@ -67,7 +67,8 @@ Treana) mo?na znale?? na stronie . %prep -%setup -q -n %{name} +%setup -q -c -T -n %{name}-%{_snap} +tar zxf %{SOURCE0} --strip-components=1 rm -f config/.htaccess @@ -149,6 +150,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/26 23:33:47 glen +- let BUILD dir identify source snap (to compare them) + Revision 1.5 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sat Aug 27 01:33:59 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <25568.1125099239@distfiles.pld-linux.org> wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/1dc8e936-1548-48d1-bd95-2f0962be9997/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From glen at pld-linux.org Sat Aug 27 01:34:53 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: trean.spec - license BSD In-Reply-To: References: Message-ID: Author: glen Date: Fri Aug 26 23:34:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - license BSD ---- Files affected: SPECS: trean.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/trean.spec diff -u SPECS/trean.spec:1.6 SPECS/trean.spec:1.7 --- SPECS/trean.spec:1.6 Sat Aug 27 01:33:47 2005 +++ SPECS/trean.spec Sat Aug 27 01:34:48 2005 @@ -9,7 +9,7 @@ Name: trean Version: 0.1 Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} -License: GPL +License: BSD Group: Applications/WWW Source0: ftp://ftp.horde.org/pub/snaps/%{_snap}/%{name}-HEAD-%{_snap}.tar.gz # Source0-md5: 95c431b130310ae9165d69fdbf7e6c99 @@ -45,10 +45,6 @@ out browsers, you don't have to worry about what happens to your bookmarks or how to import them into the new browser. -The Horde Project writes web applications in PHP and releases them -under the GNU General Public License. For more information (including -help with Trean) please visit . - %description -l pl Aplikacja Tream (zak?adki) pozwala na przechowywanie, organizowanie i zarz?dzanie, a co najwa?niejsze, dost?p do zak?adek przegl?darki WWW @@ -62,10 +58,6 @@ martwi? co si? stanie z zak?adkami, albo jak zaimportowa? je do nowej przegl?darki. -Projekt Horde tworzy aplikacje WWW w PHP i wydaje je na licencji GNU -Genral Public License. Wi?cej informacji (w??cznie z pomoc? dla -Treana) mo?na znale?? na stronie . - %prep %setup -q -c -T -n %{name}-%{_snap} tar zxf %{SOURCE0} --strip-components=1 @@ -150,6 +142,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/26 23:34:48 glen +- license BSD + Revision 1.6 2005/08/26 23:33:47 glen - let BUILD dir identify source snap (to compare them) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sat Aug 27 01:34:56 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: trean-HEAD-2005-08-01.tar.gz Message-ID: <26702.1125099296@distfiles.pld-linux.org> wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. FATAL: ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz (95c431b130310ae9165d69fdbf7e6c99) was not fetched (wget -nv -O ./tmp/5df053bc-00e2-4b95-85e7-6fd3cd630efa/95c431b130310ae9165d69fdbf7e6c99/trean-HEAD-2005-08-01.tar.gz "ftp://ftp.horde.org/pub/snaps/2005-08-01/trean-HEAD-2005-08-01.tar.gz": No such directory `pub/snaps/2005-08-01'. No such directory `pub/snaps/2005-08-01'. ) Files fetched: 0 -- Virtually Yours: distfiles. From undefine at pld-linux.org Sat Aug 27 03:10:50 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: aee.spec (NEW) - initital pld version, partialy based on md... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:10:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - initital pld version, partialy based on mdk spec ---- Files affected: SPECS: aee.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u /dev/null SPECS/aee.spec:1.1 --- /dev/null Sat Aug 27 03:10:50 2005 +++ SPECS/aee.spec Sat Aug 27 03:10:45 2005 @@ -0,0 +1,59 @@ +# $Revision$, $Date$ +Summary: An easy to use text editor +Summary(pl): ?atwy w u?yciu edytor tekstowy +Name: aee +Version: 2.2.15b +Release: 1 +License: Artistic +Group: Applications/Editors +URL: http://mahon.cwx.net/ +Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +Patch0: %{name}-conf.patch +BuildRequires: XFree86-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +An easy to use text editor. Intended to be usable with little or no +instruction. Provides both a terminal (curses based) interface and +native X-Windows interface (in which case the executable is called +xae). Features include pop-up menus, journalling (to recover from +system crash or loss of connection), cut-and-paste, multiple buffers +(associated with files or not), and much more. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__make} both \ + OPTFLAGS="%{rpmcflags} -L%{_prefix}/X11R6/%{_lib}" + +%install +rm -rf $RPM_BUILD_ROOT +install -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} +install -D xae $RPM_BUILD_ROOT%{_bindir}/xae +install -D %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +install -D help.ae $RPM_BUILD_ROOT%{_datadir}/%{name}/help.ae +ln -sf aee $RPM_BUILD_ROOT%{_bindir}/rae +ln -sf xae $RPM_BUILD_ROOT%{_bindir}/rxae + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Artistic README.aee aee.1.ps aee.i18n.guide keypad +%attr(755,root,root) %{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/help.ae +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 01:10:45 undefine +- initital pld version, partialy based on mdk spec + ================================================================ From undefine at pld-linux.org Sat Aug 27 03:11:23 2005 From: undefine at pld-linux.org (undefine) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: aee-conf.patch (NEW) - fix patch to help file and use opt... In-Reply-To: References: Message-ID: Author: undefine Date: Sat Aug 27 01:11:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix patch to help file and use optflags (from mdk) ---- Files affected: SOURCES: aee-conf.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/aee-conf.patch diff -u /dev/null SOURCES/aee-conf.patch:1.1 --- /dev/null Sat Aug 27 03:11:23 2005 +++ SOURCES/aee-conf.patch Sat Aug 27 03:11:18 2005 @@ -0,0 +1,32 @@ +--- aee-2.2.15b/create.mk.aee~ 2002-09-23 06:16:04.000000000 +0200 ++++ aee-2.2.15b/create.mk.aee 2004-01-05 01:00:11.000000000 +0100 +@@ -263,7 +263,7 @@ fi + + echo "DEFINES = $termio $terminfo_exists $BSD_SELECT $catgets $select $curses " > make.aee + echo "" >> make.aee +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists" >> make.aee ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $other_cflags $five_lib $five_include $select_hdr $termcap_exists \$(OPTFLAGS)" >> make.aee + echo "" >> make.aee + echo "" >> make.aee + echo "all : $TARGET" >> make.aee +--- aee-2.2.15b/help.c~ 1999-02-01 05:28:23.000000000 +0100 ++++ aee-2.2.15b/help.c 2004-01-05 01:06:04.000000000 +0100 +@@ -11,6 +11,7 @@ + #include "aee.h" + + char *help_file_list[4] = { ++ "/usr/share/aee/help.ae", + "/usr/local/aee/help.ae", + "/usr/local/lib/help.ae", + "~/.help.ae", +--- aee-2.2.15b/create.mk.xae~ 2002-09-23 04:16:18.000000000 +0000 ++++ aee-2.2.15b/create.mk.xae 2005-08-27 00:50:37.224401848 +0000 +@@ -185,7 +185,7 @@ + + echo "DEFINES = -DXAE -Dxae11 $catgets " > xae_dir/make.xae + echo "" >> xae_dir/make.xae +-echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags" >> xae_dir/make.xae ++echo "CFLAGS = $HAS_UNISTD $HAS_STDARG $HAS_STDLIB $HAS_CTYPE $HAS_SYS_IOCTL $HAS_SYS_WAIT $X_headers $five_include $X_libs $five_lib $other_cflags \$(OPTFLAGS)" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "" >> xae_dir/make.xae + echo "all : xae" >> xae_dir/make.xae ================================================================ From aredridel at pld-linux.org Sat Aug 27 04:04:58 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: librsvg-2.11.0.tar.bz2 Message-ID: <10280.1125108298@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/librsvg-2.11.0.tar.bz2 d64df7603785440c8af39a338753bdf4 librsvg-2.11.0.tar.bz2 Size: 379647 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 04:05:00 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: librsvg.spec - up to 2.11.0 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 02:05:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.11.0 ---- Files affected: SPECS: librsvg.spec (1.84 -> 1.85) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.84 SPECS/librsvg.spec:1.85 --- SPECS/librsvg.spec:1.84 Sun Mar 20 22:43:18 2005 +++ SPECS/librsvg.spec Sat Aug 27 04:04:54 2005 @@ -13,14 +13,14 @@ Summary(ru): SVG ?????????? Summary(uk): SVG ?????????? Name: librsvg -Version: 2.9.5 -Release: 2 +Version: 2.11.0 +Release: 1 Epoch: 1 License: LGPL v2+ Vendor: GNOME Group: Libraries -Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.9/%{name}-%{version}.tar.bz2 -# Source0-md5: 44799d75e940eb4150acdae4f63cbe2a +Source0: http://ftp.gnome.org/pub/gnome/sources/librsvg/2.11/%{name}-%{version}.tar.bz2 +# Source0-md5: d64df7603785440c8af39a338753bdf4 URL: http://librsvg.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.85 2005/08/27 02:04:54 aredridel +- up to 2.11.0 + Revision 1.84 2005/03/20 21:43:18 aflinta - rebuild with howl 0.9.10, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.84&r2=1.85&f=u From qboosh at pld-linux.org Sat Aug 27 09:42:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: perl-File-chdir.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:42:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: perl-File-chdir.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-File-chdir.spec diff -u SPECS/perl-File-chdir.spec:1.1 SPECS/perl-File-chdir.spec:1.2 --- SPECS/perl-File-chdir.spec:1.1 Fri Aug 19 21:06:06 2005 +++ SPECS/perl-File-chdir.spec Sat Aug 27 09:42:16 2005 @@ -7,6 +7,7 @@ %define pdir File %define pnam chdir Summary: File::chdir - a more sensible way to change directories +Summary(pl): File::chdir - rozs?dniejszy spos?b zmiany katalog?w Name: perl-File-chdir Version: 0.06 Release: 1 @@ -22,9 +23,24 @@ %description File::chdir module - a more sensible way to change directories. -Perl's chdir() has the unfortunate problem of being very, very, very global. If any part of your program calls chdir() or if any library you use calls chdir(), it changes the current working directory for the whole program. +Perl's chdir() has the unfortunate problem of being very, very, very +global. If any part of your program calls chdir() or if any library +you use calls chdir(), it changes the current working directory for +the whole program. + +File::chdir gives you an alternative, $CWD and @CWD. These two +variables combine all the power of chdir(), File::Spec and Cwd. + +%description -l pl +Modu? File::chdir - rozs?dniejszy spos?b zmiany katalog?w. + +Perlowa funkcja chdir() jest problematyczna, poniewa? dzia?a bardzo, +bardzo, bardzo globalnie. Je?li dowolna cz??? programu lub dowolna +u?ywana biblioteka wywo?a chdir(), zmienia si? bie??cy katalog dla +ca?ego programu. -File::chdir gives you an alternative, $CWD and @CWD. These two variables combine all the power of chdir(), File::Spec and Cwd. +File::chdir daje alternatyw? - $CWD i @CWD. Te dwie zmienne ??cz? ca?? +pot?g? chdir(), File::Spec i Cwd. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -57,6 +73,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:42:16 qboosh +- pl + Revision 1.1 2005/08/19 19:06:06 arekm - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-File-chdir.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: POE-Component-DebugShell-1.0411.tar.gz Message-ID: <9575.1125128940@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DebugShell-1.0411.tar.gz 68aa0496f6ded9e221100c22351a05e5 POE-Component-DebugShell-1.0411.tar.gz Size: 6979 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:49:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: perl-POE-Component-DebugShell.spec - descs, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:49:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - descs, md5 ---- Files affected: SPECS: perl-POE-Component-DebugShell.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DebugShell.spec diff -u SPECS/perl-POE-Component-DebugShell.spec:1.2 SPECS/perl-POE-Component-DebugShell.spec:1.3 --- SPECS/perl-POE-Component-DebugShell.spec:1.2 Wed Aug 24 12:47:55 2005 +++ SPECS/perl-POE-Component-DebugShell.spec Sat Aug 27 09:48:55 2005 @@ -6,23 +6,30 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DebugShell -Summary: POE::Component::DebugShell +Summary: POE::Component::DebugShell - interactive peeking into a running POE application +Summary(pl): POE::Component::DebugShell - interaktywne podgl?danie dzia?aj?cych aplikacji POE Name: perl-POE-Component-DebugShell Version: 1.0411 Release: 0.1 -License: other, see LICENSE +License: MIT-like (see LICENSE) Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org -BuildRequires: perl-devel >= 1:5.8.0 -BuildRequires: rpm-perlprov >= 4.1-13 +# Source0-md5: 68aa0496f6ded9e221100c22351a05e5 +URL: http://poe.perl.org/ BuildRequires: perl-POE BuildRequires: perl-POE-API-Peek +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: rpm-perlprov >= 4.1-13 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -perl-POE-Component-DebugShell module, see poe.perl.org +This component allows for interactive peeking into a running POE +application. + +%description -l pl +Ten komponent umo?liwia interaktywne podgl?danie dzia?aj?cych +aplikacji POE. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -46,7 +53,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE +%doc Changes LICENSE %{perl_vendorlib}/POE/Component/DebugShell.pm %{_mandir}/man3/* @@ -56,9 +63,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 07:48:55 qboosh +- descs, md5 + Revision 1.2 2005/08/24 10:47:55 agaran - missing buildreq Revision 1.1 2005/08/24 10:39:57 agaran - initial, for me works rel 0.1 - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DebugShell.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: POE-Component-DirWatch-0.02.tar.gz Message-ID: <16990.1125129261@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-DirWatch-0.02.tar.gz d41814d4a100c10f270c09638f193ccc POE-Component-DirWatch-0.02.tar.gz Size: 4375 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:54:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: perl-POE-Component-DirWatch.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:54:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-DirWatch.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-DirWatch.spec diff -u SPECS/perl-POE-Component-DirWatch.spec:1.1 SPECS/perl-POE-Component-DirWatch.spec:1.2 --- SPECS/perl-POE-Component-DirWatch.spec:1.1 Wed Aug 24 12:53:29 2005 +++ SPECS/perl-POE-Component-DirWatch.spec Sat Aug 27 09:54:15 2005 @@ -6,27 +6,35 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-DirWatch -Summary: POE::Component::DirWatch +Summary: POE::Component::DirWatch - POE directory watcher +Summary(pl): POE::Component::DirWatch - obserwowanie katalog?w w POE Name: perl-POE-Component-DirWatch Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: d41814d4a100c10f270c09638f193ccc +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -#BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE::Component::DirWatch watches a directory for files. It creates a separate session which invokes a user-supplied calback -as soon as if finds a file in the directory. Its primary intended use is processing a "drop-box" style directory, such as -an FTP upload directory. +POE::Component::DirWatch watches a directory for files. It creates a +separate session which invokes a user-supplied callback as soon as if +finds a file in the directory. Its primary intended use is processing +a "drop-box" style directory, such as an FTP upload directory. + +%description -l pl +POE::Component::DirWatch obserwowuje katalog pod k?tem plik?w. Tworzy +oddzieln? sesj?, kt?ra wywo?uje przekazane przez u?ytkownika wywo?anie +zwrotne zaraz jak znajdzie w katalogu plik. G??wnym zastosowaniem jest +przetwarzanie katalog?w s?u??cych do wrzucania plik?w, takich jak +katalog upload dost?pny przez FTP. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:54:15 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:53:29 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-DirWatch.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 09:57:51 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: POE-Component-Logger-1.00.tar.gz Message-ID: <21271.1125129471@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-Logger-1.00.tar.gz b36cfad2d2d446103cbcf671270681ff POE-Component-Logger-1.00.tar.gz Size: 2910 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 09:57:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: perl-POE-Component-Logger.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 07:57:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-Logger.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-Logger.spec diff -u SPECS/perl-POE-Component-Logger.spec:1.1 SPECS/perl-POE-Component-Logger.spec:1.2 --- SPECS/perl-POE-Component-Logger.spec:1.1 Wed Aug 24 12:58:32 2005 +++ SPECS/perl-POE-Component-Logger.spec Sat Aug 27 09:57:45 2005 @@ -6,27 +6,33 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-Logger -Summary: perl(POE::Component::Logger) +Summary: POE::Component::Logger - a POE logging class +Summary(pl): POE::Component::Logger - klasa loguj?ca dla POE Name: perl-POE-Component-Logger Version: 1.00 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: b36cfad2d2d446103cbcf671270681ff +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE %if %{with tests} BuildRequires: perl-Log-Dispatch-Config %endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'perl(anything_fake_or_conditional)' - %description -POE::Component::Logger, a poe logging class, uses Log::Dispatch::Config +A highly flexible logger component for POE that uses Log::Dispatch and +Log::Dispatch::Config for ultimate flexibility and power. + +%description -l pl +Bardzo elastyczny komponent loguj?cy dla POE, u?ywaj?cy Log::Dispatch +i Log::Dispatch::Config dla maksymalnej elastyczno?ci i mocy. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -60,6 +66,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 07:57:45 qboosh +- pl, md5 + Revision 1.1 2005/08/24 10:58:32 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-Logger.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: perl-POE-Component-TSTP.spec - pl, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:03:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, md5 ---- Files affected: SPECS: perl-POE-Component-TSTP.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/perl-POE-Component-TSTP.spec diff -u SPECS/perl-POE-Component-TSTP.spec:1.1 SPECS/perl-POE-Component-TSTP.spec:1.2 --- SPECS/perl-POE-Component-TSTP.spec:1.1 Wed Aug 24 13:00:47 2005 +++ SPECS/perl-POE-Component-TSTP.spec Sat Aug 27 10:03:06 2005 @@ -6,25 +6,32 @@ %include /usr/lib/rpm/macros.perl %define pdir POE %define pnam Component-TSTP -Summary: POE::Component::TSTP - perl module +Summary: POE::Component::TSTP - a POE component to handle Ctrl-Z +Summary(pl): POE::Component::TSTP - komponent POE obs?uguj?cy Ctrl-Z Name: perl-POE-Component-TSTP Version: 0.02 Release: 0.1 -License: same as perl +# same as perl +License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -URL: poe.perl.org +# Source0-md5: 0ac0dafa63a99b3e305e073e30bb9f22 +URL: http://poe.perl.org/ +BuildRequires: perl-POE BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: perl-POE -%if %{with tests} -BuildRequires: perl-POE -%endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -POE component handling SIGTSTP, ctrl-z usually. +POE component handling SIGTSTP, Ctrl-Z usually. By default, POE +applications do not respond to Ctrl-Z due to slightly strange signal +handling semantics. This module fixes that. + +%description -l pl +Komponent POE obs?uguj?cy SIGTSTP, czyli zwykle Ctrl-Z. Domy?lnie +aplikacje POE nie reaguj? na Ctrl-Z ze wzgl?du na nieco dziwn? +semantyk? obs?ugi sygna??w. Ten modu? poprawia to. %prep %setup -q -n %{pdir}-%{pnam}-%{version} @@ -58,6 +65,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:03:06 qboosh +- pl, md5 + Revision 1.1 2005/08/24 11:00:47 agaran - initial, works for me - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-POE-Component-TSTP.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:03:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: POE-Component-TSTP-0.02.tar.gz Message-ID: <28679.1125129791@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/POE/POE-Component-TSTP-0.02.tar.gz 0ac0dafa63a99b3e305e073e30bb9f22 POE-Component-TSTP-0.02.tar.gz Size: 1685 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 10:07:50 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS (DEVEL): hal.spec - prevent docs building with --without docs In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 08:07:50 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - prevent docs building with --without docs ---- Files affected: SPECS: hal.spec (1.75.2.3 -> 1.75.2.4) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.75.2.3 SPECS/hal.spec:1.75.2.4 --- SPECS/hal.spec:1.75.2.3 Wed Aug 3 19:29:36 2005 +++ SPECS/hal.spec Sat Aug 27 10:07:45 2005 @@ -130,7 +130,9 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ @@ -232,6 +234,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + Revision 1.75.2.3 2005/08/03 17:29:36 wiget - don't duplicate %{_datadir}/%{name}/device-manger ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.75.2.3&r2=1.75.2.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:09:18 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pear-HTML_AJAX.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:09:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: php-pear-HTML_AJAX.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_AJAX.spec diff -u SPECS/php-pear-HTML_AJAX.spec:1.3 SPECS/php-pear-HTML_AJAX.spec:1.4 --- SPECS/php-pear-HTML_AJAX.spec:1.3 Sun Aug 21 19:33:51 2005 +++ SPECS/php-pear-HTML_AJAX.spec Sat Aug 27 10:09:13 2005 @@ -24,15 +24,27 @@ %description Provides PHP and JavaScript libraries for performing AJAX (Communication from JavaScript to your browser without reloading the -page) +page). Offers OO proxies in JavaScript of registered PHP or proxyless -operation Serialization of data sent between PHP and JavaScript is +operation. Serialization of data sent between PHP and JavaScript is provided by a driver model, currently JSON and Null encodings are -provided +provided. In PEAR status of this package is: %{_status}. +%description -l pl +Ta klasa dostarcza biblioteki PHP i JavaScript do przeprowadzania AJAX +(komunikacji z JavaScriptu do przegl?darki bez prze?adowywania +strony). + +Oferuje zorientowane obiektowo proxy w JavaScripcie z zarejestrowanym +PHP lub operacje bez proxy. Serializacja danych przesy?anych pomi?dzy +PHP i JavaScriptem jest zapewniana przez model sterownik?w, aktualnie +dostarczone s? kodowania JSON i Null. + +Ta klasa ma w PEAR status: %{_status}. + %prep %setup -q -c @@ -40,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} -cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/ +cp -a %{_pearname}-%{version}/{AJAX,*.php} $RPM_BUILD_ROOT%{php_pear_dir}/%{_class} cp -a %{_pearname}-%{version}/js $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/AJAX/js %{__sed} -i -e 's#@data-dir@#%{php_pear_dir}#g' -e "s#'HTML_AJAX'#'HTML'.DIRECTORY_SEPARATOR.'AJAX'#g" \ @@ -60,6 +72,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 08:09:13 qboosh +- pl desc + Revision 1.3 2005/08/21 17:33:51 adamg - updated to 0.1.4 @@ -68,4 +83,3 @@ Revision 1.1 2005/08/18 18:02:15 arekm - initial package - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_AJAX.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 10:11:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: HTML_Template_IT-1.1.1.tgz Message-ID: <8083.1125130309@distfiles.pld-linux.org> FATAL: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz md5 mismatch, needed 6062a6b0cf6033b206bd62aaeb36c055, got c50e9c31b94d7ee5febdc90ec8653e13 Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: HTML_Template_IT-1.1.1.tgz Message-ID: <10124.1125130404@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/HTML_Template_IT-1.1.1.tgz c50e9c31b94d7ee5febdc90ec8653e13 HTML_Template_IT-1.1.1.tgz Size: 18476 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:13:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pear-HTML_Template_IT.spec - really updated to 1.1.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:13:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - really updated to 1.1.1 ---- Files affected: SPECS: php-pear-HTML_Template_IT.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/php-pear-HTML_Template_IT.spec diff -u SPECS/php-pear-HTML_Template_IT.spec:1.18 SPECS/php-pear-HTML_Template_IT.spec:1.19 --- SPECS/php-pear-HTML_Template_IT.spec:1.18 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-HTML_Template_IT.spec Sat Aug 27 10:13:15 2005 @@ -13,7 +13,7 @@ License: PHP 2.02 Group: Development/Languages/PHP Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz -# Source0-md5: 6062a6b0cf6033b206bd62aaeb36c055 +# Source0-md5: c50e9c31b94d7ee5febdc90ec8653e13 URL: http://pear.php.net/package/HTML_Template_IT/ BuildRequires: rpm-php-pearprov >= 4.0.2-98 Requires: php-pear @@ -94,8 +94,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/27 08:13:15 qboosh +- really updated to 1.1.1 + Revision 1.18 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[partially updated to 1.1.1] Revision 1.17 2004/12/03 22:12:19 adamg - rebuild with new PEAR provides/requires scripts ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-HTML_Template_IT.spec?r1=1.18&r2=1.19&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pear-MDB2.spec - unbroken last changelog entry In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:17:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unbroken last changelog entry ---- Files affected: SPECS: php-pear-MDB2.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/php-pear-MDB2.spec diff -u SPECS/php-pear-MDB2.spec:1.8 SPECS/php-pear-MDB2.spec:1.9 --- SPECS/php-pear-MDB2.spec:1.8 Mon Aug 22 14:11:35 2005 +++ SPECS/php-pear-MDB2.spec Sat Aug 27 10:17:19 2005 @@ -69,8 +69,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 08:17:19 qboosh +- unbroken last changelog entry + Revision 1.8 2005/08/22 12:11:35 adamg -*** empty log message *** +- *** empty log message *** +[updated to 2.0.0beta4] Revision 1.7 2005/03/26 19:06:36 adamg - install missing files (Tools/Manager/*); release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 10:17:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: MDB2-2.0.0beta4.tgz Message-ID: <15292.1125130651@distfiles.pld-linux.org> Files fetched: 1 STORED: http://pear.php.net/get/MDB2-2.0.0beta4.tgz 95aee608b6c980b5c99ebbf7425c6aa8 MDB2-2.0.0beta4.tgz Size: 166279 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 10:21:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: rsync-segv.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:21:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: rsync-segv.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: ffmpeg.spec - sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: ffmpeg.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/ffmpeg.spec diff -u SPECS/ffmpeg.spec:1.49 SPECS/ffmpeg.spec:1.50 --- SPECS/ffmpeg.spec:1.49 Thu Aug 11 11:46:18 2005 +++ SPECS/ffmpeg.spec Sat Aug 27 10:22:52 2005 @@ -19,14 +19,16 @@ Patch2: %{name}-gcc4.patch URL: http://ffmpeg.sourceforge.net/ BuildRequires: SDL-devel +BuildRequires: faac-devel BuildRequires: freetype-devel %ifarch ppc # require version with altivec support fixed BuildRequires: gcc >= 5:3.3.2-3 %endif %{?with_imlib2:BuildRequires: imlib2-devel >= 1.1.0-2} +BuildRequires: lame-libs-devel BuildRequires: libtool >= 2:1.4d-3 -BuildRequires: faac-devel +BuildRequires: libvorbis-devel %ifarch %{ix86} %ifnarch i386 i486 BuildRequires: nasm @@ -36,8 +38,6 @@ BuildRequires: tetex BuildRequires: texinfo BuildRequires: zlib-devel -BuildRequires: lame-libs-devel -BuildRequires: libvorbis-devel %{?with_autoreqdep:BuildConflicts: libpostproc} Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -229,6 +229,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.50 2005/08/27 08:22:52 qboosh +- sorted BRs + Revision 1.49 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.49&r2=1.50&f=u From qboosh at pld-linux.org Sat Aug 27 10:27:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: X11-driver-firegl-inter_module_get.patch (REMOVED), X11-d... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:27:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I suppose) ---- Files affected: SOURCES: X11-driver-firegl-inter_module_get.patch (1.1 -> NONE) (REMOVED), X11-driver-firegl-pci_name.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:30:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pear-Services_DynDNS.spec - pl cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:30:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl cosmetic ---- Files affected: SPECS: php-pear-Services_DynDNS.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pear-Services_DynDNS.spec diff -u SPECS/php-pear-Services_DynDNS.spec:1.1 SPECS/php-pear-Services_DynDNS.spec:1.2 --- SPECS/php-pear-Services_DynDNS.spec:1.1 Sun Aug 21 20:05:58 2005 +++ SPECS/php-pear-Services_DynDNS.spec Sat Aug 27 10:30:29 2005 @@ -6,7 +6,7 @@ %define _pearname %{_class}_%{_subclass} Summary: %{_pearname} - provides access to the DynDNS web service -Summary(pl): %{_pearname} - dost?p do serwis?w DynDNS +Summary(pl): %{_pearname} - dost?p do us?ugi WWW DynDNS Name: php-pear-%{_pearname} Version: 0.3.1 Release: 1 @@ -57,6 +57,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:30:29 qboosh +- pl cosmetic + Revision 1.1 2005/08/21 18:05:58 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pear-Services_DynDNS.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:31:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: crossfire-client-big_endian.patch (REMOVED), crossfire-cl... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:31:55 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete (acc. to wiget) ---- Files affected: SOURCES: crossfire-client-big_endian.patch (1.1 -> NONE) (REMOVED), crossfire-client-memleak.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_free.patch (1.1 -> NONE) (REMOVED), crossfire-client-sdl_darkness.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 10:34:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: crossfire-client.spec - new-style bcond, strict internal deps In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:34:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new-style bcond, strict internal deps ---- Files affected: SPECS: crossfire-client.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/crossfire-client.spec diff -u SPECS/crossfire-client.spec:1.35 SPECS/crossfire-client.spec:1.36 --- SPECS/crossfire-client.spec:1.35 Sun Aug 21 10:53:26 2005 +++ SPECS/crossfire-client.spec Sat Aug 27 10:34:06 2005 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without images # don't build images package +# %define sndver 1.4.0 %define imgver 1.7.1 Summary: Crossfire client @@ -21,7 +25,7 @@ BuildRequires: autoconf BuildRequires: gtk+-devel BuildRequires: perl-base -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -53,7 +57,7 @@ Summary: Crossfire sounds Summary(pl): D?wi?ki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description sounds Some sound files and the sound server for crossfire. @@ -65,7 +69,7 @@ Summary: GTK+ Crossfire client Summary(pl): Klient Crossfire pod GTK+ Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk GTK+ client to crossfire. @@ -96,7 +100,7 @@ Summary: GTK+2 Crossfire client Summary(pl): Klient Crossfire pod GTK+2 Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description gtk2 GTK+2 client to crossfire. @@ -123,12 +127,11 @@ przedmiot?w i walcz?c z potworami. Mog? gra? w kooperacji lub przeciwko sobie w tym samym "?wiecie". - %package images Summary: Crossfire images Summary(pl): Obrazki do Crossfire Group: Applications/Games -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{version}-%{release} %description images Some images extracted from server for Crossfire. @@ -150,7 +153,7 @@ %prep %setup -q -a1 mv -f sounds cfsounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install -d images cd images tar xzf %{SOURCE2} @@ -172,7 +175,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/ -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} install images/bmaps.client images/crossfire.base images/crossfire.clsc \ $RPM_BUILD_ROOT%{_datadir}/%{name} %endif @@ -196,7 +199,7 @@ %attr(755,root,root) %{_bindir}/cfsndserv* %{_datadir}/%{name}/sounds -%if %{?_without_images:0}%{?!_without_images:1} +%if %{with images} %files images %defattr(644,root,root,755) %{_datadir}/%{name}/bmaps.client @@ -219,6 +222,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/27 08:34:06 qboosh +- new-style bcond, strict internal deps + Revision 1.35 2005/08/21 08:53:26 wiget - updated to 1.8.0 (images to 1.7.1) - added gtk2 subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossfire-client.spec?r1=1.35&r2=1.36&f=u From qboosh at pld-linux.org Sat Aug 27 10:36:44 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:36:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dbx.spec diff -u SPECS/php-pecl-dbx.spec:1.1 SPECS/php-pecl-dbx.spec:1.2 --- SPECS/php-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php-pecl-dbx.spec Sat Aug 27 10:36:39 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:36:39 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 10:37:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php4-pecl-dbx.spec - pl fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 08:37:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix ---- Files affected: SPECS: php4-pecl-dbx.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php4-pecl-dbx.spec diff -u SPECS/php4-pecl-dbx.spec:1.1 SPECS/php4-pecl-dbx.spec:1.2 --- SPECS/php4-pecl-dbx.spec:1.1 Sun Aug 21 22:15:39 2005 +++ SPECS/php4-pecl-dbx.spec Sat Aug 27 10:37:22 2005 @@ -36,8 +36,8 @@ %description -l pl Modu? dbx to warstwa abstrakcji baz danych. Funkcje dbx pozwalaj? na dost?p do wspieranych baz danych przy u?yciu sp?jnej konwencji. -Funkcje dbx jako takie s? interfejsem bazy danych, ale interfejsem -modu??w do obs?ugi baz danych. +Funkcje dbx jako takie nie s? bezpo?rednim interfejsem do bazy danych, +ale interfejsem do modu??w do obs?ugi baz danych. Aktualnie wspierane bazy danych to MySQL, ODBC, Oracle (oci8), MS SQL Server, PostgreSQL, FrontBase, Sybase-CT oraz SQLite. @@ -81,6 +81,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 08:37:22 qboosh +- pl fix + Revision 1.1 2005/08/21 20:15:39 adamg - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php4-pecl-dbx.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:12 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: Zope3.spec - pl for python- In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:33:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for python- ---- Files affected: SPECS: Zope3.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.1 SPECS/Zope3.spec:1.2 --- SPECS/Zope3.spec:1.1 Fri Aug 26 10:43:05 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:33:06 2005 @@ -1,5 +1,4 @@ # $Revision$, $Date$ - Summary: An application server and portal toolkit for building Web sites Summary(es): Un servidor de aplicaciones y un conjunto de herramientas para la construcci?n de sitios Web Summary(pl): Serwer aplikacji i toolkit portalowy do tworzenia serwis?w WWW @@ -75,10 +74,9 @@ eles ao inv?s desse RPM. %package -n python-zope -Summary: Python packages developed as part of the Zope 3 project. -Summary(pl): Modu?y pythona rozwijane w projekcie Zope 3. +Summary: Python packages developed as part of the Zope 3 project +Summary(pl): Modu?y Pythona rozwijane w projekcie Zope 3 Group: Development/Tools -Obsoletes: ZopeInterface Provides: ZopeInterface Provides: python-zope-cachedescriptors Provides: python-zope-component @@ -104,15 +102,25 @@ Provides: python-zope-tales Provides: python-zope-testing Provides: python-zope-thread +Obsoletes: ZopeInterface %description -n python-zope -The "zope" package is a pure namespace package holding packages developed as -part of the Zope 3 project. +The "zope" package is a pure namespace package holding packages +developed as part of the Zope 3 project. -Generally, the immediate subpackages of the "zope" package should be useful and -usable outside of the Zope application server. Subpackages of the "zope" -package should have minimal interdependencies, although most depend on -"zope.interface". +Generally, the immediate subpackages of the "zope" package should be +useful and usable outside of the Zope application server. Subpackages +of the "zope" package should have minimal interdependencies, although +most depend on "zope.interface". + +%description -n python-zope -l pl +Pakiet "zope" to pakiet czystej przestrzeni nazw przechowuj?cej +pakiety tworzone jako cz??? projektu Zope 3. + +Og?lnie bezpo?rednie podpakiety pakietu "zope" powinny by? przydatne i +u?ywalne poza serwerem aplikacji Zope. Podpakiety pakietu "zope" +powinny mie? minimalne zale?no?ci wzajemne, chocia? wi?kszo?? zale?y +od "zope.interface". %prep %setup -q -n Zope-%{version}%{sub_ver} @@ -250,6 +258,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:33:06 qboosh +- pl for python- + Revision 1.1 2005/08/26 08:43:05 jajcus - new, based on Zope.spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:33:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: Zope3-3.1.0c1.tgz Message-ID: <20149.1125135207@distfiles.pld-linux.org> FATAL: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz md5 mismatch, needed 66876823e53fbd0d4a8a7262d7ce251b, got e22eeeae5de89c0eea9edabe3f2c3c4d Files fetched: 0 -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:35:44 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS (DEVEL): ingo.spec - updated to 2005-08-26 snap (many change... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:35:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 2005-08-26 snap (many changes were made) - release 1 ---- Files affected: SPECS: ingo.spec (1.6 -> 1.6.4.1) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6 SPECS/ingo.spec:1.6.4.1 --- SPECS/ingo.spec:1.6 Thu Jul 21 00:07:56 2005 +++ SPECS/ingo.spec Sat Aug 27 11:35:39 2005 @@ -1,14 +1,18 @@ # $Revision$, $Date$ + +%define _snap 2005-08-26 +%define _rel 1 +# %include /usr/lib/rpm/macros.php Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo Version: 1.0.1 -Release: 1.1 +Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW -Source0: http://ftp.horde.org/pub/ingo/%{name}-h3-%{version}.tar.gz -# Source0-md5: 7fce229d752e5b981621e215e4fc56e8 +Source0: ftp://ftp.horde.org/pub/snaps/2005-08-26/%{name}-HEAD-%{_snap}.tar.gz +# Source0-md5: 32dd41dafa8b2dd0968fb6ba1e139c0a Source1: %{name}.conf Patch0: %{name}-path.patch URL: http://www.horde.org/ingo/ @@ -55,7 +59,7 @@ . %prep -%setup -q -n %{name}-h3-%{version} +%setup -q -n %{name} %patch0 -p1 # considered harmful (horde/docs/SECURITY) @@ -133,6 +137,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.1 2005/08/27 09:35:39 paszczus +- updated to 2005-08-26 snap (many changes were made) +- release 1 + Revision 1.6 2005/07/20 22:07:56 glen - use apache config triggers ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6&r2=1.6.4.1&f=u From paszczus at pld-linux.org Sat Aug 27 11:36:20 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ingo-HEAD-2005-08-26.tar.gz Message-ID: <23684.1125135380@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.horde.org/pub/snaps/2005-08-26/ingo-HEAD-2005-08-26.tar.gz 32dd41dafa8b2dd0968fb6ba1e139c0a ingo-HEAD-2005-08-26.tar.gz Size: 838918 bytes -- Virtually Yours: distfiles. From paszczus at pld-linux.org Sat Aug 27 11:39:52 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS (DEVEL): ingo.spec - it is a snap of 1.1 version In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 09:39:52 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - it is a snap of 1.1 version ---- Files affected: SPECS: ingo.spec (1.6.4.1 -> 1.6.4.2) ---- Diffs: ================================================================ Index: SPECS/ingo.spec diff -u SPECS/ingo.spec:1.6.4.1 SPECS/ingo.spec:1.6.4.2 --- SPECS/ingo.spec:1.6.4.1 Sat Aug 27 11:35:39 2005 +++ SPECS/ingo.spec Sat Aug 27 11:39:47 2005 @@ -7,7 +7,7 @@ Summary: Ingo - an email filter rules manager Summary(pl): Ingo - zarz?dca regu? filtrowania poczty elektronicznej Name: ingo -Version: 1.0.1 +Version: 1.1 Release: %{?_rc:%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel} License: GPL v2 Group: Applications/WWW @@ -137,6 +137,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6.4.2 2005/08/27 09:39:47 paszczus +- it is a snap of 1.1 version + Revision 1.6.4.1 2005/08/27 09:35:39 paszczus - updated to 2005-08-26 snap (many changes were made) - release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.6.4.1&r2=1.6.4.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: aee.spec - pl desc, md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:46:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc, md5 ---- Files affected: SPECS: aee.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/aee.spec diff -u SPECS/aee.spec:1.1 SPECS/aee.spec:1.2 --- SPECS/aee.spec:1.1 Sat Aug 27 03:10:45 2005 +++ SPECS/aee.spec Sat Aug 27 11:46:47 2005 @@ -6,19 +6,29 @@ Release: 1 License: Artistic Group: Applications/Editors -URL: http://mahon.cwx.net/ Source0: http://mahon.cwx.net/sources/%{name}-%{version}.tar.gz +# Source0-md5: f8c3a4196f1bfd46beb6b76d73ecb7a2 Patch0: %{name}-conf.patch +URL: http://mahon.cwx.net/ BuildRequires: XFree86-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description An easy to use text editor. Intended to be usable with little or no instruction. Provides both a terminal (curses based) interface and -native X-Windows interface (in which case the executable is called -xae). Features include pop-up menus, journalling (to recover from -system crash or loss of connection), cut-and-paste, multiple buffers -(associated with files or not), and much more. +native X Window System interface (in which case the executable is +called xae). Features include pop-up menus, journalling (to recover +from system crash or loss of connection), cut-and-paste, multiple +buffers (associated with files or not), and much more. + +%description -l pl +?atwy w u?yciu edytor tekstu. Ma by? u?ywalny z niewielk? albo i bez +?adnej instrukcji. Ma zar?wno interfejs terminalowy (oparty na +curses), jak i natywny interfejs X Window System (w tym wypadku +binarka nazywa si? xae). Mo?liwo?ci obejmuj? wyskakuj?ce menu, +kronik? (do odtwarzania danych po padzie systemu lub utracie +po??czenia), wytnij-i-wklej, wiele bufor?w (powi?zanych z plikami lub +nie) i wiele wi?cej. %prep %setup -q @@ -54,6 +64,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 09:46:47 qboosh +- pl desc, md5 + Revision 1.1 2005/08/27 01:10:45 undefine - initital pld version, partialy based on mdk spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aee.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 11:46:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: aee-2.2.15b.tar.gz Message-ID: <7234.1125136019@distfiles.pld-linux.org> Files fetched: 1 STORED: http://mahon.cwx.net/sources/aee-2.2.15b.tar.gz f8c3a4196f1bfd46beb6b76d73ecb7a2 aee-2.2.15b.tar.gz Size: 184218 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:51:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: egroupware.spec - pl for new subpackages In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl for new subpackages ---- Files affected: SPECS: egroupware.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/egroupware.spec diff -u SPECS/egroupware.spec:1.8 SPECS/egroupware.spec:1.9 --- SPECS/egroupware.spec:1.8 Thu Aug 25 18:21:09 2005 +++ SPECS/egroupware.spec Sat Aug 27 11:51:01 2005 @@ -16,9 +16,9 @@ URL: http://www.egroupware.org/ Requires: %{name}(DB_Driver) Requires: php >= 3:4.1.2 -Requires: php-pcre Requires: php-gd Requires: php-mbstring +Requires: php-pcre BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,31 +40,47 @@ %package db-mysql Summary: eGroupware DB Driver for MySQL +Summary(pl): Sterownik bazy danych eGroupware dla MySQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mysql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mysql This virtual package provides MySQL database backend for eGroupware. +%description db-mysql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla +eGroupware. + %package db-pgsql Summary: eGroupware DB Driver for PostgreSQL +Summary(pl): Sterownik bazy danych eGroupware dla PostgreSQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-pgsql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-pgsql -This virtual package provides PostgreSQL database backend for eGroupware. +This virtual package provides PostgreSQL database backend for +eGroupware. + +%description db-pgsql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych PostgreSQL dla +eGroupware. %package db-mssql Summary: eGroupware DB Driver for MS SQL +Summary(pl): Sterownik bazy danych eGroupware dla MS SQL-a Group: Applications/WWW -Provides: %{name}(DB_Driver) = %{version}-%{release} Requires: php-mssql +Provides: %{name}(DB_Driver) = %{version}-%{release} %description db-mssql This virtual package provides MS SQL database backend for eGroupware. +%description db-mssql -l pl +Ten wirtualny pakiet dostarcza backend bazy danych MS SQL dla +eGroupware. + %prep %setup -q -n %{name} @@ -178,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 09:51:01 qboosh +- pl for new subpackages + Revision 1.8 2005/08/25 16:21:09 glen - created virtual DB packages to let user choose just one database ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/egroupware.spec?r1=1.8&r2=1.9&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: Zope3.spec - fixed md5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:51:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed md5 ---- Files affected: SPECS: Zope3.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Zope3.spec diff -u SPECS/Zope3.spec:1.2 SPECS/Zope3.spec:1.3 --- SPECS/Zope3.spec:1.2 Sat Aug 27 11:33:06 2005 +++ SPECS/Zope3.spec Sat Aug 27 11:51:39 2005 @@ -10,7 +10,7 @@ License: Zope Public License (ZPL) Group: Networking/Daemons Source0: http://www.zope.org/Products/Zope3/%{version}%{sub_ver}/%{name}-%{version}%{sub_ver}.tgz -# Source0-md5: 66876823e53fbd0d4a8a7262d7ce251b +# Source0-md5: e22eeeae5de89c0eea9edabe3f2c3c4d Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -258,6 +258,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 09:51:39 qboosh +- fixed md5 + Revision 1.2 2005/08/27 09:33:06 qboosh - pl for python- ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: Zope3-3.1.0c1.tgz Message-ID: <14186.1125136318@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.zope.org/Products/Zope3/3.1.0c1/Zope3-3.1.0c1.tgz e22eeeae5de89c0eea9edabe3f2c3c4d Zope3-3.1.0c1.tgz Size: 3987090 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 11:52:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: subversion-SWIGEXPORT.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:52:37 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: subversion-SWIGEXPORT.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:55:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SOURCES: initng-PLD.patch (REMOVED) - outdated (I assume) In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:55:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated (I assume) ---- Files affected: SOURCES: initng-PLD.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 11:57:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: jude.spec - pl fix, unified preamble In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 09:57:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl fix, unified preamble ---- Files affected: SPECS: jude.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/jude.spec diff -u SPECS/jude.spec:1.6 SPECS/jude.spec:1.7 --- SPECS/jude.spec:1.6 Thu Aug 25 11:58:52 2005 +++ SPECS/jude.spec Sat Aug 27 11:57:41 2005 @@ -10,10 +10,10 @@ Source0: http://www.esm.co.jp/jude/jude-%{codename}-%(echo %{version} | tr . _).zip Source1: %{name}.desktop Source2: %{name}-icon.png +NoSource: 0 URL: http://objectclub.esm.co.jp/Jude/ Requires: jre BuildArch: noarch -NoSource: 0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -21,8 +21,8 @@ designing in JavaTM and UML1.4 (Unified Modeling Language). %description -l pl -Jude jest nowym narz?dziem obs?uguj?cym obiektowo-zorientowane -przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany +Jude jest nowym narz?dziem obs?uguj?cym zorientowane obiektowo +przygotowywanie oprogramowania w JavaTM i UML1.4 (zunifikowany j?zyk modelowania). %prep @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/27 09:57:41 qboosh +- pl fix, unified preamble + Revision 1.6 2005/08/25 09:58:52 heretyk - up to 1.6.2 - icon added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jude.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sat Aug 27 12:01:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: librsvg.spec - unified In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:01:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified ---- Files affected: SPECS: librsvg.spec (1.85 -> 1.86) ---- Diffs: ================================================================ Index: SPECS/librsvg.spec diff -u SPECS/librsvg.spec:1.85 SPECS/librsvg.spec:1.86 --- SPECS/librsvg.spec:1.85 Sat Aug 27 04:04:54 2005 +++ SPECS/librsvg.spec Sat Aug 27 12:01:34 2005 @@ -122,7 +122,7 @@ Bibliotecas est?ticas para o desenvolvimento de aplica??es com librsvg. -%package -n mozilla-plugin-rsvg +%package -n mozilla-plugin-rsvg Summary: Mozilla SVG plugin using librsvg Summary(pl): Wtyczka Mozilli do SVG wykorzystuj?ca librsvg Group: X11/Applications/Multimedia @@ -214,6 +214,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.86 2005/08/27 10:01:34 qboosh +- unified + Revision 1.85 2005/08/27 02:04:54 aredridel - up to 2.11.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/librsvg.spec?r1=1.85&r2=1.86&f=u From qboosh at pld-linux.org Sat Aug 27 12:04:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: openldap-schema-mozillaorgperson.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:04:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: openldap-schema-mozillaorgperson.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/openldap-schema-mozillaorgperson.spec diff -u SPECS/openldap-schema-mozillaorgperson.spec:1.1 SPECS/openldap-schema-mozillaorgperson.spec:1.2 --- SPECS/openldap-schema-mozillaorgperson.spec:1.1 Fri Aug 26 01:05:07 2005 +++ SPECS/openldap-schema-mozillaorgperson.spec Sat Aug 27 12:04:13 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Mozilla LDAP schema +Summary(pl): Schemat LDAP dla Mozilli Name: openldap-schema-mozillaorgperson Version: 0.6.3 Release: 0.2 @@ -19,6 +20,10 @@ This package contains LDAPv3 schema for use with the Mozilla Address Book. +%description -l pl +Ten pakiet zawiera schemat LDAPv3 do u?ywania z ksi??k? adresow? +Mozilli. + %prep %setup -q -c -T cp %{SOURCE0} . @@ -77,6 +82,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:04:13 qboosh +- pl + Revision 1.1 2005/08/25 23:05:07 glen - created - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap-schema-mozillaorgperson.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pecl-cpdf.spec - cosmetic In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:08:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetic ---- Files affected: SPECS: php-pecl-cpdf.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-cpdf.spec diff -u SPECS/php-pecl-cpdf.spec:1.1 SPECS/php-pecl-cpdf.spec:1.2 --- SPECS/php-pecl-cpdf.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-cpdf.spec Sat Aug 27 12:08:06 2005 @@ -3,7 +3,7 @@ %define _status stable Summary: %{_modname} - extension module for PHP -Summary(pl): %{_modname} - modu? dla php +Summary(pl): %{_modname} - modu? dla PHP Name: php-pecl-%{_modname} Version: 2.0.0 Release: 1 @@ -69,6 +69,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:08:06 qboosh +- cosmetic + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-cpdf.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:08:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: cpdf-2.0.0.tgz Message-ID: <4478.1125137290@distfiles.pld-linux.org> wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/cpdf-2.0.0.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/852b78d4-c1ee-4405-bdd1-09e9ece0edf7/ee90a55b753975faac607f4230ece2b4/cpdf-2.0.0.tgz "http://pecl.php.net/get/cpdf-2.0.0.tgz": http://pecl.php.net/get/cpdf-2.0.0.tgz: 12:08:10 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: DISTFILES: ERRORS: dio-not-yet.tgz Message-ID: <8692.1125137465@distfiles.pld-linux.org> wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. FATAL: http://pecl.php.net/get/dio-not-yet.tgz (ee90a55b753975faac607f4230ece2b4) was not fetched (wget -nv -O ./tmp/51935e08-f6aa-418a-996a-5d022172bf20/ee90a55b753975faac607f4230ece2b4/dio-not-yet.tgz "http://pecl.php.net/get/dio-not-yet.tgz": http://pecl.php.net/get/dio-not-yet.tgz: 12:11:05 ERROR 404: Not Found. ) Files fetched: 0 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 12:11:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: php-pecl-dio.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:11:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: php-pecl-dio.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/php-pecl-dio.spec diff -u SPECS/php-pecl-dio.spec:1.1 SPECS/php-pecl-dio.spec:1.2 --- SPECS/php-pecl-dio.spec:1.1 Thu Aug 25 20:50:08 2005 +++ SPECS/php-pecl-dio.spec Sat Aug 27 12:11:01 2005 @@ -3,6 +3,7 @@ %define _status stable Summary: %{_modname} - Direct I/O functions +Summary(pl): %{_modname} - funkcje bezpo?redniego we/wy Name: php-pecl-%{_modname} Version: not-yet Release: 1 @@ -21,7 +22,7 @@ %define extensionsdir %{_libdir}/php %description -PHP supports the direct io functions as described in the Posix +PHP supports the direct I/O functions as described in the Posix Standard (Section 6) for performing I/O functions at a lower level than the C-Language stream I/O functions (fopen(), fread(),..). The use of the DIO functions should be considered only when direct control @@ -30,6 +31,17 @@ In PECL status of this extension is: %{_status}. +%description -l pl +PHP obs?uguje funkcje bezpo?redniego we/wy wg opisu w standardzie +POSIX (sekcji 6) do wykonywania operacji we/wy na poziomie ni?szym ni? +funkcje strumieni we/wy w j?zyku C (fopen(), fread()...). U?ycie +funkcji DIO powinno by? rozwa?ane tylko je?li potrzebna jest +bezpo?rednia kontrola nad urz?dzeniem. We wszystkich innych +przypadkach odpowiedniejsze s? standardowe funkcje operacji na +systemie plik?w. + +To rozszerzenie ma w PECL status: %{_status}. + %prep %setup -q -c @@ -66,6 +78,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:11:01 qboosh +- pl + Revision 1.1 2005/08/25 18:50:08 arekm - nothing; not available yet - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/php-pecl-dio.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:19:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: ruby-open4.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:19:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ruby-open4.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ruby-open4.spec diff -u SPECS/ruby-open4.spec:1.1 SPECS/ruby-open4.spec:1.2 --- SPECS/ruby-open4.spec:1.1 Thu Aug 25 21:24:44 2005 +++ SPECS/ruby-open4.spec Sat Aug 27 12:18:59 2005 @@ -3,6 +3,7 @@ %define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]') %define ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]') Summary: Ruby open3 with exit reporting +Summary(pl): open3 w Rubym z raportowaniem wyj?cia Name: ruby-open4 Version: 0.1.0 Release: 1 @@ -20,6 +21,9 @@ %description Ruby open3 with exit reporting. +%description -l pl +open3 w Rubym z raportowaniem wyj?cia. + %prep %setup -q -n open4-%{version} @@ -56,6 +60,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:18:59 qboosh +- pl + Revision 1.1 2005/08/25 19:24:44 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ruby-open4.spec?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sat Aug 27 12:28:51 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:38 2005 Subject: PLD-doc: BuildRequires.txt - elaborate %service macros versions In-Reply-To: References: Message-ID: Author: glen Date: Sat Aug 27 10:28:51 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - elaborate %service macros versions ---- Files affected: PLD-doc: BuildRequires.txt (1.40 -> 1.41) ---- Diffs: ================================================================ Index: PLD-doc/BuildRequires.txt diff -u PLD-doc/BuildRequires.txt:1.40 PLD-doc/BuildRequires.txt:1.41 --- PLD-doc/BuildRequires.txt:1.40 Tue Aug 23 20:33:10 2005 +++ PLD-doc/BuildRequires.txt Sat Aug 27 12:28:46 2005 @@ -110,7 +110,10 @@ Requires(postun): /usr/sbin/groupdel # %service +# basic %service support BuildRequires: rpmbuild(macros) >= 1.228 +# %service which is one command in shell context ([ "$condition" ] || %service) +BuildRequires: rpmbuild(macros) >= 1.230 Requires(post,preun): rc-scripts # /sbin/chkconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/BuildRequires.txt?r1=1.40&r2=1.41&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: xorg-lib-xtrans.spec - merged descs from libXtrans.spec, Ob... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from libXtrans.spec, Obsoletes: libXtrans* ---- Files affected: SPECS: xorg-lib-xtrans.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.1 SPECS/xorg-lib-xtrans.spec:1.2 --- SPECS/xorg-lib-xtrans.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 12:38:00 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # $Rev: 3233 $, $Date$ # -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Name: xorg-lib-xtrans Version: 0.99.0 Release: 0.04 @@ -20,24 +20,29 @@ %define _prefix /usr/X11R6 %description -xtrans library. +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description -l pl -Biblioteka xtrans. - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %package devel -Summary: xtrans library -Summary(pl): Biblioteka xtrans +Summary: xtrans library - network API translation layer +Summary(pl): Biblioteka xtrans - warstwa t?umaczenia sieciowego API Group: X11/Development/Libraries Requires: xorg-proto-xproto-devel +Obsoletes: libXtrans-devel %description devel -xtrans library +xtrans library provides network API translation layer to insulate X +applications and libraries from OS network vagaries. %description devel -l pl -Biblioteka xtrans - +Biblioteka xtrans dostarcza warstw? t?umaczenia sieciowego API s?u??c? +do oddzielenia aplikacji i bibliotek X od kaprys?w sieciowych systemu +operacyjnego. %prep %setup -q -n xtrans-%{version} @@ -83,6 +88,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 10:38:00 qboosh +- merged descs from libXtrans.spec, Obsoletes: libXtrans* + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 12:38:53 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:38 2005 Subject: SPECS: libXtrans.spec (REMOVED) - obsoleted by xorg-lib-xtrans In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - obsoleted by xorg-lib-xtrans ---- Files affected: SPECS: libXtrans.spec (1.7 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sat Aug 27 12:40:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: PLD-doc: PLD-update-TODO - updated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 10:40:31 2005 GMT Module: PLD-doc Tag: HEAD ---- Log message: - updated ---- Files affected: PLD-doc: PLD-update-TODO (1.248 -> 1.249) ---- Diffs: ================================================================ Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.248 PLD-doc/PLD-update-TODO:1.249 --- PLD-doc/PLD-update-TODO:1.248 Wed Aug 17 19:20:22 2005 +++ PLD-doc/PLD-update-TODO Sat Aug 27 12:40:26 2005 @@ -2,23 +2,24 @@ AfterStep(12) [OLD] 2.00.02 [NEW] 2.1.2 AutoIndex(11) [OLD] 2.1.1 [NEW] 2.1.2 Azureus(9) [OLD] 2.1.0.4 [NEW] 2.3.0.4 -DenyHosts(9) [OLD] 0.9.8 [NEW] 0.9.9 -EasyBMP(10) [OLD] 0.63 [NEW] 0.65 -EasyBMP(12) [OLD] 0.63 [NEW] 0.64 +BitTorrent(9) [OLD] 4.1.3 [NEW] 4.1.4 +DenyHosts(9) [OLD] 0.9.8 [NEW] 1.0.2 +EasyBMP(10) [OLD] 0.65 [NEW] 0.66 GNUnet(13) [OLD] 0.6.5 [NEW] 0.6.6 GWorkspace(9) [OLD] 0.6.5 [NEW] 0.7.1 Gauche(9) [OLD] 0.5.5 [NEW] 0.8.5 -GeoIP(9) [OLD] 1.3.12 [NEW] 1.3.13 IRRToolSet(13) [OLD] 4.7.3 [NEW] 4.8.2 ISMail(9) [OLD] 1.7.3 [NEW] 1.7.4 Isearch(9) [OLD] 1.47b [NEW] 1.47i +LabPlot(9) [OLD] 1.4.1 [NEW] 1.5.0.1 MayaVi(9) [OLD] 1.3 [NEW] 1.4 -Mesa(14) [OLD] 6.2.1 [NEW] 6.3 -Mesa(16) [OLD] 6.2.1 [NEW] 6.3 +Mesa(14) [OLD] 6.2.1 [NEW] 6.3.2 +Mesa(16) [OLD] 6.2.1 [NEW] 6.3.2 Narval-pda(11) [OLD] 20011016 [NEW] 20020927 STLport(10) [OLD] 4.6.2 [NEW] 5.0RC2 -TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.6 -TkDVD(9) [OLD] 3.6 [NEW] 3.7 +Slune(9) [OLD] 1.0.8 [NEW] 1.0.9 +TeXmacs(9) [OLD] 1.0.5.5 [NEW] 1.0.5.7 +TkDVD(9) [OLD] 3.6 [NEW] 3.8 Zope(20) [OLD] 2.7.7 [NEW] 2.8.1 Zope-CMF(14) [OLD] 1.4.7 [NEW] 1.5.3 Zope-LocalFS(11) [OLD] 1.6 [NEW] 1.7rc1 @@ -27,53 +28,63 @@ Zope-ZAAPlugins(10) [OLD] 2.3 [NEW] 2.21 Zope-ZAttachmentAttribute(10) [OLD] 2.3 [NEW] 2.21 ZopeInterface(9) [OLD] 3.0.1 [NEW] 3.1.0b1 -abcde(9) [OLD] 2.2.6 [NEW] 2.3.0 +abcde(9) [OLD] 2.2.6 [NEW] 2.3.2 aboot(10) [OLD] 0.9b [NEW] 1.0_pre20040408 adm8211(18) [OLD] 20050323 [NEW] 20050620 aegis(9) [OLD] 4.16 [NEW] 4.20 -alien(10) [OLD] 8.53 [NEW] 8.56 alleyoop(9) [OLD] 0.8.2 [NEW] 0.9.0 alltray(9) [OLD] 0.51 [NEW] 0.60 -alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b +alsa-driver(28) [OLD] 1.0.9a [NEW] 1.0.9b [1.0.10rc1] +alsa-lib(17) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-oss(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-tools(9) [OLD] 1.0.9 [NEW] 1.0.10rc1 +alsa-utils(13) [OLD] 1.0.9a [NEW] 1.0.10rc1 am-utils(12) [OLD] 6.0.10 [NEW] 6.1.1 amaya(9) [OLD] 8.6 [NEW] 9.2.1 -anjuta(12) [OLD] 1.2.3 [NEW] 2.0.1 +anjuta(12) [OLD] 1.2.4 [NEW] 2.0.1 antinat(9) [OLD] 0.71 [NEW] 0.90 antlr(17) [OLD] 2.7.5 [NEW] 3.0ea5 +aoetools(14) [OLD] 5 [NEW] 6 apache-mod_bt(11) [OLD] 0.0.4 [NEW] 0.0.13 apache-mod_caml(11) [OLD] 1.3.4 [NEW] 1.3.6 apache-mod_epp(16) [OLD] 1.1 [NEW] 1.2 apache-mod_perl(31) [OLD] 2.0.0 [NEW] 2.0.1 -apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.6 -apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache-mod_scgi(23) [OLD] 1.2 [NEW] 1.7 +apache-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apache-mod_transform(11) [OLD] 0.4.0 [NEW] 0.6.0 +apache-mod_vhs(11) [OLD] 1.0.16 [NEW] 1.0.18 apache1-mod_chroot(11) [OLD] 0.4 [NEW] 0.5 apache1-mod_mp3(13) [OLD] 0.40 [NEW] 1.2 -apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev2 +apache1-mod_security(11) [OLD] 1.8.7 [NEW] 1.9dev3 apcupsd(14) [OLD] 3.10.17 [NEW] 3.10.18 +apr(10) [OLD] 1.1.1 [NEW] 1.2.1 +apr-util(14) [OLD] 1.1.2 [NEW] 1.2.1 aptitude(14) [OLD] 0.2.11.1 [NEW] 0.3.3 aqsis(9) [OLD] 1.0.0 [NEW] 1.1.0.30062005 asa(14) [OLD] 0.1.6 [NEW] 0.1.7 aspell(12) [OLD] 0.60.2 [NEW] 0.60.3 aspell-he(11) [OLD] 0.8 [NEW] 0.9 -aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050815 +aspell-pl-alt(9) [OLD] 20050725 [NEW] 20050824 asterisk-addons(10) [OLD] 1.0.7 [NEW] 1.0.9 +atlas(14) [OLD] 3.7.10 [NEW] 3.7.11 atmelwlandriver(22) [OLD] 3.4.1.0 [NEW] 3.4.1.1 atop(9) [OLD] 1.13 [NEW] 1.14 -audit(9) [OLD] 0.9.7 [NEW] 1.0.2 +audit(9) [OLD] 0.9.7 [NEW] 1.0.3 autodns(12) [OLD] 0.0.6 [NEW] 0.0.8 autofs(15) [OLD] 4.1.3 [NEW] 4.1.4 ayam(10) [OLD] 1.8.2 [NEW] 1.8.3 -bacula(15) [OLD] 1.36.3 [NEW] 1.37.30 +bacula(15) [OLD] 1.36.3 [NEW] 1.37.36 bacula(19) [OLD] 1.36.3 [NEW] 1.37.18 batik(9) [OLD] 1.5.1 [NEW] 1.6 bbkeys(9) [OLD] 0.8.6 [NEW] 0.9.0 +bglibs(9) [OLD] 1.024 [NEW] 1.027 bigloo(9) [OLD] 2.6b [NEW] 2.6f bigsister(19) [OLD] 0.99b2 [NEW] 0.99c3 bincimap(9) [OLD] 1.2.12final [NEW] 1.2.13final bitbake(9) [OLD] 1.2 [NEW] 1.2.1 bless(9) [OLD] 0.3.1 [NEW] 0.3.6 -bogofilter(10) [OLD] 0.94.14 [NEW] 0.95.2 +bluefish(17) [OLD] 1.0.2 [NEW] 1.0.3 +bogofilter(10) [OLD] 0.95.2 [NEW] 0.96.0 boost-jam(9) [OLD] 3.1.10 [NEW] 3.1.11 bootsplash(13) [OLD] 3.1 [NEW] 3.2 brltty(10) [OLD] 3.6.1 [NEW] 3.6.2 @@ -81,11 +92,12 @@ bsdmake(9) [OLD] 11 [NEW] 16 bttv(20) [OLD] 0.7.87 [NEW] 0.9.15 bugzilla(16) [OLD] 2.18 [NEW] 2.20 +busybox(41) [OLD] 1.00 [NEW] 1.01 bygfoot(9) [OLD] 1.8.1 [NEW] 1.9.0 cacti(14) [OLD] 0.8.6c [NEW] 0.8.6f castle-combat(9) [OLD] 0.7.4 [NEW] 0.8.0a2 cbb(10) [OLD] 0.8.1 [NEW] 0.9.5b -ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.9 +ccaudio2(9) [OLD] 0.7.7 [NEW] 0.7.10 cdl3(9) [OLD] 1.2.3 [NEW] 1.2.6 cdrdao(14) [OLD] 1.1.9 [NEW] 1.2.0 cfl(9) [OLD] 0.8.0 [NEW] 1.0 @@ -96,39 +108,46 @@ cheops-ng(9) [OLD] 0.1.12 [NEW] 0.2.2 cinelerra(11) [OLD] 1.2.1 [NEW] 1.2.2 cjc(15) [OLD] 0.5.s20050709 [NEW] 0.5.s20050724 -clamsmtp(9) [OLD] 1.4.1 [NEW] 1.5 clanbomber(9) [OLD] 1.02a [NEW] 1.05 classpath(14) [OLD] 0.16 [NEW] 0.17 clearsilver(9) [OLD] 0.9.14 [NEW] 0.10.1 click-packages(9) [OLD] 1.4 [NEW] 1.4.2 clip(28) [OLD] 1.1.13 [NEW] 1.1.14 -clusterit(9) [OLD] 2.3 [NEW] 2.3.1 -conary(9) [OLD] 0.61.6 [NEW] 0.61.7 courier-imap(9) [OLD] 4.0.3 [NEW] 4.0.4 cpqarrayd(9) [OLD] 2.0 [NEW] 2.2 -crafty(9) [OLD] 19.5 [NEW] 19.19 +crafty(9) [OLD] 19.5 [NEW] 19.20 cronosII(9) [OLD] 0.2.2.23 [NEW] 0.3.0pre9 +crossalpha-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossarm-binutils(17) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossarm-newlib(9) [OLD] 1.12.0 [NEW] 1.13.0 -crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.2 +crossavr-binutils(13) [OLD] 2.15.91.0.2 [NEW] 2.16.91.0.3 crossavr-gcc(14) [OLD] 3.4.2 [NEW] 4.0.1 crossavr-gdb(18) [OLD] 6.2.1 [NEW] 6.3 -crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crossdjgpp-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 crossdjgpp-gcc(14) [OLD] 3.3.2 [NEW] 4.0.1 crossdjgpp-pdcurses(10) [OLD] 24 [NEW] 26 crossfire(9) [OLD] 1.6.0 [NEW] 1.8.0.maps -crossfire-client(11) [OLD] 1.7.0 [NEW] 1.8.0 -crossfire-client(15) [OLD] 1.7.0 [NEW] 1.7.1 -crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.2 +crosshppa-binutils(13) [OLD] 2.15.91.0.1 [NEW] 2.16.91.0.3 +crossmingw32-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 crossmingw32-gcc(26) [OLD] 3.4.3 [NEW] 4.0.1 -crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.2 +crossmingw32-lua40(10) [OLD] 4.0.1 [NEW] 5.0.2 +crossmingw32-pcre(10) [OLD] 6.2 [NEW] 6.3 +crossmipsel-binutils(13) [OLD] 2.15.94.0.1 [NEW] 2.16.91.0.3 crossmipsel-egcs(11) [OLD] 1.0.2 [NEW] 1.1.2 crossmipsel-gcc(14) [OLD] 3.3.5 [NEW] 4.0.1 +crossppc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossppc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosss390x-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crosssparc64-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 +crossx8664-binutils(13) [OLD] 2.16.91.0.2 [NEW] 2.16.91.0.3 ctwm(9) [OLD] 3.6 [NEW] 3.7 cyclone(11) [OLD] 0.5 [NEW] 0.8 cyclone(9) [OLD] 0.5 [NEW] 0.8.1 dansguardian(10) [OLD] 2.8.0.4 [NEW] 2.8.0.6 darcs(9) [OLD] 1.0.3 [NEW] 1.0.4pre2 darkice(9) [OLD] 0.14 [NEW] 0.15 +dbus(29) [OLD] 0.36 [NEW] 0.36.1 dcc-dccd(9) [OLD] 1.2.50 [NEW] 1.3.15 debiandoc-sgml(10) [OLD] 1.1.86 [NEW] 1.1.88 debootstrap(12) [OLD] 0.2.45 [NEW] 0.3.1.5 @@ -137,7 +156,7 @@ di(9) [OLD] 3.11 [NEW] 4.1 dibbler(11) [OLD] 0.4.0 [NEW] 0.4.1 dibbler(9) [OLD] 0.4.0 [NEW] 0.4.1 -digikamimageplugins(9) [OLD] 0.7.2 [NEW] 0.7.3 +dirac(9) [OLD] 0.5.2 [NEW] 0.5.3 directory_administrator(11) [OLD] 1.6.0 [NEW] 1.7.1 dnprogs(18) [OLD] 2.23 [NEW] 2.29 doc++(14) [OLD] 3.4.9 [NEW] 3.4.10 @@ -146,17 +165,19 @@ doom3(22) [OLD] 1.1.1286 [NEW] 1.3.1302 dopewars(18) [OLD] 1.5.9 [NEW] 1.5.10 dotproject(14) [OLD] 1.0.1 [NEW] 2.0.1 -dpkg(9) [OLD] 1.10.23 [NEW] 1.13.10 +dovecot(16) [OLD] 0.99.14 [NEW] 1.0.alpha1 +dpkg(9) [OLD] 1.10.23 [NEW] 1.13.11 drgeo(9) [OLD] 1.0.0 [NEW] 1.1.0 drivel(9) [OLD] 2.0.1 [NEW] 2.0.2 dspam(52) [OLD] 3.4.9 [NEW] 3.6.beta.1 -dumb(9) [OLD] 0.9.2 [NEW] 0.9.3 dvdisaster(12) [OLD] 0.62 [NEW] 0.63 dx(12) [OLD] 4.3.2 [NEW] 4.3.3 e-uae(9) [OLD] 0.8.27 [NEW] 0.8.28 eboard(9) [OLD] 0.9.0 [NEW] 0.9.5 +ecasound(16) [OLD] 2.4.2 [NEW] 2.4.3 eclipse-plugin-TeXlipse(9) [OLD] 1.0.2 [NEW] 1.0.4 elektra(10) [OLD] 0.4.6 [NEW] 0.5.0.4 +elm(16) [OLD] 2.5.7 [NEW] 2.5.8 emacs-erc(9) [OLD] 4.0 [NEW] 5.0.4 emacs-ess(9) [OLD] 5.2.6 [NEW] 5.2.8 emacs-mew-pkg(10) [OLD] 3.3 [NEW] 4.2 @@ -166,17 +187,20 @@ epic4(10) [OLD] 1.2.9 [NEW] 2.1.3 epiphany(13) [OLD] 1.6.4 [NEW] 1.6.5 epiphany-extensions(12) [OLD] 1.6.4 [NEW] 1.6.5 -etherape(10) [OLD] 0.9.0 [NEW] 0.9.2 +etherape(10) [OLD] 0.9.0 [NEW] 0.9.3 etherboot(10) [OLD] 5.3.7 [NEW] 5.4.0 everybuddy(10) [OLD] 0.2.1beta6 [NEW] 0.4.3 [DEAD URL] evms(9) [OLD] 2.3.4 [NEW] 2.5.3 +evolution-exchange(16) [OLD] 2.3.7 [NEW] 2.3.8 exifprobe(9) [OLD] 1.2.6 [NEW] 2.0.1 exim-lite(11) [OLD] 4.51 [NEW] 4.52 expect(15) [OLD] 5.42.1 [NEW] 5.43.0 extace(9) [OLD] 1.5.0 [NEW] 1.9.3 -fax4CUPS(9) [OLD] 1.24 [NEW] 1.25 +fakeroot(10) [OLD] 1.4.2 [NEW] 1.4.3 +fax4CUPS(9) [OLD] 1.24 [NEW] 1.26 feh(9) [OLD] 1.3.2 [NEW] 1.3.4 fftrader(9) [OLD] 0.65 [NEW] 0.66 +file(35) [OLD] 4.14 [NEW] 4.15 flow-tools(9) [OLD] 0.67 [NEW] 0.68 fluxconf(14) [OLD] 0.9.7 [NEW] 0.9.8 fmio(9) [OLD] 1.2.29 [NEW] 2.0.8 @@ -185,24 +209,24 @@ foomatic-db(10) [OLD] 20050405 [NEW] 20050721 foomatic-db-engine(11) [OLD] 3.0.1 [NEW] 3.0.2 forgate(10) [OLD] 0.9 [NEW] 0.9b -fox(9) [OLD] 1.4.16 [NEW] [1.5.6 DEVEL] +fox(9) [OLD] 1.4.17 [NEW] [1.5.7 DEVEL] freenx(9) [OLD] 0.4.0 [NEW] 0.4.2 freeradius(15) [OLD] 1.0.2 [NEW] 1.0.4 freeswan(19) [OLD] 2.04 [NEW] 2.06 fspclient(10) [OLD] 0.90.0 [NEW] 0.91.0 fsplib(13) [OLD] 0.6 [NEW] 0.7 -fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.13 +fvwm2(27) [OLD] 2.5.12 [NEW] 2.5.14 gDesklets(9) [OLD] 0.35 [NEW] 0.35.2 gai(16) [OLD] 0.5.8 [NEW] 0.5.10 gallery(16) [OLD] 1.4.4 [NEW] 1.5 gaphor(9) [OLD] 0.7.0 [NEW] 0.7.0.1 -gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.5 +gchempaint(9) [OLD] 0.4.2 [NEW] 0.5.6 gcl(14) [OLD] 2.6.6 [NEW] 2.6.7 gcx(9) [OLD] 0.8.8 [NEW] 0.9.2 gdal(13) [OLD] 1.2.6 [NEW] 1.3.0 geneweb(18) [OLD] 4.09 [NEW] 4.10 genius(9) [OLD] 0.7.2 [NEW] 0.7.4 -gg2(20) [OLD] 2.2.6 [NEW] 2.2.7 +geos(9) [OLD] 2.1.3 [NEW] 2.1.4 ghemical(14) [OLD] 1.01 [NEW] 1.90 ghostpcl(9) [OLD] 1.38p1 [NEW] 1.41 giFT-gnutella(12) [OLD] 0.0.9.2 [NEW] 0.0.10.1 @@ -210,15 +234,17 @@ giFToxic(9) [OLD] 0.0.9 [NEW] 0.0.10 gkrellm-bgchg(9) [OLD] 0.1.4 [NEW] 0.1.5 gkrellm-pmu(9) [OLD] 2.3 [NEW] 2.4 -gksu(10) [OLD] 1.2.2 [NEW] 1.3.3 +gksu(10) [OLD] 1.2.2 [NEW] 1.3.4 glchess(9) [OLD] 0.4.7 [NEW] 0.8.6 gliv(10) [OLD] 1.9.2 [NEW] 1.9.3 global(14) [OLD] 4.7 [NEW] 4.8.6 +gmime(13) [OLD] 2.1.15 [NEW] 2.1.16 gnocatan(9) [OLD] 0.8.1.43 [NEW] 0.8.1.59, pioneers-0.9.19 gnofract4d(9) [OLD] 2.7 [NEW] 2.9 gnomad2(10) [OLD] 2.6.3 [NEW] 2.8.0 gnome-applet-bubblemon(9) [OLD] 1.2.6 [NEW] 1.2.9 -gnome-applet-netspeed(10) [OLD] 0.12.1 [NEW] 0.13 +gnome-applet-quick-lounge(9) [OLD] 2.10.0 [NEW] 2.10.1 +gnome-applet-timer(12) [OLD] 1.0 [NEW] 1.1.1 gnome-btdownload(9) [OLD] 0.0.20 [NEW] 0.0.22 gnome-chemistry-utils(13) [OLD] 0.2.5 [NEW] 0.5.0 gnome-crystal(9) [OLD] 0.6.1 [NEW] 0.6.5 @@ -227,12 +253,11 @@ gnome-mag(9) [OLD] 0.12.0 [NEW] 0.12.1 gnome-mud(9) [OLD] 0.10.5 [NEW] 0.10.7 gnome-network(13) [OLD] 1.99.2 [NEW] 1.99.5 -gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0.1 +gnome-osd(9) [OLD] 0.7.2 [NEW] 0.8.0-1 gnome-telnet(9) [OLD] 2.4 [NEW] 2.5 [DEAD URL] gnome-themes(9) [OLD] 2.10.1 [NEW] 2.10.2 gnomemm(9) [OLD] 1.2.2 [NEW] 1.2.4 gnu.getopt(9) [OLD] 1.0.9 [NEW] 1.0.11 -gnubiff(13) [OLD] 2.1.3 [NEW] 2.1.4 gnue-appserver(10) [OLD] 0.4.1 [NEW] 0.4.2 gnue-common(9) [OLD] 0.5.14 [NEW] 0.6.0 gnue-designer(9) [OLD] 0.5.6 [NEW] 0.5.7 @@ -242,7 +267,6 @@ gnugk(9) [OLD] 2.0.8 [NEW] 2.2.1 gnugo(9) [OLD] 3.4 [NEW] 3.6 gnuitar(9) [OLD] 0.3.1 [NEW] 0.3.2 -gnupg(20) [OLD] 1.4.1 [NEW] 1.4.2 gnuserv(10) [OLD] 3.12.6 [NEW] 3.12.7 gnusound(9) [OLD] 0.7.1 [NEW] 0.7.4 gofish(9) [OLD] 0.22 [NEW] 1.0 @@ -255,13 +279,14 @@ gretl(9) [OLD] 1.2.4 [NEW] 1.4.1 grisbi(12) [OLD] 0.5.5 [NEW] 0.5.7 grub(24) [OLD] 0.97 [NEW] 1.90 +gsasl(15) [OLD] 0.2.6 [NEW] 0.2.7 gsdl(16) [OLD] 2.39 [NEW] 2.40 gsoap(9) [OLD] 2.7 [NEW] 2.7.1 gstreamer(9) [OLD] 0.8.10 [NEW] 0.9.1 gstreamer-ffmpeg(17) [OLD] 0.8.5 [NEW] 0.8.6 gtk+-directfb(10) [OLD] 1.3.4 [NEW] 2.0.9-2 +gtk+2(23) [OLD] 2.6.9 [NEW] 2.6.10 gtk-gnutella(10) [OLD] 0.95 [NEW] 0.95.4 -gtk-sharp2(12) [OLD] 1.9.1 [NEW] 1.9.3 gtk-theme-4Missy(9) [OLD] 1.2 [NEW] 1.2.x gtk-theme-engine-Xenophilia(9) [OLD] 0.8 [NEW] 1.2.x gtkatlantic(9) [OLD] 0.4.0 [NEW] 0.4.1 @@ -274,7 +299,7 @@ gtm(12) [OLD] 0.4.11 [NEW] 0.4.12 guarddog(9) [OLD] 2.4.0 [NEW] 2.5.0 gveejay(10) [OLD] 0.4.7 [NEW] 0.7 -gwenview(9) [OLD] 1.1.8 [NEW] 1.2.91 +gwenview(9) [OLD] 1.1.8 [NEW] 1.2.92 gwhere(15) [OLD] 0.1.6 [NEW] 0.2.1 gxmlviewer(9) [OLD] 1.2.0 [NEW] 1.3.3 gxmms(16) [OLD] 0.2.1 [NEW] 0.3.0 @@ -285,37 +310,40 @@ hk_classes(15) [OLD] 0.7.4 [NEW] 0.7.4a hnb(9) [OLD] 1.8.1 [NEW] 1.9.17 honeyd(12) [OLD] 0.8 [NEW] 1.0 -horde(20) [OLD] 3.0.4 [NEW] 3.0.5 hostap-utils(10) [OLD] 0.3.7 [NEW] 0.4.0 -hostapd(10) [OLD] 0.2.5 [NEW] 0.4.3 -howto(11) [OLD] 20050718 [NEW] 20050815 -howto-html(11) [OLD] 20050718 [NEW] 20050815 +hostapd(10) [OLD] 0.2.5 [NEW] 0.4.4 +howto(11) [OLD] 20050718 [NEW] 20050825 +howto-html(11) [OLD] 20050718 [NEW] 20050825 +hpijs(13) [OLD] 1.7.1 [NEW] 2.1.4 html2ps(10) [OLD] 1.0b3 [NEW] 1.0b4 hypersrc(9) [OLD] 4.4.15 [NEW] 5.4.18 icc(16) [OLD] 8.0.055 [NEW] 8.1.021 +icecast(14) [OLD] 2.2.0 [NEW] 2.3.0.rc1 icewm(29) [OLD] 1.2.20 [NEW] 1.2.23 ifp-line(12) [OLD] 0.2.4.5 [NEW] 0.2.4.6 iftop(10) [OLD] 0.16 [NEW] 0.17pre1 im-ja(9) [OLD] 1.3 [NEW] 1.4 +imap(15) [OLD] 2004e [NEW] 2004f imapsync(10) [OLD] 1.133 [NEW] 1.139 imcom(10) [OLD] 1.33 [NEW] 1.34 imwheel(11) [OLD] 0.9.9 [NEW] 1.0.0pre12 +inkscape(16) [OLD] 0.42 [NEW] 0.42.2 ip-filter(9) [OLD] 3.3.12 [NEW] 4.1.9 ipcad(9) [OLD] 3.6.5 [NEW] 3.6.6 -ipcalc(10) [OLD] 0.38 [NEW] 0.40 ipmiutil(9) [OLD] 1.5.8 [NEW] 1.6.7 -ipsec-tools(16) [OLD] 0.6 [NEW] 0.6.1rc1 iptables(27) [OLD] 1.3.2 [NEW] 1.3.3 ircd-hybrid(22) [OLD] 7.0.3 [NEW] 7.1.1 ircd-ptlink(16) [OLD] 6.19.3 [NEW] 6.19.4 irrd(9) [OLD] 2.2.2 [NEW] 2.2.6 ispell(14) [OLD] 3.2.06 [NEW] 3.3.02 -ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050815 +ispell-pl-alt(9) [OLD] 20050726 [NEW] 20050825 +iv(9) [OLD] 1.2.1 [NEW] 1.3.2 ivtools(9) [OLD] 1.1.3 [NEW] 1.2.2 j(10) [OLD] 0.19.0 [NEW] 0.21.0 -jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050809 -jahshaka(9) [OLD] 1.9a3 [NEW] 1.9a9 +jabberd(24) [OLD] 2.0s9 [NEW] 2.1cvs20050821 +jahshaka(9) [OLD] 1.9a3 [NEW] 2.0.RC1 jakarta-commons-daemon(9) [OLD] 1.0 [NEW] 1.0.1 +jakarta-regexp(9) [OLD] 1.3 [NEW] 1.4 jakarta-struts(9) [OLD] 1.2.6 [NEW] 1.2.7 jamvm(9) [OLD] 1.3.0 [NEW] 1.3.2 java-access-bridge(9) [OLD] 1.4.2 [NEW] 1.4.5 @@ -331,17 +359,19 @@ kbear(9) [OLD] 2.1.1 [NEW] 3.0alpha1b kde-style-dotcurve(10) [OLD] 0.2.1 [NEW] 1.0rc1 kde-theme-gorilla(11) [OLD] 1.0 [NEW] 1.4 [inny Source0 URL] +kdesvn(9) [OLD] 0.5.0 [NEW] 0.5.3 kernel-char-kbde(9) [OLD] 1.0.0 [NEW] 1.1.2 kernel-misc-acerhk(17) [OLD] 0.5.18 [NEW] 0.5.27 kernel-misc-mwavem(16) [OLD] 1.0.4 [NEW] 20010714.tar.gz kernel-mosix(40) [OLD] 2.4.22 [NEW] 2.4.31 kernel-net-e100(21) [OLD] 2.3.33 [NEW] 3.4.14 kernel-net-e1000(17) [OLD] 6.0.60 [NEW] 6.1.16 -kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.1 +kernel-net-hostap(17) [OLD] 0.4.0 [NEW] 0.4.4 kernel-pcmcia-orinoco-usb(15) [OLD] 0.0.8 [NEW] 0.1.3 kernel-video-drm(16) [OLD] 4.3.0 [NEW] 4.4.0 kernel24-video-em8300(11) [OLD] 0.14.0 [NEW] 0.15.0 kgcc(9) [OLD] 3.2.2 [NEW] 4.0.1 +kmediafactory(9) [OLD] 0.3.0 [NEW] 0.4.0 kmyfirewall(9) [OLD] 0.9.6.2 [NEW] 1.0beta1 kmymoney2(9) [OLD] 0.6.4 [NEW] 0.8 koha(12) [OLD] 1.2.2 [NEW] 2.2.3 @@ -354,19 +384,18 @@ latd(10) [OLD] 1.21 [NEW] 1.23.1 lbreakout2(9) [OLD] 2.5.2 [NEW] 2.6beta lcdf-typetools(9) [OLD] 2.17 [NEW] 2.34 -ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc1 +ldap-account-manager(10) [OLD] 0.4.9 [NEW] 0.5.rc2 leafnode(10) [OLD] 1.11.2 [NEW] 1.11.3 lg(213) [OLD] 110 [NEW] 117 -libXrender(9) [OLD] 0.8.4 [NEW] 0.9.0 libapreq(10) [OLD] 1.3 [NEW] 1.33 libapreq2(13) [OLD] 2.05 [NEW] 2.06 libdnet(12) [OLD] 1.8 [NEW] 1.10 libdockapp(13) [OLD] 0.5.0 [NEW] 0.6.1 -libdomainkeys(9) [OLD] 0.66 [NEW] 0.67 libetpan(9) [OLD] 0.37 [NEW] 0.38 libfpx(14) [OLD] 1.2.0.12 [NEW] 1.2.0.13 libhome(9) [OLD] 0.8.1 [NEW] 0.10 libhttpd(9) [OLD] 1.3 [NEW] 1.4 +libifp(9) [OLD] 1.0.0.1 [NEW] 1.0.0.2 libinklevel(9) [OLD] 0.6.4 [NEW] 0.6.5rc1 liblzf(10) [OLD] 1.5 [NEW] 1.51 libmath++(9) [OLD] 0.0.3 [NEW] 0.0.4 @@ -391,10 +420,12 @@ lirc(19) [OLD] 0.7.1 [NEW] 0.7.2 lire(12) [OLD] 1.3 [NEW] 2.0.1 lmp(9) [OLD] 0.2.99.10 [NEW] 0.3.0.pre1 -lms(19) [OLD] 1.6.2 [NEW] [1.7.2] +lms(19) [OLD] 1.6.3 [NEW] [1.7.2] log4cpp(9) [OLD] 0.3.4b [NEW] 0.3.5rc3 logfmon(10) [OLD] 0.4 [NEW] 0.7 logtool(9) [OLD] 1.1.0 [NEW] 1.3.1 +lout(11) [OLD] 3.30 [NEW] 3.31 +luma(9) [OLD] 2.2 [NEW] 2.2.1 lurker(10) [OLD] 0.8 [NEW] 1.3 lynx(15) [OLD] 2.8.5rel.1 [NEW] 2.8.6dev.13 lyx(12) [OLD] 1.3.5 [NEW] 1.3.6 @@ -406,18 +437,19 @@ manedit(9) [OLD] 0.5.12 [NEW] 0.6.1 mangoquest(9) [OLD] 0.6.3a [NEW] 0.6.4 mantis(14) [OLD] 0.19.2 [NEW] 1.0.0rc1 -mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.8 +mathomatic(9) [OLD] 12.4.6 [NEW] 12.4.9 +md5deep(9) [OLD] 1.7 [NEW] 1.8 mdbtools(14) [OLD] 0.5 [NEW] 0.6pre1 mdns-scan(10) [OLD] 0.1 [NEW] 0.4 mecab(12) [OLD] 0.80 [NEW] 0.82pre2 mediawiki(16) [OLD] 1.4.7 [NEW] [1.5beta4] +mercurial(9) [OLD] 0.6b [NEW] 0.6c messagewall(9) [OLD] 1.0.8 [NEW] 1.1.0 [DEAD URL] metabar(9) [OLD] 0.7 [NEW] 0.8 metakit(9) [OLD] 2.4.9.3 [NEW] 2.4.9.4 mftrace(9) [OLD] 1.1.10 [NEW] 1.1.16 min12xxw(9) [OLD] 0.0.7 [NEW] 0.0.8 mixmaster(9) [OLD] 2.9.0 [NEW] 3.0b2 -mldonkey(38) [OLD] 2.6.1 [NEW] 2.6.2 mlkit(9) [OLD] 4.1.1 [NEW] 4.1.4 mlton(12) [OLD] 20021122 [NEW] 20030625 mm3d(13) [OLD] 1.1.6 [NEW] 1.1.8 @@ -425,41 +457,37 @@ moinmoin(12) [OLD] 1.3.4 [NEW] 1.3.5 molden(9) [OLD] 4.3 [NEW] 4.4 monopd(9) [OLD] 0.9.2 [NEW] 0.9.3 -monotone(13) [OLD] 0.21 [NEW] 0.22 -motion(15) [OLD] 3.1.19 [NEW] 3.2.2 +motion(15) [OLD] 3.1.19 [NEW] 3.2.3 mp1e(13) [OLD] 1.9.4 [NEW] 1.9.7cvs mpich(9) [OLD] 1.2.6 [NEW] 1.2.7 mpich2(9) [OLD] 0.97 [NEW] 1.0.2p1 mrouted(9) [OLD] 3.9beta3+IOS12 [NEW] -mrtg(19) [OLD] 2.12.1 [NEW] 2.12.2 mrxvt(10) [OLD] 0.3.13 [NEW] 0.4.1 -msmtp(9) [OLD] 1.4.3 [NEW] 1.4.4 msyslog(9) [OLD] 1.09c [NEW] 1.09d -mtd(9) [OLD] 20050624 [NEW] 20050815 +mt-st(16) [OLD] 0.9 [NEW] 0.9b +mtd(9) [OLD] 20050624 [NEW] 20050825 multipath-tools(10) [OLD] 0.3.3 [NEW] 0.4.4 muse(20) [OLD] 0.7.1 [NEW] 0.7.2pre2 mutt-nntp(22) [OLD] 1.4 [NEW] 1.4.2.1 muttprint(9) [OLD] 0.72c [NEW] 0.72d -mysql(30) [OLD] 4.1.13 [NEW] 4.1.13a -mysql-ruby(11) [OLD] 2.6 [NEW] 2.6.3 [2.7-beta2] +mysql-ruby(11) [OLD] 2.6 [NEW] 2.7 mysqlBind(9) [OLD] 1.8 [NEW] 1.92RC mywebftp(9) [OLD] 0.2 [NEW] 03rc3 nagios-plugins(12) [OLD] 1.4 [NEW] 1.4.1 nam(9) [OLD] 1.10 [NEW] 1.11 nautilus-cd-burner(13) [OLD] 2.10.1 [NEW] 2.10.2 -neon(13) [OLD] 0.24.7 [NEW] 0.25.2 +ndiswrapper(20) [OLD] 1.2 [NEW] 1.3rc1 netdude(9) [OLD] 0.3.3 [NEW] 0.4.6 netpbm(18) [OLD] 10.28 [NEW] 10.29 neveredit(9) [OLD] 0.7b2 [NEW] 0.8b1 +nginx(13) [OLD] 0.1.41 [NEW] 0.1.42 njamd(9) [OLD] 0.8.1 [NEW] 0.9.3pre2 nmap(19) [OLD] 3.81 [NEW] 3.84ALPHA1 nocc(9) [OLD] 0.9.6 [NEW] 0.9.7 noffle(9) [OLD] 1.0.1 [NEW] 1.2.0rc1 ns(12) [OLD] 2.27 [NEW] 2.28 nsd(10) [OLD] 2.2.1 [NEW] 2.3.0 -nss_mdns(9) [OLD] 0.3 [NEW] 0.5 nte(9) [OLD] 1.7.0 [NEW] 2.4 -nusoap(10) [OLD] 0.7.0 [NEW] 0.7.2 nut(13) [OLD] 2.0.1 [NEW] 2.0.2 oajabber(12) [OLD] 20040913 [NEW] [current] obexftp(9) [OLD] 0.10.3 [NEW] 0.10.6 @@ -468,15 +496,13 @@ ocaml-dbi(10) [OLD] 0.9.10 [NEW] 0.9.11 ocaml-equeue(11) [OLD] 1.2.3 [NEW] 2.1 ocaml-extlib(10) [OLD] 1.3 [NEW] 1.4 -ocaml-findlib(12) [OLD] 0.8.1 [NEW] 1.0.4 ocaml-gdome2-xslt(10) [OLD] 0.0.1 [NEW] 0.0.6 ocaml-lablgtk2(16) [OLD] 2.2.0 [NEW] 2.4.0 ocaml-net(9) [OLD] 0.95 [NEW] 1.1 ocaml-netclient(11) [OLD] 0.90.1 [NEW] 0.91.1 -ocaml-pcre(10) [OLD] 5.09.0 [NEW] 5.10.0 ocaml-postgres(12) [OLD] 20020409 [NEW] 20040120 -ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1 -ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1 +ocaml-wdialog(10) [OLD] 2.00 [NEW] 2.1.1 +ocaml-wdialog(12) [OLD] 2.00 [NEW] 2.1.1 ocaml-wlex(12) [OLD] 20030827 [NEW] 20040827 octave(27) [OLD] 2.1.71 [NEW] [bleeding-edge/2.9.3] octave-forge(9) [OLD] 2004.09.09 [NEW] 2005.06.13 @@ -484,16 +510,18 @@ openaether-utils(12) [OLD] 20040713 [NEW] [current] openct(9) [OLD] 0.6.4 [NEW] 0.6.5 openhpi(9) [OLD] 2.1.1 [NEW] 2.1.2 +openldap(26) [OLD] 2.3.5 [NEW] 2.3.6 opennap(9) [OLD] 0.43 [NEW] 0.44 -openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050816 +openoffice-dict-pl-alt(9) [OLD] 20050618 [NEW] 20050826 openoffice-thesaurus-es(11) [OLD] 050128 [NEW] 050720 opensched(9) [OLD] 0.3.8 [NEW] 0.4.4 -openswan(11) [OLD] 2.3.1 [NEW] 2.4.0dr10 +openswan(11) [OLD] 2.3.1 [NEW] 2.4.0rc4 openvrml(13) [OLD] 0.15.9 [NEW] 0.15.10 -otrs(19) [OLD] 1.3.2 [NEW] 2.0.1 +ortp(11) [OLD] 0.7.0 [NEW] 0.7.1 +otrs(19) [OLD] 1.3.2 [NEW] 2.0.2 pam-pam_encfs(10) [OLD] 0.1 [NEW] 0.1.1 +pam-pam_ldap(15) [OLD] 178 [NEW] 180 pam-pam_mktemp(10) [OLD] 0.2.5 [NEW] 1.0.1 -pam-pam_mysql(12) [OLD] 0.5 [NEW] 0.6.0 parrot(10) [OLD] 0.2.0 [NEW] 0.2.3 partimage(11) [OLD] 0.6.5_beta2 [NEW] [0.7.2 - older than 0.6.5!] partysip(11) [OLD] 0.6.0 [NEW] 2.2.3 @@ -502,7 +530,7 @@ pbbuttonsd(14) [OLD] 0.6.10 [NEW] 0.7.1 pcb(10) [OLD] 20050315 [NEW] 20050609 pchar(9) [OLD] 1.4 [NEW] 1.5 -pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre1 +pdnsd(10) [OLD] 1.2.3 [NEW] 1.2.4pre3 pdp++(9) [OLD] 2.01 [NEW] 3.2a05 perl(60) [OLD] 5.8.7 [NEW] [5.9.2 DEVEL] perl-AcePerl(12) [OLD] 1.87 [NEW] 1.89 @@ -516,6 +544,7 @@ perl-Apache-Session-Wrapper(17) [OLD] 0.17 [NEW] 0.25 perl-Apache-Test(17) [OLD] 1.19 [NEW] 1.26 perl-Apache-VMonitor(17) [OLD] 2.01 [NEW] 2.05 +perl-Archive-Tar(31) [OLD] 1.24 [NEW] 1.26 perl-Archive-Zip(17) [OLD] 1.14 [NEW] 1.16 perl-Array-Compare(17) [OLD] 1.11 [NEW] 1.12 perl-Attribute-Persistent(16) [OLD] 1.0 [NEW] 1.1 @@ -525,8 +554,10 @@ perl-CGI-Application(16) [OLD] 4.01 [NEW] 4.03 perl-Cache-Simple-TimedExpiry(17) [OLD] 0.22 [NEW] 0.23 perl-Callback(14) [OLD] 1.05 [NEW] 1.06 -perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.18 +perl-Class-Autouse(17) [OLD] 1.17 [NEW] 1.20 +perl-Class-DBI-SQLite(17) [OLD] 0.09 [NEW] 0.10 perl-Class-ReturnValue(17) [OLD] 0.52 [NEW] 0.53 +perl-Class-Trigger(17) [OLD] 0.09 [NEW] 0.10 perl-Config-Auto(17) [OLD] 0.11 [NEW] 0.14 perl-Config-General(17) [OLD] 2.27 [NEW] 2.29 perl-Config-Simple(17) [OLD] 4.57 [NEW] 4.58 @@ -552,6 +583,7 @@ perl-Data-Library(17) [OLD] 0.1 [NEW] 0.2 perl-Data-Serializer(17) [OLD] 0.28 [NEW] 0.29 perl-DateTime(16) [OLD] 0.28 [NEW] 0.2901 +perl-DateTime-TimeZone(18) [OLD] 0.36 [NEW] 0.37 perl-Devel-Size(16) [OLD] 0.59 [NEW] 0.63 perl-Devel-Size-Report(17) [OLD] 0.07 [NEW] 0.10 perl-Device-Modem(17) [OLD] 1.43 [NEW] 1.44 @@ -572,13 +604,14 @@ perl-Getopt-ArgvFile(16) [OLD] 1.09 [NEW] 1.10 perl-Glib(15) [OLD] 1.081 [NEW] 1.093 perl-Gnome2-GConf(15) [OLD] 1.000 [NEW] 1.013 +perl-Gnome2-Print(15) [OLD] 0.94 [NEW] 0.951 perl-Gnome2-VFS(15) [OLD] 1.003 [NEW] 1.031 perl-Graph(15) [OLD] 0.20105 [NEW] 0.67 perl-GraphViz(16) [OLD] 2.01 [NEW] 2.02 <> ---- CVS-web: http://cvs.pld-linux.org/PLD-doc/PLD-update-TODO?r1=1.248&r2=1.249&f=u From megabajt at pld-linux.org Sat Aug 27 14:00:43 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: ogle.spec - BR: sed >= 4.0, sorted BR In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:00:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: sed >= 4.0, sorted BR ---- Files affected: SPECS: ogle.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/ogle.spec diff -u SPECS/ogle.spec:1.39 SPECS/ogle.spec:1.40 --- SPECS/ogle.spec:1.39 Sat Sep 11 22:01:54 2004 +++ SPECS/ogle.spec Sat Aug 27 14:00:36 2005 @@ -6,9 +6,9 @@ Release: 3 License: GPL Group: X11/Applications/Multimedia -URL: http://www.dtek.chalmers.se/~dvd/ Source0: http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz # Source0-md5: a76a9892bdb807a4bcf859d15a91f0f9 +URL: http://www.dtek.chalmers.se/~dvd/ BuildRequires: XFree86-devel BuildRequires: a52dec-libs-devel >= 0.7.3 BuildRequires: autoconf @@ -16,9 +16,10 @@ BuildRequires: libdvdcss-devel >= 1.2.2 BuildRequires: libdvdread-devel >= 0.9.4 BuildRequires: libjpeg-devel -BuildRequires: libxml2-devel >= 2.4.5 -BuildRequires: libtool BuildRequires: libmad-devel +BuildRequires: libtool +BuildRequires: libxml2-devel >= 2.4.5 +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -108,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/27 12:00:36 megabajt +- BR: sed >= 4.0, sorted BR + Revision 1.39 2004/09/11 20:01:54 adamg - slightly better approach, but still not perfect ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ogle.spec?r1=1.39&r2=1.40&f=u From arekm at pld-linux.org Sat Aug 27 14:31:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: BitTorrent.spec - up to 4.1.4 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 12:31:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 4.1.4 ---- Files affected: SPECS: BitTorrent.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/BitTorrent.spec diff -u SPECS/BitTorrent.spec:1.41 SPECS/BitTorrent.spec:1.42 --- SPECS/BitTorrent.spec:1.41 Sun Jul 31 08:39:53 2005 +++ SPECS/BitTorrent.spec Sat Aug 27 14:31:53 2005 @@ -2,12 +2,12 @@ Summary: BitTorrent - a tool for distributing files Summary(pl): BitTorrent - narz?dzie do rozpowszechniania plik?w Name: BitTorrent -Version: 4.1.3 +Version: 4.1.4 Release: 1 License: BitTorrent Open Source License Group: Applications/Communications Source0: http://www.bittorrent.com/dl/%{name}-%{version}.tar.gz -# Source0-md5: cd4dff145b5dea3789fa384bb94a4de9 +# Source0-md5: 1d0f85eb5cd4ac219853e2e6709f5847 Patch0: %{name}-man_pages.patch URL: http://www.bittorrent.com/ BuildRequires: python-devel @@ -64,27 +64,30 @@ find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name "*.py" | xargs rm install debian/* $RPM_BUILD_ROOT%{_mandir}/man1 +%find_lang bittorrent + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f bittorrent.lang %defattr(644,root,root,755) %doc LICENSE.txt README.txt credits.txt -%attr(755,root,root) %{_bindir}/btdownloadcurses.py -%attr(755,root,root) %{_bindir}/btdownloadheadless.py -%attr(755,root,root) %{_bindir}/btlaunchmany*.py -%attr(755,root,root) %{_bindir}/btmaketorrent.py -%attr(755,root,root) %{_bindir}/btr*.py -%attr(755,root,root) %{_bindir}/btt*.py -%attr(755,root,root) %{_bindir}/btshowmetainfo.py +%attr(755,root,root) %{_bindir}/bittorrent-console +%attr(755,root,root) %{_bindir}/bittorrent-curses +%attr(755,root,root) %{_bindir}/bittorrent-tracker +%attr(755,root,root) %{_bindir}/changetracker-console +%attr(755,root,root) %{_bindir}/launchmany-console +%attr(755,root,root) %{_bindir}/launchmany-curses +%attr(755,root,root) %{_bindir}/maketorrent-console +%attr(755,root,root) %{_bindir}/torrentinfo-console %{py_sitescriptdir}/BitTorrent %{py_sitescriptdir}/khashmir %{_mandir}/man1/* %files gui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/btdownloadgui.py -%attr(755,root,root) %{_bindir}/btmaketorrentgui.py +%attr(755,root,root) %{_bindir}/bittorrent +%attr(755,root,root) %{_bindir}/maketorrent %{_pixmapsdir}/BitTorrent-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -93,6 +96,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 12:31:53 arekm +- up to 4.1.4 + Revision 1.41 2005/07/31 06:39:53 kosmo - updated to 4.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/BitTorrent.spec?r1=1.41&r2=1.42&f=u From arekm at pld-linux.org Sat Aug 27 14:32:08 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: BitTorrent-4.1.4.tar.gz Message-ID: <7981.1125145927@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.bittorrent.com/dl/BitTorrent-4.1.4.tar.gz 1d0f85eb5cd4ac219853e2e6709f5847 BitTorrent-4.1.4.tar.gz Size: 2016856 bytes -- Virtually Yours: distfiles. From megabajt at pld-linux.org Sat Aug 27 14:36:53 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: vde.spec - BR: autoconf, automake, libtool In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 12:36:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: autoconf, automake, libtool ---- Files affected: SPECS: vde.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/vde.spec diff -u SPECS/vde.spec:1.8 SPECS/vde.spec:1.9 --- SPECS/vde.spec:1.8 Fri Jun 24 15:38:57 2005 +++ SPECS/vde.spec Sat Aug 27 14:36:47 2005 @@ -10,6 +10,9 @@ # Source0-md5: 13337f2317a51a8c441503a0b0c908ac Patch0: %{name}-DESTDIR.patch URL: http://sourceforge.net/projects/vde/ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +61,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/27 12:36:47 megabajt +- BR: autoconf, automake, libtool + Revision 1.8 2005/06/24 13:38:57 ankry - pl capitalization is pointless here: unless we do s/vde/wre/g ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vde.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: scintilla166.tgz Message-ID: <5422.1125149759@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scintilla166.tgz 10a60fffbeae8408a76bb79ac7b61500 scintilla166.tgz Size: 593866 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 15:35:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: scintilla.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scintilla.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/scintilla.spec diff -u SPECS/scintilla.spec:1.16 SPECS/scintilla.spec:1.17 --- SPECS/scintilla.spec:1.16 Sat Jun 18 17:25:10 2005 +++ SPECS/scintilla.spec Sat Aug 27 15:35:50 2005 @@ -6,13 +6,13 @@ Summary: Free source code editing component for GTK+ and Win32 Summary(pl): Wolnodost?pna kontrolka edycyjna dla GTK+ i Win32 Name: scintilla -Version: 1.63 +Version: 1.66 %define fver %(echo %{version} | tr -d .) Release: 1 License: BSD-like Group: Libraries Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz -# Source0-md5: 9122e70a41181f0b2e54e19f8236c68b +# Source0-md5: 10a60fffbeae8408a76bb79ac7b61500 Patch0: %{name}-make.patch URL: http://scintilla.org/ %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} @@ -124,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 13:35:50 arekm +- up to 1.66 + Revision 1.16 2005/06/18 15:25:10 zbyniu - BR: libtool, pkgconfig ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scintilla.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 15:35:59 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SOURCES: scintilla-make.patch - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:35:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SOURCES: scintilla-make.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/scintilla-make.patch diff -u SOURCES/scintilla-make.patch:1.7 SOURCES/scintilla-make.patch:1.8 --- SOURCES/scintilla-make.patch:1.7 Tue Apr 5 17:59:41 2005 +++ SOURCES/scintilla-make.patch Sat Aug 27 15:35:53 2005 @@ -1,6 +1,6 @@ -diff -urN scintilla.org/gtk/makefile scintilla/gtk/makefile ---- scintilla.org/gtk/makefile 2005-04-01 02:54:34.000000000 +0200 -+++ scintilla/gtk/makefile 2005-04-05 17:53:51.782783120 +0200 +diff -urNbB scintilla.org/gtk/makefile scintilla/gtk/makefile +--- scintilla.org/gtk/makefile 2005-05-27 13:29:44.000000000 +0200 ++++ scintilla/gtk/makefile 2005-08-27 15:34:00.961960088 +0200 @@ -7,7 +7,7 @@ # To force GTK+ 2 build, define GTK2 on the make command line. # To force GTK+ 1 build, define GTK1 on the make command line. @@ -57,33 +57,33 @@ + libtool --tag=CXX --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< +.c.lo: + libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< -+ ++ #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ -LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ --LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexForth.o LexFortran.o \ --LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o \ --LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ --LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o LexPython.o \ --LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o \ --LexVHDL.o LexYAML.o +-LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ +-LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ +-LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ +-LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ +-LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ +-LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o +LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo \ +LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo \ -+LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexForth.lo LexFortran.lo \ -+LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo LexLout.lo LexLua.lo \ -+LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo LexNsis.lo \ -+LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo LexPython.lo \ -+LexRuby.lo LexScriptol.lo LexSpecman.lo LexSQL.lo LexTeX.lo LexVB.lo LexVerilog.lo \ -+LexVHDL.lo LexYAML.lo ++LexCsound.lo LexCSS.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo \ ++LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexKix.lo LexLisp.lo \ ++LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo \ ++LexNsis.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPOV.lo LexPS.lo \ ++LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo LexSpecman.lo \ ++LexSQL.lo LexTADS3.lo LexTeX.lo LexVB.lo LexVerilog.lo LexVHDL.lo LexYAML.lo #--Autogenerated -- end of automatically generated section all: $(COMPLIB) clean: - rm -f *.o $(COMPLIB) -+ rm -f *.lo $(COMPLIB) ++ rm -f *.o *.lo $(COMPLIB) deps: $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/scintilla-make.patch?r1=1.7&r2=1.8&f=u From arekm at pld-linux.org Sat Aug 27 15:38:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: scite.spec - up to 1.66 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:38:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.66 ---- Files affected: SPECS: scite.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.11 SPECS/scite.spec:1.12 --- SPECS/scite.spec:1.11 Tue Apr 5 18:05:59 2005 +++ SPECS/scite.spec Sat Aug 27 15:38:30 2005 @@ -6,12 +6,12 @@ Summary: SciTE - a programmers text editor Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite -Version: 1.63 +Version: 1.66 Release: 1 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz -# Source0-md5: e92bd082788759f2a3ee629d1688cdb8 +# Source0-md5: 62ce813c59e2d0206e875549dd300ee2 Patch0: %{name}-make.patch Patch1: %{name}-desktop.patch URL: http://scintilla.org/SciTE.html @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/27 13:38:30 arekm +- up to 1.66 + Revision 1.11 2005/04/05 16:05:59 arekm - up to 1.63 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sat Aug 27 15:38:38 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: scite166.tgz Message-ID: <9819.1125149918@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/scintilla/scite166.tgz 62ce813c59e2d0206e875549dd300ee2 scite166.tgz Size: 1259178 bytes -- Virtually Yours: distfiles. From dzeus at pld-linux.org Sat Aug 27 15:58:50 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: sylpheed.spec - up to 2.0.1 In-Reply-To: References: Message-ID: Author: dzeus Date: Sat Aug 27 13:58:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.0.1 ---- Files affected: SPECS: sylpheed.spec (1.167 -> 1.168) ---- Diffs: ================================================================ Index: SPECS/sylpheed.spec diff -u SPECS/sylpheed.spec:1.167 SPECS/sylpheed.spec:1.168 --- SPECS/sylpheed.spec:1.167 Fri Jul 29 00:11:33 2005 +++ SPECS/sylpheed.spec Sat Aug 27 15:58:43 2005 @@ -12,12 +12,12 @@ Summary(pl): Szybki klient poczty bazuj?cy na GTK+ Summary(pt_BR): Um r?pido e leve cliente de email baseado em GTK+ Name: sylpheed -Version: 2.0.0 +Version: 2.0.1 Release: 1 License: GPL v2+ Group: X11/Applications/Networking Source0: http://sylpheed.good-day.net/sylpheed/v2.0/%{name}-%{version}.tar.bz2 -# Source0-md5: a7754f8820814089229b1ab5f0e4d855 +# Source0-md5: 7e8c8fdd427935349c4a57cf33fdf68a Patch0: %{name}-desktop.patch Patch1: %{name}-nolibs.patch BuildRequires: autoconf >= 2.50 @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.168 2005/08/27 13:58:43 dzeus +- up to 2.0.1 + Revision 1.167 2005/07/28 22:11:33 freetz - 2.0.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.167&r2=1.168&f=u From arekm at pld-linux.org Sat Aug 27 15:59:05 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: icecast.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 13:59:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: icecast.spec (1.62 -> 1.63) ---- Diffs: ================================================================ Index: SPECS/icecast.spec diff -u SPECS/icecast.spec:1.62 SPECS/icecast.spec:1.63 --- SPECS/icecast.spec:1.62 Sun May 1 19:31:30 2005 +++ SPECS/icecast.spec Sat Aug 27 15:59:00 2005 @@ -7,7 +7,7 @@ Summary(pt_BR): Um servidor de streams MP3, Ogg Name: icecast Version: 2.2.0 -Release: 1 +Release: 2 Epoch: 2 License: GPL Group: Networking/Daemons @@ -133,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.63 2005/08/27 13:59:00 arekm +- rel 2 + Revision 1.62 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/icecast.spec?r1=1.62&r2=1.63&f=u From dzeus at pld-linux.org Sat Aug 27 15:59:12 2005 From: dzeus at pld-linux.org (dzeus) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: sylpheed-2.0.1.tar.bz2 Message-ID: <9514.1125151152@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sylpheed.good-day.net/sylpheed/v2.0/sylpheed-2.0.1.tar.bz2 7e8c8fdd427935349c4a57cf33fdf68a sylpheed-2.0.1.tar.bz2 Size: 2323171 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 16:09:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: scite.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:09:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: scite.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/scite.spec diff -u SPECS/scite.spec:1.12 SPECS/scite.spec:1.13 --- SPECS/scite.spec:1.12 Sat Aug 27 15:38:30 2005 +++ SPECS/scite.spec Sat Aug 27 16:09:41 2005 @@ -7,7 +7,7 @@ Summary(pl): SciTE - edytor tekstu dla programist?w Name: scite Version: 1.66 -Release: 1 +Release: 2 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz @@ -17,7 +17,7 @@ URL: http://scintilla.org/SciTE.html %{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} %{!?with_gtk1:BuildRequires: gtk+2-devel >= 1:2.0.0} -BuildRequires: scintilla-devel >= 1.63 +BuildRequires: scintilla-devel >= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 14:09:41 arekm +- rel 2 + Revision 1.12 2005/08/27 13:38:30 arekm - up to 1.66 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/scite.spec?r1=1.12&r2=1.13&f=u From arekm at pld-linux.org Sat Aug 27 16:20:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: perl-Apache-Reload.spec - rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:20:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 ---- Files affected: SPECS: perl-Apache-Reload.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/perl-Apache-Reload.spec diff -u SPECS/perl-Apache-Reload.spec:1.7 SPECS/perl-Apache-Reload.spec:1.8 --- SPECS/perl-Apache-Reload.spec:1.7 Wed Nov 3 20:36:55 2004 +++ SPECS/perl-Apache-Reload.spec Sat Aug 27 16:20:39 2005 @@ -6,7 +6,7 @@ Summary(pl): Prze?adowywanie zmodyfikowanych w trakcie pracy Apache'a modu??w Name: perl-Apache-Reload Version: 0.07 -Release: 1 +Release: 2 License: unknown Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz @@ -75,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 14:20:39 arekm +- rel 2 + Revision 1.7 2004/11/03 19:36:55 paladine - formatting ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl-Apache-Reload.spec?r1=1.7&r2=1.8&f=u From paladine at pld-linux.org Sat Aug 27 16:23:56 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:39 2005 Subject: SOURCES: evince-disable_dbus.patch (REMOVED) - evince finally work... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:23:56 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - evince finally works fine with dbus ---- Files affected: SOURCES: evince-disable_dbus.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From paladine at pld-linux.org Sat Aug 27 16:24:21 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: evince.spec - removed disable_dbus patch - works for me, re... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:24:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed disable_dbus patch - works for me, rel. 1 ---- Files affected: SPECS: evince.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.29 SPECS/evince.spec:1.30 --- SPECS/evince.spec:1.29 Sat Aug 27 00:57:44 2005 +++ SPECS/evince.spec Sat Aug 27 16:24:16 2005 @@ -6,19 +6,17 @@ Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 0.9 +Release: 1 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 # Source0-md5: cc41e30108bc54a345bd6ca2556ab857 Patch0: %{name}-desktop.patch Patch1: %{name}-gs8.patch -#Patch2: %{name}-disable_dbus.patch URL: http://www.gnome.org/projects/evince/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -# NOTE: disabled until less broken release BuildRequires: dbus-glib-devel >= 0.36 BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript @@ -72,7 +70,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 %build gnome-doc-prepare --copy --force @@ -145,6 +142,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.30 2005/08/27 14:24:16 paladine +- removed disable_dbus patch +- works for me, rel. 1 + Revision 1.29 2005/08/26 22:57:44 aflinta - 0.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.29&r2=1.30&f=u From paladine at pld-linux.org Sat Aug 27 16:25:26 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: xchm-1.1.tar.gz Message-ID: <15891.1125152726@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/xchm/xchm-1.1.tar.gz 801ce6a079e559bc5b7d814e86861500 xchm-1.1.tar.gz Size: 331622 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 16:25:28 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xchm.spec - updated to 1.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 14:25:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.1 ---- Files affected: SPECS: xchm.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.36 SPECS/xchm.spec:1.37 --- SPECS/xchm.spec:1.36 Mon Jun 6 18:22:28 2005 +++ SPECS/xchm.spec Sat Aug 27 16:25:23 2005 @@ -2,12 +2,12 @@ Summary: CHM viewer for UNIX Summary(pl): Przegl?darka CHM dla Uniks?w Name: xchm -Version: 1.0 +Version: 1.1 Release: 1 License: GPL Group: Applications/File Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz -# Source0-md5: 808e87a2a00683b5142e9f74398a20b4 +# Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop URL: http://xchm.sourceforge.net/ BuildRequires: autoconf @@ -36,7 +36,6 @@ %{__automake} %configure \ WX_CONFIG_NAME=/usr/bin/wx-gtk2-ansi-config - %{__make} %install @@ -68,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/27 14:25:23 paladine +- updated to 1.1 + Revision 1.36 2005/06/06 16:22:28 koorek - updated to 1.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.36&r2=1.37&f=u From areq at pld-linux.org Sat Aug 27 16:26:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: chan_capi-cm-0.5.4.tar.gz Message-ID: <17655.1125152805@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/chan-capi/chan_capi-cm-0.5.4.tar.gz a7a9c0f90395909ee06528f17fc608d2 chan_capi-cm-0.5.4.tar.gz Size: 47714 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 16:26:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: asterisk-chan_capi.spec (NEW) - init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:26:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - init PLD spec ---- Files affected: SPECS: asterisk-chan_capi.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u /dev/null SPECS/asterisk-chan_capi.spec:1.1 --- /dev/null Sat Aug 27 16:26:48 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 16:26:43 2005 @@ -0,0 +1,51 @@ +# $Revision$, $Date$ +Summary: Asterisk ISDN CAPI channel driver +Name: asterisk-chan_capi +Version: 0.5.4 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz +# Source0-md5: a7a9c0f90395909ee06528f17fc608d2 +URL: http://sourceforge.net/projects/chan-capi +BuildRequires: asterisk-devel +BuildRequires: capi-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP +Platform. + +%prep +%setup -q -n chan_capi-%{version} + +%build +%{__make} \ + CC="%{__cc}" \ + DEBUG="" + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/usr/lib/asterisk/modules + +%{__make} install \ + INSTALL_PREFIX=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README capi.conf +/usr/lib/asterisk/modules/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 14:26:43 areq +- init PLD spec + + ================================================================ From arekm at pld-linux.org Sat Aug 27 16:37:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: openssl.spec - rel 3 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 14:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 3 ---- Files affected: SPECS: openssl.spec (1.140 -> 1.141) ---- Diffs: ================================================================ Index: SPECS/openssl.spec diff -u SPECS/openssl.spec:1.140 SPECS/openssl.spec:1.141 --- SPECS/openssl.spec:1.140 Sun Jul 24 18:36:14 2005 +++ SPECS/openssl.spec Sat Aug 27 16:37:04 2005 @@ -10,7 +10,7 @@ Summary(uk): ?????????? ?? ??????? ??? ?'?????? ????? Secure Sockets Layer Name: openssl Version: 0.9.7g -Release: 2 +Release: 3 License: Apache-style License Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz @@ -432,6 +432,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.141 2005/08/27 14:37:04 arekm +- rel 3 + Revision 1.140 2005/07/24 16:36:14 qboosh - fix libdir in *.pc, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.140&r2=1.141&f=u From areq at pld-linux.org Sat Aug 27 16:44:25 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS (GCC4): gcc.spec - Release 0.3 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 14:44:25 2005 GMT Module: SPECS Tag: GCC4 ---- Log message: - Release 0.3 ---- Files affected: SPECS: gcc.spec (1.308.2.1 -> 1.308.2.2) ---- Diffs: ================================================================ Index: SPECS/gcc.spec diff -u SPECS/gcc.spec:1.308.2.1 SPECS/gcc.spec:1.308.2.2 --- SPECS/gcc.spec:1.308.2.1 Thu Aug 25 12:47:16 2005 +++ SPECS/gcc.spec Sat Aug 27 16:44:19 2005 @@ -25,7 +25,7 @@ Summary(pt_BR): Cole??o dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: 4.0.1 -Release: 0.1 +Release: 0.3 Epoch: 5 License: GPL v2+ Group: Development/Languages @@ -1188,6 +1188,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.308.2.2 2005/08/27 14:44:19 areq +- Release 0.3 + Revision 1.308.2.1 2005/08/25 10:47:16 trojan - updated to 4.0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.308.2.1&r2=1.308.2.2&f=u From paszczus at pld-linux.org Sat Aug 27 17:01:53 2005 From: paszczus at pld-linux.org (paszczus) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS (LINUX_2_6_11): iptables.spec - uncommented rm -f geoip (now... In-Reply-To: References: Message-ID: Author: paszczus Date: Sat Aug 27 15:01:53 2005 GMT Module: SPECS Tag: LINUX_2_6_11 ---- Log message: - uncommented rm -f geoip (now builds) ---- Files affected: SPECS: iptables.spec (1.153.2.16 -> 1.153.2.17) ---- Diffs: ================================================================ Index: SPECS/iptables.spec diff -u SPECS/iptables.spec:1.153.2.16 SPECS/iptables.spec:1.153.2.17 --- SPECS/iptables.spec:1.153.2.16 Sun May 22 04:39:08 2005 +++ SPECS/iptables.spec Sat Aug 27 17:01:47 2005 @@ -136,7 +136,7 @@ %patch7 -p1 # removed broken ... -#rm -f extensions/.{set,quota,geoip}-test +rm -f extensions/.{set,quota,geoip}-test #rm -f extensions/.quota-test chmod 755 extensions/.*-test* @@ -219,6 +219,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.153.2.17 2005/08/27 15:01:47 paszczus +- uncommented rm -f geoip (now builds) + Revision 1.153.2.16 2005/05/22 02:39:08 averne - reverted ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iptables.spec?r1=1.153.2.16&r2=1.153.2.17&f=u From qboosh at pld-linux.org Sat Aug 27 17:05:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-util-util-macros.spec - existing Group, cleanup In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:05:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - existing Group, cleanup ---- Files affected: SPECS: xorg-util-util-macros.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.1 SPECS/xorg-util-util-macros.spec:1.2 --- SPECS/xorg-util-util-macros.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:05:06 2005 @@ -1,14 +1,11 @@ # $Revision$, $Date$ -# $Rev: 3222 $, $Date$ -# Summary: Autoconf macros for xorg Summary(pl): Makra autoconfa dla xorg Name: xorg-util-util-macros Version: 0.99.0 Release: 0.01 License: MIT -Group: X11/Development -###### Unknown group! +Group: X11/Development/Tools Source0: http://xorg.freedesktop.org/X11R7.0-RC0/util/util-macros-%{version}.tar.bz2 # Source0-md5: 5647ac7ca141725cae6c7fc73fd76dbd URL: http://xorg.freedesktop.org/ @@ -21,12 +18,11 @@ Autoconf macros for xorg. %description -l pl -Makra autoconfa dla xorg +Makra autoconfa dla xorg. %prep %setup -q -n util-macros-%{version} - %build %{__aclocal} %{__autoconf} @@ -35,29 +31,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_aclocaldir}/xorgversion.m4 - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:05:06 qboosh +- existing Group, cleanup + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.1&r2=1.2&f=u From aredridel at pld-linux.org Sat Aug 27 17:08:02 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: ndisc6-0.1.5.tar.bz2 Message-ID: <15044.1125155282@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.via.ecp.fr/~rem/ndisc6/v0.1/ndisc6-0.1.5.tar.bz2 349de20ade093e2e4017a1ad1009b6b2 ndisc6-0.1.5.tar.bz2 Size: 14931 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sat Aug 27 17:08:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: ndisc6.spec (NEW) - added In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added ---- Files affected: SPECS: ndisc6.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u /dev/null SPECS/ndisc6.spec:1.1 --- /dev/null Sat Aug 27 17:08:04 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:07:59 2005 @@ -0,0 +1,46 @@ +# $Revision$, $Date$ +# +Summary: Neighbor Discovery tools for IPv6 +Name: ndisc6 +Version: 0.1.5 +Release: 1 +License: GPLv2 +Group: Networking/Admin +Source0: http://people.via.ecp.fr/~rem/ndisc6/v0.1/%{name}-%{version}.tar.bz2 +# Source0-md5: 349de20ade093e2e4017a1ad1009b6b2 +URL: http://people.via.ecp.fr/~rem/ndisc6/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. + +%prep +%setup -q + +%build +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} + +install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README +%attr(755,root,root) %{_sbindir}/* +%{_mandir}/man8/* + +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 15:07:59 aredridel +- added + ================================================================ From aredridel at pld-linux.org Sat Aug 27 17:08:24 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: ndisc6.spec - adapterised In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 15:08:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - adapterised ---- Files affected: SPECS: ndisc6.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.1 SPECS/ndisc6.spec:1.2 --- SPECS/ndisc6.spec:1.1 Sat Aug 27 17:07:59 2005 +++ SPECS/ndisc6.spec Sat Aug 27 17:08:19 2005 @@ -12,7 +12,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -ndisc6 consists of two small command line tools (ndisc6 and rdisc6) that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +ndisc6 consists of two small command line tools (ndisc6 and rdisc6) +that perform ICMPv6 Neighbor Discovery and ICMPv6 Router Discovery +respectively. It is primarily meant for IPv6 networking diagnostics or +to detect rogue IPv6 nodes or routers on an Ethernet segment. %prep %setup -q @@ -36,11 +39,15 @@ %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/* +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 15:08:19 aredridel +- adapterised + Revision 1.1 2005/08/27 15:07:59 aredridel - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 17:45:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-util-util-macros.spec - use just name in BuildRoot In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 15:45:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use just name in BuildRoot ---- Files affected: SPECS: xorg-util-util-macros.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-util-util-macros.spec diff -u SPECS/xorg-util-util-macros.spec:1.2 SPECS/xorg-util-util-macros.spec:1.3 --- SPECS/xorg-util-util-macros.spec:1.2 Sat Aug 27 17:05:06 2005 +++ SPECS/xorg-util-util-macros.spec Sat Aug 27 17:45:25 2005 @@ -12,7 +12,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRoot: %{tmpdir}/util-macros-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Autoconf macros for xorg. @@ -50,6 +50,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 15:45:25 qboosh +- use just name in BuildRoot + Revision 1.2 2005/08/27 15:05:06 qboosh - existing Group, cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-util-util-macros.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 18:12:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 16:12:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.1 -> 1.2) , xorg-proto-compositeproto.spec (1.2 -> 1.3) , xorg-proto-damageproto.spec (1.2 -> 1.3) , xorg-proto-dmxproto.spec (1.1 -> 1.2) , xorg-proto-evieext.spec (1.1 -> 1.2) , xorg-proto-fixesproto.spec (1.2 -> 1.3) , xorg-proto-fontcacheproto.spec (1.1 -> 1.2) , xorg-proto-fontsproto.spec (1.1 -> 1.2) , xorg-proto-glproto.spec (1.1 -> 1.2) , xorg-proto-inputproto.spec (1.1 -> 1.2) , xorg-proto-kbproto.spec (1.1 -> 1.2) , xorg-proto-panoramixproto.spec (1.2 -> 1.3) , xorg-proto-printproto.spec (1.1 -> 1.2) , xorg-proto-randrproto.spec (1.2 -> 1.3) , xorg-proto-recordproto.spec (1.2 -> 1.3) , xorg-proto-renderproto.spec (1.2 -> 1.3) , xorg-proto-resourceproto.spec (1.2 -> 1.3) , xorg-proto-scrnsaverproto.spec (1.1 -> 1.2) , xorg-proto-trapproto.spec (1.1 -> 1.2) , xorg-proto-videoproto.spec (1.1 -> 1.2) , xorg-proto-xcmiscproto.spec (1.1 -> 1.2) , xorg-proto-xextproto.spec (1.2 -> 1.3) , xorg-proto-xf86bigfontproto.spec (1.1 -> 1.2) , xorg-proto-xf86dgaproto.spec (1.1 -> 1.2) , xorg-proto-xf86driproto.spec (1.1 -> 1.2) , xorg-proto-xf86miscproto.spec (1.1 -> 1.2) , xorg-proto-xf86rushproto.spec (1.1 -> 1.2) , xorg-proto-xf86vidmodeproto.spec (1.1 -> 1.2) , xorg-proto-xproto.spec (1.2 -> 1.3) , xorg-proto-xproxymanagementprotocol.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.1 SPECS/xorg-proto-bigreqsproto.spec:1.2 --- SPECS/xorg-proto-bigreqsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3243 $, $Date$ -# Summary: BigReqs protocol and ancillary headers Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Name: xorg-proto-bigreqsproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/bigreqsproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,10 +23,9 @@ %description -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %package devel Summary: BigReqs protocol and ancillary headers -Summary(pl): bigreqsproto +Summary(pl): Nag??wki protoko?u BigReqs i pomocnicze Group: X11/Development/Libraries %description devel @@ -37,11 +34,9 @@ %description devel -l pl Nag??wki protoko?u BigReqs i pomocnicze. - %prep %setup -q -n bigreqsproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -50,7 +45,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -58,23 +52,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/bigreqsproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.2 SPECS/xorg-proto-compositeproto.spec:1.3 --- SPECS/xorg-proto-compositeproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3259 $, $Date$ -# Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze Name: xorg-proto-compositeproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/compositeproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Composite i pomocnicze. - %package devel Summary: Composite protocol and ancillary headers Summary(pl): Nag??wki protoko?u Composite i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Composite i pomocnicze. - %prep %setup -q -n compositeproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/compositeproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.2 SPECS/xorg-proto-damageproto.spec:1.3 --- SPECS/xorg-proto-damageproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3262 $, $Date$ -# Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze Name: xorg-proto-damageproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/damageproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Damage i pomocnicze. - %package devel Summary: Damage protocol and ancillary headers Summary(pl): Nag??wki protoko?u Damage i pomocnicze @@ -39,11 +36,9 @@ %description devel -l pl Nag??wki protoko?u Damage i pomocnicze. - %prep %setup -q -n damageproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -52,7 +47,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -60,23 +54,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/damageproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.1 SPECS/xorg-proto-dmxproto.spec:1.2 --- SPECS/xorg-proto-dmxproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3325 $, $Date$ -# Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze Name: xorg-proto-dmxproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/dmxproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u DMX i pomocnicze. - %package devel Summary: DMX protocol and ancillary headers Summary(pl): Nag??wki protoko?u DMX i pomocnicze. @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u DMX i pomocnicze. - %prep %setup -q -n dmxproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/dmxproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.1 SPECS/xorg-proto-evieext.spec:1.2 --- SPECS/xorg-proto-evieext.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3274 $, $Date$ -# Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze Name: xorg-proto-evieext @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/evieext-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u EvIE i pomocnicze. - %package devel Summary: EvIE protocol and ancillary headers Summary(pl): Nag??wki protoko?u EvIE i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u EvIE i pomocnicze. - %prep %setup -q -n evieext-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/evieproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.2 SPECS/xorg-proto-fixesproto.spec:1.3 --- SPECS/xorg-proto-fixesproto.spec:1.2 Wed Aug 17 22:16:28 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3264 $, $Date$ -# Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze Name: xorg-proto-fixesproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fixesproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fixes i pomocnicze. - %package devel Summary: Fixes protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fixes i pomocnicze @@ -40,11 +37,9 @@ %description devel -l pl Nag??wki protoko?u Fixes i pomocnicze. - %prep %setup -q -n fixesproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -53,7 +48,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -61,23 +55,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fixesproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.2 2005/08/17 20:16:28 qboosh - Obsoletes for old xlibs packages ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.1 SPECS/xorg-proto-fontcacheproto.spec:1.2 --- SPECS/xorg-proto-fontcacheproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3275 $, $Date$ -# Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze Name: xorg-proto-fontcacheproto @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkg-config -BuildRoot: %{tmpdir}/fontcacheproto-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %package devel Summary: Fontcache protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fontcache i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fontcache i pomocnicze. - %prep %setup -q -n fontcacheproto-%{version} - %build %{__aclocal} %{__autoconf} @@ -51,7 +46,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -59,23 +53,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files devel %defattr(644,root,root,755) %{_includedir}/X11/extensions/*.h %{_pkgconfigdir}/fontcacheproto.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 16:12:43 qboosh +- cleanups + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.1 SPECS/xorg-proto-fontsproto.spec:1.2 --- SPECS/xorg-proto-fontsproto.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 18:12:43 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3232 $, $Date$ -# Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze Name: xorg-proto-fontsproto @@ -15,7 +13,7 @@ BuildRequires: automake BuildRequires: pkg-config BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/fontsproto-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,7 +23,6 @@ %description -l pl Nag??wki protoko?u Fonts i pomocnicze. - %package devel Summary: Fonts protocol and ancillary headers Summary(pl): Nag??wki protoko?u Fonts i pomocnicze @@ -38,11 +35,9 @@ %description devel -l pl Nag??wki protoko?u Fonts i pomocnicze. - %prep %setup -q -n fontsproto-%{version} - %build %{__aclocal} <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.1&r2=1.2&f=u From megabajt at pld-linux.org Sat Aug 27 19:29:10 2005 From: megabajt at pld-linux.org (megabajt) Date: Tue Dec 20 10:39:39 2005 Subject: CVSROOT: users - changed email In-Reply-To: References: Message-ID: Author: megabajt Date: Sat Aug 27 17:29:10 2005 GMT Module: CVSROOT Tag: HEAD ---- Log message: - changed email ---- Files affected: CVSROOT: users (1.387 -> 1.388) ---- Diffs: ================================================================ Index: CVSROOT/users diff -u CVSROOT/users:1.387 CVSROOT/users:1.388 --- CVSROOT/users:1.387 Fri Aug 26 16:07:03 2005 +++ CVSROOT/users Sat Aug 27 19:29:05 2005 @@ -148,7 +148,7 @@ matipl:matipl@ds.pg.gda.pl:Mateusz Kami?ski matkor:mateusz@ant.gliwice.pl:Mateusz Korniak matowy:matowy@tlen.pl:Mateusz Murawski -megabajt:mailinggrup@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl +megabajt:megabajt25@o2.pl:Marcin Banasiak:megabajt@jabber.gda.pl mguevara:mguevara@acn.waw.pl:Marek Guevara Braun michuz:michuz@linux.ipartner.com.pl:Micha? Zawalich mick3y:mmmick3y@gmail.com:Jakub Mateusz Mikusek ================================================================ ---- CVS-web: http://cvs.pld-linux.org/CVSROOT/users?r1=1.387&r2=1.388&f=u From wiget at pld-linux.org Sat Aug 27 19:37:45 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-lib-libXfont.spec - freebsd patch not needed on linux In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:37:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - freebsd patch not needed on linux ---- Files affected: SPECS: xorg-lib-libXfont.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.2 SPECS/xorg-lib-libXfont.spec:1.3 --- SPECS/xorg-lib-libXfont.spec:1.2 Wed Aug 17 22:10:46 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 19:37:40 2005 @@ -10,7 +10,6 @@ Group: X11/Libraries Source0: http://xorg.freedesktop.org/X11R7.0-RC0/lib/libXfont-%{version}.tar.bz2 # Source0-md5: 7566ddf06a209656c0e4814d5739e8c1 -Patch0: libXfont-freebsd.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake @@ -80,8 +79,6 @@ %prep %setup -q -n libXfont-%{version} -%patch0 -p1 - %build %{__libtoolize} @@ -138,6 +135,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:37:40 wiget +- freebsd patch not needed on linux + Revision 1.2 2005/08/17 20:10:46 qboosh - Obsoletes for old xlibs or separate packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.2&r2=1.3&f=u From wiget at pld-linux.org Sat Aug 27 19:38:23 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-lib-libfontenc.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-libfontenc.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.1 SPECS/xorg-lib-libfontenc.spec:1.2 --- SPECS/xorg-lib-libfontenc.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:38:15 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xproto-devel %description devel @@ -123,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:15 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:38:53 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-lib-liblbxutil.spec - zlib not libz In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 17:38:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - zlib not libz ---- Files affected: SPECS: xorg-lib-liblbxutil.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.1 SPECS/xorg-lib-liblbxutil.spec:1.2 --- SPECS/xorg-lib-liblbxutil.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:38:48 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: libz-devel +BuildRequires: zlib-devel BuildRequires: pkg-config BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel @@ -34,7 +34,7 @@ Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: libz-devel +Requires: zlib-devel Requires: xorg-proto-xextproto-devel %description devel @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:38:48 wiget +- zlib not libz + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.1&r2=1.2&f=u From wiget at pld-linux.org Sat Aug 27 19:43:06 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 17:43:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - s/pkg-config/pkgconfig/ in BR: ---- Files affected: SPECS: xorg-app-appres.spec (1.1 -> 1.2) , xorg-app-bdftopcf.spec (1.1 -> 1.2) , xorg-app-beforelight.spec (1.1 -> 1.2) , xorg-app-bitmap.spec (1.1 -> 1.2) , xorg-app-editres.spec (1.1 -> 1.2) , xorg-app-fonttosfnt.spec (1.1 -> 1.2) , xorg-app-fslsfonts.spec (1.1 -> 1.2) , xorg-app-fstobdf.spec (1.1 -> 1.2) , xorg-app-iceauth.spec (1.1 -> 1.2) , xorg-app-ico.spec (1.1 -> 1.2) , xorg-app-lbxproxy.spec (1.1 -> 1.2) , xorg-app-listres.spec (1.1 -> 1.2) , xorg-app-luit.spec (1.1 -> 1.2) , xorg-app-mkfontdir.spec (1.1 -> 1.2) , xorg-app-mkfontscale.spec (1.1 -> 1.2) , xorg-app-oclock.spec (1.1 -> 1.2) , xorg-app-pclcomp.spec (1.1 -> 1.2) , xorg-app-proxymngr.spec (1.1 -> 1.2) , xorg-app-rgb.spec (1.1 -> 1.2) , xorg-app-rstart.spec (1.1 -> 1.2) , xorg-app-scripts.spec (1.1 -> 1.2) , xorg-app-setxkbmap.spec (1.1 -> 1.2) , xorg-app-showfont.spec (1.1 -> 1.2) , xorg-app-smproxy.spec (1.1 -> 1.2) , xorg-app-twm.spec (1.1 -> 1.2) , xorg-app-viewres.spec (1.1 -> 1.2) , xorg-app-x11perf.spec (1.1 -> 1.2) , xorg-app-xauth.spec (1.1 -> 1.2) , xorg-app-xbiff.spec (1.1 -> 1.2) , xorg-app-xcalc.spec (1.1 -> 1.2) , xorg-app-xclipboard.spec (1.1 -> 1.2) , xorg-app-xclock.spec (1.1 -> 1.2) , xorg-app-xcmsdb.spec (1.1 -> 1.2) , xorg-app-xconsole.spec (1.1 -> 1.2) , xorg-app-xcursorgen.spec (1.1 -> 1.2) , xorg-app-xdbedizzy.spec (1.1 -> 1.2) , xorg-app-xditview.spec (1.1 -> 1.2) , xorg-app-xdpyinfo.spec (1.1 -> 1.2) , xorg-app-xedit.spec (1.1 -> 1.2) , xorg-app-xev.spec (1.1 -> 1.2) , xorg-app-xeyes.spec (1.1 -> 1.2) , xorg-app-xf86dga.spec (1.1 -> 1.2) , xorg-app-xfd.spec (1.1 -> 1.2) , xorg-app-xfontsel.spec (1.1 -> 1.2) , xorg-app-xfs.spec (1.1 -> 1.2) , xorg-app-xfsinfo.spec (1.1 -> 1.2) , xorg-app-xfwp.spec (1.1 -> 1.2) , xorg-app-xgamma.spec (1.1 -> 1.2) , xorg-app-xgc.spec (1.1 -> 1.2) , xorg-app-xhost.spec (1.1 -> 1.2) , xorg-app-xkbcomp.spec (1.1 -> 1.2) , xorg-app-xkbevd.spec (1.1 -> 1.2) , xorg-app-xkbprint.spec (1.1 -> 1.2) , xorg-app-xkbutils.spec (1.1 -> 1.2) , xorg-app-xkill.spec (1.1 -> 1.2) , xorg-app-xlogo.spec (1.1 -> 1 .2) , xorg-app-xlsatoms.spec (1.1 -> 1.2) , xorg-app-xlsclients.spec (1.1 -> 1.2) , xorg-app-xlsfonts.spec (1.1 -> 1.2) , xorg-app-xmag.spec (1.1 -> 1.2) , xorg-app-xman.spec (1.1 -> 1.2) , xorg-app-xmessage.spec (1.1 -> 1.2) , xorg-app-xmh.spec (1.1 -> 1.2) , xorg-app-xmodmap.spec (1.1 -> 1.2) , xorg-app-xmore.spec (1.1 -> 1.2) , xorg-app-xphelloworld.spec (1.1 -> 1.2) , xorg-app-xplsprinters.spec (1.1 -> 1.2) , xorg-app-xpr.spec (1.1 -> 1.2) , xorg-app-xprehashprinterlist.spec (1.1 -> 1.2) , xorg-app-xprop.spec (1.1 -> 1.2) , xorg-app-xrandr.spec (1.1 -> 1.2) , xorg-app-xrdb.spec (1.1 -> 1.2) , xorg-app-xrefresh.spec (1.1 -> 1.2) , xorg-app-xset.spec (1.1 -> 1.2) , xorg-app-xsetmode.spec (1.1 -> 1.2) , xorg-app-xsetpointer.spec (1.1 -> 1.2) , xorg-app-xsetroot.spec (1.1 -> 1.2) , xorg-app-xsm.spec (1.1 -> 1.2) , xorg-app-xstdcmap.spec (1.1 -> 1.2) , xorg-app-xtrap.spec (1.1 -> 1.2) , xorg-app-xvidtune.spec (1.1 -> 1.2) , xorg-app-xvinfo.spec (1.1 -> 1.2) , xorg-app-xwd.spec (1.1 -> 1.2) , xorg-app-xwininfo.spec (1.1 -> 1.2) , xorg-app-xwud.spec (1.1 -> 1.2) , xorg-font-encodings.spec (1.1 -> 1.2) , xorg-font-font-adobe-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-100dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-75dpi.spec (1.1 -> 1.2) , xorg-font-font-adobe-utopia-type1.spec (1.1 -> 1.2) , xorg-font-font-alias.spec (1.1 -> 1.2) , xorg-font-font-arabic-misc.spec (1.1 -> 1.2) , xorg-font-font-bh-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bh-ttf.spec (1.1 -> 1.2) , xorg-font-font-bh-type1.spec (1.1 -> 1.2) , xorg-font-font-bitstream-100dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-75dpi.spec (1.1 -> 1.2) , xorg-font-font-bitstream-type1.spec (1.1 -> 1.2) , xorg-font-font-cronyx-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-cursor-misc.spec (1.1 -> 1.2) , xorg-font-font-daewoo-misc.spec (1.1 -> 1.2) , xorg-font-font-dec-misc.spec (1.1 -> 1.2) , xorg -font-font-ibm-type1.spec (1.1 -> 1.2) , xorg-font-font-isas-misc.spec (1.1 -> 1.2) , xorg-font-font-jis-misc.spec (1.1 -> 1.2) , xorg-font-font-micro-misc.spec (1.1 -> 1.2) , xorg-font-font-misc-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-misc-misc.spec (1.1 -> 1.2) , xorg-font-font-mutt-misc.spec (1.1 -> 1.2) , xorg-font-font-schumacher-misc.spec (1.1 -> 1.2) , xorg-font-font-screen-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-sony-misc.spec (1.1 -> 1.2) , xorg-font-font-sun-misc.spec (1.1 -> 1.2) , xorg-font-font-util.spec (1.1 -> 1.2) , xorg-font-font-winitzki-cyrillic.spec (1.1 -> 1.2) , xorg-font-font-xfree86-type1.spec (1.1 -> 1.2) , xorg-lib-libFS.spec (1.1 -> 1.2) , xorg-lib-libICE.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.2 -> 1.3) , xorg-lib-libX11.spec (1.2 -> 1.3) , xorg-lib-libXScrnSaver.spec (1.1 -> 1.2) , xorg-lib-libXTrap.spec (1.1 -> 1.2) , xorg-lib-libXau.spec (1.2 -> 1.3) , xorg-lib-libXaw.spec (1.2 -> 1.3) , xorg-lib-libXcomposite.spec (1.2 -> 1.3) , xorg-lib-libXcursor.spec (1.2 -> 1.3) , xorg-lib-libXdamage.spec (1.2 -> 1.3) , xorg-lib-libXdmcp.spec (1.2 -> 1.3) , xorg-lib-libXevie.spec (1.1 -> 1.2) , xorg-lib-libXext.spec (1.2 -> 1.3) , xorg-lib-libXfixes.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.1 -> 1.2) , xorg-lib-libXft.spec (1.2 -> 1.3) , xorg-lib-libXi.spec (1.2 -> 1.3) , xorg-lib-libXinerama.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.2 -> 1.3) , xorg-lib-libXpm.spec (1.2 -> 1.3) , xorg-lib-libXprintAppUtil.spec (1.1 -> 1.2) , xorg-lib-libXprintUtil.spec (1.1 -> 1.2) , xorg-lib-libXrandr.spec (1.2 -> 1.3) , xorg-lib-libXrender.spec (1.2 -> 1.3) , xorg-lib-libXres.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.2 -> 1.3) , xorg-lib-libXtst.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.2 -> 1.3) , xorg-lib-libXvMC.spec (1.1 -> 1.2) , xorg-lib-libXxf86dga.spec (1.1 -> 1.2) , xorg-lib-libXxf86misc.spec (1.1 -> 1.2) , xorg-lib-libXxf86vm.spec (1.1 -> 1.2) , xorg-lib-libdmx.spec (1.1 -> 1.2) , xorg-lib-libfontenc.s pec (1.2 -> 1.3) , xorg-lib-liblbxutil.spec (1.2 -> 1.3) , xorg-lib-liboldX.spec (1.1 -> 1.2) , xorg-lib-libxkbfile.spec (1.1 -> 1.2) , xorg-lib-libxkbui.spec (1.1 -> 1.2) , xorg-lib-xtrans.spec (1.2 -> 1.3) , xorg-proto-bigreqsproto.spec (1.2 -> 1.3) , xorg-proto-compositeproto.spec (1.3 -> 1.4) , xorg-proto-damageproto.spec (1.3 -> 1.4) , xorg-proto-dmxproto.spec (1.2 -> 1.3) , xorg-proto-evieext.spec (1.2 -> 1.3) , xorg-proto-fixesproto.spec (1.3 -> 1.4) , xorg-proto-fontcacheproto.spec (1.2 -> 1.3) , xorg-proto-fontsproto.spec (1.2 -> 1.3) , xorg-proto-glproto.spec (1.2 -> 1.3) , xorg-proto-inputproto.spec (1.2 -> 1.3) , xorg-proto-kbproto.spec (1.2 -> 1.3) , xorg-proto-panoramixproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.2 -> 1.3) , xorg-proto-randrproto.spec (1.3 -> 1.4) , xorg-proto-recordproto.spec (1.3 -> 1.4) , xorg-proto-renderproto.spec (1.3 -> 1.4) , xorg-proto-resourceproto.spec (1.3 -> 1.4) , xorg-proto-scrnsaverproto.spec (1.2 -> 1.3) , xorg-proto-trapproto.spec (1.2 -> 1.3) , xorg-proto-videoproto.spec (1.2 -> 1.3) , xorg-proto-xcmiscproto.spec (1.2 -> 1.3) , xorg-proto-xextproto.spec (1.3 -> 1.4) , xorg-proto-xf86bigfontproto.spec (1.2 -> 1.3) , xorg-proto-xf86dgaproto.spec (1.2 -> 1.3) , xorg-proto-xf86driproto.spec (1.2 -> 1.3) , xorg-proto-xf86miscproto.spec (1.2 -> 1.3) , xorg-proto-xf86rushproto.spec (1.2 -> 1.3) , xorg-proto-xf86vidmodeproto.spec (1.2 -> 1.3) , xorg-proto-xproto.spec (1.3 -> 1.4) , xorg-proto-xproxymanagementprotocol.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.1 SPECS/xorg-app-appres.spec:1.2 --- SPECS/xorg-app-appres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.1 SPECS/xorg-app-bdftopcf.spec:1.2 --- SPECS/xorg-app-bdftopcf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.1 SPECS/xorg-app-beforelight.spec:1.2 --- SPECS/xorg-app-beforelight.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.1 SPECS/xorg-app-bitmap.spec:1.2 --- SPECS/xorg-app-bitmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.1 SPECS/xorg-app-editres.spec:1.2 --- SPECS/xorg-app-editres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.1 SPECS/xorg-app-fonttosfnt.spec:1.2 --- SPECS/xorg-app-fonttosfnt.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.1 SPECS/xorg-app-fslsfonts.spec:1.2 --- SPECS/xorg-app-fslsfonts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.1 SPECS/xorg-app-fstobdf.spec:1.2 --- SPECS/xorg-app-fstobdf.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.1 SPECS/xorg-app-iceauth.spec:1.2 --- SPECS/xorg-app-iceauth.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.1 SPECS/xorg-app-ico.spec:1.2 --- SPECS/xorg-app-ico.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/ico-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.1 SPECS/xorg-app-lbxproxy.spec:1.2 --- SPECS/xorg-app-lbxproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 19:42:47 2005 @@ -20,7 +20,7 @@ BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel BuildRoot: %{tmpdir}/lbxproxy-%{version}-root-%(id -u -n) @@ -74,6 +74,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.1 SPECS/xorg-app-listres.spec:1.2 --- SPECS/xorg-app-listres.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/listres-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.1 SPECS/xorg-app-luit.spec:1.2 --- SPECS/xorg-app-luit.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 19:42:47 2005 @@ -18,7 +18,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/luit-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.1 SPECS/xorg-app-mkfontdir.spec:1.2 --- SPECS/xorg-app-mkfontdir.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 19:42:47 2005 @@ -14,7 +14,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontdir-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.1 SPECS/xorg-app-mkfontscale.spec:1.2 --- SPECS/xorg-app-mkfontscale.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: freetype-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/mkfontscale-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.1 SPECS/xorg-app-oclock.spec:1.2 --- SPECS/xorg-app-oclock.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/oclock-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.1 SPECS/xorg-app-pclcomp.spec:1.2 --- SPECS/xorg-app-pclcomp.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/pclcomp-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -66,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.1 SPECS/xorg-app-proxymngr.spec:1.2 --- SPECS/xorg-app-proxymngr.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 19:42:47 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRoot: %{tmpdir}/proxymngr-%{version}-root-%(id -u -n) @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.1 SPECS/xorg-app-rgb.spec:1.2 --- SPECS/xorg-app-rgb.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel BuildRoot: %{tmpdir}/rgb-%{version}-root-%(id -u -n) @@ -68,6 +68,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.1 SPECS/xorg-app-rstart.spec:1.2 --- SPECS/xorg-app-rstart.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/rstart-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.1 SPECS/xorg-app-scripts.spec:1.2 --- SPECS/xorg-app-scripts.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/scripts-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.1 SPECS/xorg-app-setxkbmap.spec:1.2 --- SPECS/xorg-app-setxkbmap.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 19:42:47 2005 @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/setxkbmap-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.1 SPECS/xorg-app-showfont.spec:1.2 --- SPECS/xorg-app-showfont.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/showfont-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.1 SPECS/xorg-app-smproxy.spec:1.2 --- SPECS/xorg-app-smproxy.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/smproxy-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.1 SPECS/xorg-app-twm.spec:1.2 --- SPECS/xorg-app-twm.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 19:42:47 2005 @@ -16,7 +16,7 @@ BuildRequires: automake BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/twm-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -67,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 17:42:47 wiget +- s/pkg-config/pkgconfig/ in BR: + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-glproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-panoramixproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 19:56:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-lib-libdmx.spec, xorg-lib-libfontenc.spec, xorg-lib-li... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 17:56:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, ported back to Linux ---- Files affected: SPECS: xorg-lib-libdmx.spec (1.2 -> 1.3) , xorg-lib-libfontenc.spec (1.3 -> 1.4) , xorg-lib-libFS.spec (1.2 -> 1.3) , xorg-lib-libICE.spec (1.3 -> 1.4) , xorg-lib-liblbxutil.spec (1.3 -> 1.4) , xorg-lib-liboldX.spec (1.2 -> 1.3) , xorg-lib-libSM.spec (1.3 -> 1.4) , xorg-lib-libX11.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.3 -> 1.4) , xorg-lib-libXaw.spec (1.3 -> 1.4) , xorg-lib-libXcomposite.spec (1.3 -> 1.4) , xorg-lib-libXcursor.spec (1.3 -> 1.4) , xorg-lib-libXdamage.spec (1.3 -> 1.4) , xorg-lib-libXdmcp.spec (1.3 -> 1.4) , xorg-lib-libXevie.spec (1.2 -> 1.3) , xorg-lib-libXext.spec (1.3 -> 1.4) , xorg-lib-libXfixes.spec (1.3 -> 1.4) , xorg-lib-libXfontcache.spec (1.2 -> 1.3) , xorg-lib-libXfont.spec (1.4 -> 1.5) , xorg-lib-libXft.spec (1.3 -> 1.4) , xorg-lib-libXinerama.spec (1.3 -> 1.4) , xorg-lib-libXi.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.2 -> 1.3) , xorg-lib-libxkbui.spec (1.2 -> 1.3) , xorg-lib-libXmu.spec (1.3 -> 1.4) , xorg-lib-libXpm.spec (1.3 -> 1.4) , xorg-lib-libXprintAppUtil.spec (1.2 -> 1.3) , xorg-lib-libXprintUtil.spec (1.2 -> 1.3) , xorg-lib-libXp.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.3 -> 1.4) , xorg-lib-libXrender.spec (1.3 -> 1.4) , xorg-lib-libXres.spec (1.3 -> 1.4) , xorg-lib-libXScrnSaver.spec (1.2 -> 1.3) , xorg-lib-libXTrap.spec (1.2 -> 1.3) , xorg-lib-libXt.spec (1.3 -> 1.4) , xorg-lib-libXtst.spec (1.3 -> 1.4) , xorg-lib-libXvMC.spec (1.2 -> 1.3) , xorg-lib-libXv.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.2 -> 1.3) , xorg-lib-libXxf86misc.spec (1.2 -> 1.3) , xorg-lib-libXxf86vm.spec (1.2 -> 1.3) , xorg-lib-xtrans.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libdmx.spec diff -u SPECS/xorg-lib-libdmx.spec:1.2 SPECS/xorg-lib-libdmx.spec:1.3 --- SPECS/xorg-lib-libdmx.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libdmx.spec Sat Aug 27 19:56:05 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3328 $, $Date$ -# Summary: dmx library Summary(pl): Biblioteka dmx Name: xorg-lib-libdmx @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-dmxproto-devel -BuildRequires: xorg-lib-libXext-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-proto-dmxproto-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libdmx-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 %define _mandir %{_prefix}/man @@ -29,14 +27,13 @@ %description -l pl Biblioteka dmx. - %package devel Summary: Header files libdmx development Summary(pl): Pliki nag??wkowe do biblioteki libdmx Group: X11/Development/Libraries -Requires: xorg-lib-libdmx = %{version}-%{release} -Requires: xorg-proto-dmxproto-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXext-devel +Requires: xorg-proto-dmxproto-devel %description devel dmx library. @@ -50,12 +47,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libdmx. - %package static -Summary: Static libdmx libraries -Summary(pl): Biblioteki statyczne libdmx -Group: Development/Libraries -Requires: xorg-lib-libdmx-devel = %{version}-%{release} +Summary: Static libdmx library +Summary(pl): Biblioteka statyczna libdmx +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static dmx library. @@ -65,13 +61,11 @@ %description static -l pl Biblioteka dmx. -Pakiet zawiera statyczn? biblioteke libdmx. - +Pakiet zawiera statyczn? bibliotek? libdmx. %prep %setup -q -n libdmx-%{version} - %build %{__libtoolize} %{__aclocal} @@ -82,7 +76,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -90,40 +83,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libdmx.so.* - +%attr(755,root,root) %{_libdir}/libdmx.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdmx.so %{_libdir}/libdmx.la -%attr(755,root,wheel) %{_libdir}/libdmx.so %{_pkgconfigdir}/dmx.pc %{_mandir}/man3/*.3* - %files static %defattr(644,root,root,755) %{_libdir}/libdmx.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:05 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libfontenc.spec diff -u SPECS/xorg-lib-libfontenc.spec:1.3 SPECS/xorg-lib-libfontenc.spec:1.4 --- SPECS/xorg-lib-libfontenc.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libfontenc.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3278 $, $Date$ -# Summary: fontenc library Summary(pl): Biblioteka fontenc Name: xorg-lib-libfontenc @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xproto-devel -BuildRoot: %{tmpdir}/libfontenc-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka fontenc. - %package devel Summary: Header files libfontenc development Summary(pl): Pliki nag??wkowe do biblioteki libfontenc Group: X11/Development/Libraries -Requires: xorg-lib-libfontenc = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel +Requires: zlib-devel %description devel fontenc library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libfontenc. - %package static -Summary: Static libfontenc libraries -Summary(pl): Biblioteki statyczne libfontenc -Group: Development/Libraries -Requires: xorg-lib-libfontenc-devel = %{version}-%{release} +Summary: Static libfontenc library +Summary(pl): Biblioteka statyczna libfontenc +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static fontenc library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczn? bibliotek? libfontenc. - %prep %setup -q -n libfontenc-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,40 +82,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libfontenc.so.* - +%attr(755,root,root) %{_libdir}/libfontenc.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libfontenc.so %{_libdir}/libfontenc.la -%attr(755,root,wheel) %{_libdir}/libfontenc.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/fontenc.pc - %files static %defattr(644,root,root,755) %{_libdir}/libfontenc.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.2 SPECS/xorg-lib-libFS.spec:1.3 --- SPECS/xorg-lib-libFS.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3245 $, $Date$ -# Summary: FS library Summary(pl): Biblioteka FS Name: xorg-lib-libFS @@ -13,12 +11,12 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-fontsproto-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel -BuildRoot: %{tmpdir}/libFS-%{version}-root-%(id -u -n) +BuildRequires: xorg-proto-fontsproto-devel +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka FS. - %package devel Summary: Header files libFS development Summary(pl): Pliki nag??wkowe do biblioteki libFS Group: X11/Development/Libraries -Requires: xorg-lib-libFS = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-fontsproto-devel %description devel @@ -48,12 +45,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libFS. - %package static -Summary: Static libFS libraries -Summary(pl): Biblioteki statyczne libFS -Group: Development/Libraries -Requires: xorg-lib-libFS-devel = %{version}-%{release} +Summary: Static libFS library +Summary(pl): Biblioteka statyczna libFS +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static FS library. @@ -65,11 +61,9 @@ Pakiet zawiera statyczn? bibliotek? libFS. - %prep %setup -q -n libFS-%{version} - %build %{__libtoolize} %{__aclocal} @@ -80,7 +74,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -88,40 +81,37 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,wheel) %{_libdir}/libFS.so.* - +%attr(755,root,root) %{_libdir}/libFS.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/fonts/*.h +%attr(755,root,root) %{_libdir}/libFS.so %{_libdir}/libFS.la -%attr(755,root,wheel) %{_libdir}/libFS.so +%{_includedir}/X11/fonts/*.h %{_pkgconfigdir}/libfs.pc - %files static %defattr(644,root,root,755) %{_libdir}/libFS.a - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.3 SPECS/xorg-lib-libICE.spec:1.4 --- SPECS/xorg-lib-libICE.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ - -# Summary: Inter Client Exchange library Summary(pl): Biblioteka wymiany mi?dzy klientami Name: xorg-lib-libICE @@ -15,10 +13,10 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-util-util-macros Obsoletes: libICE -BuildRoot: %{tmpdir}/libICE-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,12 +26,11 @@ %description -l pl Biblioteka wymiany mi?dzy klientami. - %package devel Summary: Header files libICE development Summary(pl): Pliki nag??wkowe do biblioteki libICE Group: X11/Development/Libraries -Requires: xorg-lib-libICE = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xproto-devel Obsoletes: libICE-devel @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki libICE. - %package static -Summary: Static libICE libraries -Summary(pl): Biblioteki statyczne libICE -Group: Development/Libraries -Requires: xorg-lib-libICE-devel = %{version}-%{release} +Summary: Static libICE library +Summary(pl): Biblioteka statyczna libICE +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} Obsoletes: libICE-static %description static @@ -67,7 +63,6 @@ Pakiet zawiera statyczn? bibliotek? libICE. - %prep %setup -q -n libICE-%{version} @@ -93,21 +88,18 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/libICE.so.* - +%attr(755,root,root) %{_libdir}/libICE.so.*.*.* %files devel %defattr(644,root,root,755) -%{_includedir}/X11/ICE/*.h +%attr(755,root,root) %{_libdir}/libICE.so %{_libdir}/libICE.la -%attr(755,root,wheel) %{_libdir}/libICE.so +%{_includedir}/X11/ICE/*.h %{_pkgconfigdir}/ice.pc - %files static %defattr(644,root,root,755) %{_libdir}/libICE.a @@ -118,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 17:56:06 qboosh +- cleanups, ported back to Linux + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-lib-liblbxutil.spec diff -u SPECS/xorg-lib-liblbxutil.spec:1.3 SPECS/xorg-lib-liblbxutil.spec:1.4 --- SPECS/xorg-lib-liblbxutil.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-lib-liblbxutil.spec Sat Aug 27 19:56:06 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3331 $, $Date$ -# Summary: lbxutil library Summary(pl): Biblioteka lbxutil Name: xorg-lib-liblbxutil @@ -14,11 +12,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-util-util-macros BuildRequires: xorg-proto-xextproto-devel -BuildRoot: %{tmpdir}/liblbxutil-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRequires: zlib-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -28,14 +26,13 @@ %description -l pl Biblioteka lbxutil. - %package devel Summary: Header files liblbxutil development Summary(pl): Pliki nag??wkowe do biblioteki liblbxutil Group: X11/Development/Libraries -Requires: xorg-lib-liblbxutil = %{version}-%{release} -Requires: zlib-devel +Requires: %{name} = %{version}-%{release} Requires: xorg-proto-xextproto-devel +Requires: zlib-devel %description devel lbxutil library. @@ -49,12 +46,11 @@ Pakiet zawiera pliki nag??wkowe niezb?dne do kompilowania program?w u?ywaj?cych biblioteki liblbxutil. - %package static -Summary: Static liblbxutil libraries -Summary(pl): Biblioteki statyczne liblbxutil -Group: Development/Libraries -Requires: xorg-lib-liblbxutil-devel = %{version}-%{release} +Summary: Static liblbxutil library +Summary(pl): Biblioteka statyczna liblbxutil +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} %description static lbxutil library. @@ -66,11 +62,9 @@ Pakiet zawiera statyczna bibliotek? liblbxutil. - %prep %setup -q -n liblbxutil-%{version} - %build %{__libtoolize} %{__aclocal} @@ -81,7 +75,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -89,39 +82,36 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog -%attr(755,root,wheel) %{_libdir}/liblbxutil.so.* - +%attr(755,root,root) %{_libdir}/liblbxutil.so.*.*.* %files devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liblbxutil.so %{_libdir}/liblbxutil.la -%attr(755,root,wheel) %{_libdir}/liblbxutil.so %{_pkgconfigdir}/lbxutil.pc - %files static %defattr(644,root,root,755) %{_libdir}/liblbxutil.a <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 19:57:44 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: vim.spec - removed setting perms in %install - sorted %veri... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 17:57:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed setting perms in %install - sorted %verify flags ---- Files affected: SPECS: vim.spec (1.308 -> 1.309) ---- Diffs: ================================================================ Index: SPECS/vim.spec diff -u SPECS/vim.spec:1.308 SPECS/vim.spec:1.309 --- SPECS/vim.spec:1.308 Wed Aug 10 12:44:43 2005 +++ SPECS/vim.spec Sat Aug 27 19:57:38 2005 @@ -1003,17 +1003,17 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/* %if %{with static} -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim -install -m755 src/bin/vim.static $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim +install src/bin/vim.static $RPM_BUILD_ROOT/bin/vi %else -install -m755 src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi +install src/bin/vim.ncurses $RPM_BUILD_ROOT/bin/vi ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vim %endif %if %{with ispell} -install -m755 src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell +install src/bin/vim.ispell $RPM_BUILD_ROOT%{_bindir}/vim.ispell %endif -install -m755 src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd -install -m755 src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor +install src/xxd/xxd $RPM_BUILD_ROOT%{_bindir}/xxd +install src/vimtutor $RPM_BUILD_ROOT%{_bindir}/vimtutor rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1 @@ -1039,19 +1039,19 @@ install %{SOURCE14} $RPM_BUILD_ROOT%{_desktopdir} %if %{with athena} -install -m755 src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena +install src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena install %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with motif} -install -m755 src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif +install src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif install %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gnome} -install -m755 src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome +install src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome install %{SOURCE13} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gtk} -install -m755 src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk +install src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk ln -sf gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/gview @@ -1065,7 +1065,7 @@ install runtime/vim48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/vim.png %if %{with kde} -install -m755 src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim +install src/bin/kvim $RPM_BUILD_ROOT%{_bindir}/kvim install -d $RPM_BUILD_ROOT%{_desktopdir}/kde install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22}/actions install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps @@ -1083,7 +1083,7 @@ %if %{with bonobo} install -d $RPM_BUILD_ROOT%{_libdir}/bonobo/servers install src/bin/Vim_Control.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers -install -m755 src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} +install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir} %endif bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -1174,8 +1174,8 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/vimtutor %dir %{_sysconfdir}/vim -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/vimrc -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/gvimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/vimrc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vim/gvimrc %dir %{_datadir}/vim %dir %{_datadir}/vim/v* @@ -1183,8 +1183,8 @@ %doc %{_datadir}/vim/v*/doc/*.txt %lang(pl) %doc %{_datadir}/vim/v*/doc/*.plx %attr(755,root,root) %{_datadir}/vim/v*/doc/*.pl -%verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags -%lang(pl) %verify(not size mtime md5) %{_datadir}/vim/v*/doc/tags-pl +%verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags +%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/v*/doc/tags-pl %{_datadir}/vim/v*/ftplugin %{_datadir}/vim/v*/indent %{_datadir}/vim/v*/keymap @@ -1337,6 +1337,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.309 2005/08/27 17:57:38 darekr +- removed setting perms in %install +- sorted %verify flags + Revision 1.308 2005/08/10 10:44:43 saq - awk.patch for bug#945 (avoid gawk dependency) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.308&r2=1.309&f=u From qboosh at pld-linux.org Sat Aug 27 20:00:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-data-xbitmaps.spec, xorg-data-xcursor-themes.spec, xor... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:00:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ---- Files affected: SPECS: xorg-data-xbitmaps.spec (1.1 -> 1.2) , xorg-data-xcursor-themes.spec (1.1 -> 1.2) , xorg-data-xkbdata.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xbitmaps.spec diff -u SPECS/xorg-data-xbitmaps.spec:1.1 SPECS/xorg-data-xbitmaps.spec:1.2 --- SPECS/xorg-data-xbitmaps.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xbitmaps.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3338 $, $Date$ -# Summary: X bitmaps data Summary(pl): Bitmapy dla X Name: xorg-data-xbitmaps @@ -13,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config -BuildRoot: %{tmpdir}/xbitmaps-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -25,11 +23,9 @@ %description -l pl Bitmapy dla X. - %prep %setup -q -n xbitmaps-%{version} - %build %{__aclocal} %{__autoconf} @@ -39,7 +35,6 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT @@ -47,23 +42,23 @@ DESTDIR=$RPM_BUILD_ROOT \ pkgconfigdir=%{_pkgconfigdir} - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_includedir}/X11/bitmaps %{_pkgconfigdir}/xbitmaps.pc - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.1 SPECS/xorg-data-xcursor-themes.spec:1.2 --- SPECS/xorg-data-xcursor-themes.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:00:36 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3431 $, $Date$ -# Summary: Cursor themes Summary(pl): Motywy kursor?w Name: xorg-data-xcursor-themes @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xcursorgen -BuildRoot: %{tmpdir}/xcursor-themes-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Cursor themes. @@ -24,7 +22,6 @@ %description -l pl Motywy kursor?w. - %package -n xcursor-theme-handhelds Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" @@ -36,7 +33,6 @@ %description -n xcursor-theme-handhelds -l pl Motyw kursor?w "handhelds" dla X11. - %package -n xcursor-theme-redglass Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" @@ -48,7 +44,6 @@ %description -n xcursor-theme-redglass -l pl Motyw kursor?w "redglass" dla X11. - %package -n xcursor-theme-whiteglass Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" @@ -60,11 +55,9 @@ %description -n xcursor-theme-whiteglass -l pl Motyw kursor?w "whiteglass" dla X11. - %prep %setup -q -n xcursor-themes-%{version} - %build %{__aclocal} %{__autoconf} @@ -74,18 +67,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files -n xcursor-theme-handhelds %defattr(644,root,root,755) %{_iconsdir}/handhelds @@ -98,13 +88,15 @@ %defattr(644,root,root,755) %{_iconsdir}/whiteglass - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:36 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ Index: SPECS/xorg-data-xkbdata.spec diff -u SPECS/xorg-data-xkbdata.spec:1.1 SPECS/xorg-data-xkbdata.spec:1.2 --- SPECS/xorg-data-xkbdata.spec:1.1 Mon Aug 15 14:17:57 2005 +++ SPECS/xorg-data-xkbdata.spec Sat Aug 27 20:00:37 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3432 $, $Date$ -# Summary: XKB data Summary(pl): Dane dla XKB Name: xorg-data-xkbdata @@ -13,10 +11,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-xkbcomp -BuildRoot: %{tmpdir}/xkbdata-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -26,11 +24,9 @@ %description -l pl Dane dla XKB. - %prep %setup -q -n xkbdata-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/xkb - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:00:37 qboosh +- cleanups, BR s/pkg-config/pkgconfig >= 0.19/ + Revision 1.1 2005/08/15 12:17:57 arekm - new try - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xbitmaps.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SPECS/xorg-data-xkbdata.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sat Aug 27 20:02:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-data-xcursor-themes.spec - Obsoletes for XFree86/X11 X... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:02:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) ---- Files affected: SPECS: xorg-data-xcursor-themes.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-data-xcursor-themes.spec diff -u SPECS/xorg-data-xcursor-themes.spec:1.2 SPECS/xorg-data-xcursor-themes.spec:1.3 --- SPECS/xorg-data-xcursor-themes.spec:1.2 Sat Aug 27 20:00:36 2005 +++ SPECS/xorg-data-xcursor-themes.spec Sat Aug 27 20:02:54 2005 @@ -26,6 +26,7 @@ Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursor?w "handhelds" Group: Themes +Obsoletes: XcursorTheme-handhelds %description -n xcursor-theme-handhelds Cursors theme "handhelds" for X11. @@ -37,6 +38,7 @@ Summary: Cursors theme "redglass" Summary(pl): Motyw kursor?w "redglass" Group: Themes +Obsoletes: XcursorTheme-redglass %description -n xcursor-theme-redglass Cursors theme "redglass" for X11. @@ -48,6 +50,7 @@ Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursor?w "whiteglass" Group: Themes +Obsoletes: XcursorTheme-whiteglass %description -n xcursor-theme-whiteglass Cursors theme "whiteglass" for X11. @@ -94,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:02:54 qboosh +- Obsoletes for XFree86/X11 XcursorTheme* packages (or maybe leave old names?) + Revision 1.2 2005/08/27 18:00:36 qboosh - cleanups, BR s/pkg-config/pkgconfig >= 0.19/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-data-xcursor-themes.spec?r1=1.2&r2=1.3&f=u From arekm at pld-linux.org Sat Aug 27 20:20:25 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: tkabber.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:20:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/tkabber.spec diff -u SPECS/tkabber.spec:1.16 SPECS/tkabber.spec:1.17 --- SPECS/tkabber.spec:1.16 Thu Nov 4 12:22:33 2004 +++ SPECS/tkabber.spec Sat Aug 27 20:20:15 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client Summary(pl): Klient Jabbera oparty o Tk Name: tkabber -Version: 0.9.7 -Release: 3 +Version: 0.9.8 +Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 41a0f24239415edb8e3d2cd86e532f38 +Source0: http://files.jabberstudio.org/%{name}/%{name}-%{version}.tar.gz +# Source0-md5: 2112b44822e4ea7d9292fddc93a89fd1 Source1: %{name}.desktop Source2: %{name}.png Icon: tkabber.xpm @@ -58,6 +58,7 @@ %prep %setup -q +sed -i -e 's#ifaceck##g' Makefile %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +90,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 18:20:15 arekm +- up to 0.9.8 + Revision 1.16 2004/11/04 11:22:33 paladine - rel 3 for fixed desktop file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber.spec?r1=1.16&r2=1.17&f=u From arekm at pld-linux.org Sat Aug 27 20:20:33 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: tkabber-0.9.8.tar.gz Message-ID: <28603.1125166833@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-0.9.8.tar.gz 2112b44822e4ea7d9292fddc93a89fd1 tkabber-0.9.8.tar.gz Size: 719377 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:57 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: tkabber-plugins-0.9.8.tar.gz Message-ID: <1067.1125167037@distfiles.pld-linux.org> Files fetched: 1 STORED: http://files.jabberstudio.org/tkabber/tkabber-plugins-0.9.8.tar.gz de03ba77d6b6d28f128acf5cfdd90d28 tkabber-plugins-0.9.8.tar.gz Size: 394599 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sat Aug 27 20:23:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: tkabber-plugins.spec - up to 0.9.8 In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 18:23:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.9.8 ---- Files affected: SPECS: tkabber-plugins.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/tkabber-plugins.spec diff -u SPECS/tkabber-plugins.spec:1.1 SPECS/tkabber-plugins.spec:1.2 --- SPECS/tkabber-plugins.spec:1.1 Mon Nov 22 10:55:25 2004 +++ SPECS/tkabber-plugins.spec Sat Aug 27 20:23:50 2005 @@ -2,12 +2,12 @@ Summary: Tk Jabber client plugins Summary(pl): Wtyczki do Klienta Jabbera opartego o Tk Name: tkabber-plugins -Version: 0.9.7 +Version: 0.9.8 Release: 1 License: GPL Group: Applications/Communications -Source0: http://www.jabberstudio.org/projects/tkabber/releases/file/%{name}-%{version}.tar.gz -# Source0-md5: 837d9e3de0cd7253a1dd6e2940d103d7 +Source0: http://files.jabberstudio.org/tkabber/%{name}-%{version}.tar.gz +# Source0-md5: de03ba77d6b6d28f128acf5cfdd90d28 URL: http://tkabber.jabber.ru/ Requires: tkabber >= %{version}-%{release} BuildArch: noarch @@ -44,6 +44,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 18:23:50 arekm +- up to 0.9.8 + Revision 1.1 2004/11/22 09:55:25 arekm - initial pld release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tkabber-plugins.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 20:29:14 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: tidy.spec - updated to 0.20050826;fix build In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:29:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.20050826;fix build ---- Files affected: SPECS: tidy.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/tidy.spec diff -u SPECS/tidy.spec:1.41 SPECS/tidy.spec:1.42 --- SPECS/tidy.spec:1.41 Sun Jul 17 19:37:46 2005 +++ SPECS/tidy.spec Sat Aug 27 20:29:09 2005 @@ -2,15 +2,15 @@ Summary: Utility to clean up and pretty print HTML files Summary(pl): Narz?dzie do porz?dkowania kodu HTML Name: tidy -Version: 0.20041025 +Version: 0.20050826 Release: 1 Epoch: 1 License: distributable Group: Applications/Text Source0: http://tidy.sourceforge.net/src/tidy_src.tgz -# Source0-md5: bf6cd062ed43babdba5ade9378be2db3 +# Source0-md5: 7c2ee7186b0384f92f65ec61266e0661 Source1: http://tidy.sourceforge.net/docs/tidy_docs.tgz -# Source1-md5: 04338149bdd3e10753101bc5dff8acd8 +# Source1-md5: 2e6533fc48b077ff6243deaf21a781de URL: http://tidy.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -69,9 +69,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -mv -f htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 %clean rm -rf $RPM_BUILD_ROOT @@ -84,7 +81,6 @@ %doc htmldoc/* %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* -%{_mandir}/man1/* %files devel %defattr(644,root,root,755) @@ -102,6 +98,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.42 2005/08/27 18:29:09 darekr +- updated to 0.20050826;fix build + Revision 1.41 2005/07/17 17:37:46 darekr - unify sourceforge URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/tidy.spec?r1=1.41&r2=1.42&f=u From darekr at pld-linux.org Sat Aug 27 20:29:16 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: tidy_src.tgz tidy_docs.tgz Message-ID: <8564.1125167356@distfiles.pld-linux.org> Files fetched: 2 STORED: http://tidy.sourceforge.net/src/tidy_src.tgz 7c2ee7186b0384f92f65ec61266e0661 tidy_src.tgz Size: 255812 bytes STORED: http://tidy.sourceforge.net/docs/tidy_docs.tgz 2e6533fc48b077ff6243deaf21a781de tidy_docs.tgz Size: 150359 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 20:42:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-font-encodings.spec, xorg-font-font-adobe-100dpi.spec, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:42:25 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, better Group; TODO: use PLD fonts infrastructure ---- Files affected: SPECS: xorg-font-encodings.spec (1.2 -> 1.3) , xorg-font-font-adobe-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-100dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-75dpi.spec (1.2 -> 1.3) , xorg-font-font-adobe-utopia-type1.spec (1.2 -> 1.3) , xorg-font-font-alias.spec (1.2 -> 1.3) , xorg-font-font-arabic-misc.spec (1.2 -> 1.3) , xorg-font-font-bh-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-lucidatypewriter-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bh-ttf.spec (1.2 -> 1.3) , xorg-font-font-bh-type1.spec (1.2 -> 1.3) , xorg-font-font-bitstream-100dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-75dpi.spec (1.2 -> 1.3) , xorg-font-font-bitstream-type1.spec (1.2 -> 1.3) , xorg-font-font-cronyx-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-cursor-misc.spec (1.2 -> 1.3) , xorg-font-font-daewoo-misc.spec (1.2 -> 1.3) , xorg-font-font-dec-misc.spec (1.2 -> 1.3) , xorg-font-font-ibm-type1.spec (1.2 -> 1.3) , xorg-font-font-isas-misc.spec (1.2 -> 1.3) , xorg-font-font-jis-misc.spec (1.2 -> 1.3) , xorg-font-font-micro-misc.spec (1.2 -> 1.3) , xorg-font-font-misc-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-misc-misc.spec (1.2 -> 1.3) , xorg-font-font-mutt-misc.spec (1.2 -> 1.3) , xorg-font-font-schumacher-misc.spec (1.2 -> 1.3) , xorg-font-font-screen-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-sony-misc.spec (1.2 -> 1.3) , xorg-font-font-sun-misc.spec (1.2 -> 1.3) , xorg-font-font-util.spec (1.2 -> 1.3) , xorg-font-font-winitzki-cyrillic.spec (1.2 -> 1.3) , xorg-font-font-xfree86-type1.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-font-encodings.spec diff -u SPECS/xorg-font-encodings.spec:1.2 SPECS/xorg-font-encodings.spec:1.3 --- SPECS/xorg-font-encodings.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-encodings.spec Sat Aug 27 20:42:17 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ -# $Rev: 3433 $, $Date$ -# -Summary: encodings -Summary(pl): encodings +Summary: X font encodings database +Summary(pl): Baza kodowa? font?w X Name: xorg-font-encodings Version: 0.99.0 Release: 0.02 @@ -14,23 +12,21 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-mkfontscale BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/encodings-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -encodings +X font encodings database. %description -l pl -encodings - +Baza kodowa? font?w X. %prep %setup -q -n encodings-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -39,29 +35,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_fontsdir}/encodings - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-100dpi.spec diff -u SPECS/xorg-font-font-adobe-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3190 $, $Date$ -# -Summary: font-adobe-100dpi -Summary(pl): font-adobe-100dpi +Summary: adobe-100dpi font +Summary(pl): Font adobe-100dpi Name: xorg-font-font-adobe-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-100dpi-%{version}.tar.bz2 # Source0-md5: a54f67c67177d2759efe92ad1f68a162 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-100dpi +adobe-100dpi font. %description -l pl -font-adobe-100dpi - +Font adobe-100dpi. %prep %setup -q -n font-adobe-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-75dpi.spec diff -u SPECS/xorg-font-font-adobe-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3189 $, $Date$ -# -Summary: font-adobe-75dpi -Summary(pl): font-adobe-75dpi +Summary: adobe-75dpi font +Summary(pl): Font adobe-75dpi Name: xorg-font-font-adobe-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-75dpi-%{version}.tar.bz2 # Source0-md5: 46c7a56e2085c087ca84f6836d91fd9c URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-75dpi +adobe-75dpi font. %description -l pl -font-adobe-75dpi - +Font adobe-75dpi. %prep %setup -q -n font-adobe-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-100dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-100dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-100dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3192 $, $Date$ -# -Summary: font-adobe-utopia-100dpi -Summary(pl): font-adobe-utopia-100dpi +Summary: adobe-utopia-100dpi font +Summary(pl): Font adobe-utopia-100dpi Name: xorg-font-font-adobe-utopia-100dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-100dpi-%{version}.tar.bz2 # Source0-md5: 71ef49367ab5a43209ecfd931aaf5d72 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-100dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-100dpi +adobe-utopia-100dpi font. %description -l pl -font-adobe-utopia-100dpi - +Font adobe-utopia-100dpi. %prep %setup -q -n font-adobe-utopia-100dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-75dpi.spec diff -u SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-75dpi.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-75dpi.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3191 $, $Date$ -# -Summary: font-adobe-utopia-75dpi -Summary(pl): font-adobe-utopia-75dpi +Summary: adobe-utopia-75dpi font +Summary(pl): Font adobe-utopia-75dpi Name: xorg-font-font-adobe-utopia-75dpi Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-75dpi-%{version}.tar.bz2 # Source0-md5: c7084294f3038a5d26ffbafc2651864d URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-75dpi-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-75dpi +adobe-utopia-75dpi font. %description -l pl -font-adobe-utopia-75dpi - +Font adobe-utopia-75dpi. %prep %setup -q -n font-adobe-utopia-75dpi-%{version} - %build %{__aclocal} %{__autoconf} @@ -40,29 +36,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/75dpi/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-adobe-utopia-type1.spec diff -u SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 SPECS/xorg-font-font-adobe-utopia-type1.spec:1.3 --- SPECS/xorg-font-font-adobe-utopia-type1.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-adobe-utopia-type1.spec Sat Aug 27 20:42:17 2005 @@ -1,38 +1,34 @@ # $Revision$, $Date$ -# $Rev: 3193 $, $Date$ -# -Summary: font-adobe-utopia-type1 -Summary(pl): font-adobe-utopia-type1 +Summary: adobe-utopia-type1 font +Summary(pl): Font adobe-utopia-type1 Name: xorg-font-font-adobe-utopia-type1 Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-adobe-utopia-type1-%{version}.tar.bz2 # Source0-md5: 05e63b72340f34611de54db6940cb050 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-font-font-util BuildRequires: fontconfig +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-app-bdftopcf BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-app-mkfontscale +BuildRequires: xorg-font-font-util BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-adobe-utopia-type1-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-adobe-utopia-type1 +adobe-utopia-type1 font. %description -l pl -font-adobe-utopia-type1 - +Font adobe-utopia-type1. %prep %setup -q -n font-adobe-utopia-type1-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,29 +37,28 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/Type1/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-alias.spec diff -u SPECS/xorg-font-font-alias.spec:1.2 SPECS/xorg-font-font-alias.spec:1.3 --- SPECS/xorg-font-font-alias.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-alias.spec Sat Aug 27 20:42:17 2005 @@ -1,33 +1,29 @@ # $Revision$, $Date$ -# $Rev: 3194 $, $Date$ -# -Summary: font-alias -Summary(pl): font-alias +Summary: X font alias databases +Summary(pl): Baza alias?w font?w X Name: xorg-font-font-alias Version: 0.99.0 Release: 0.01 License: MIT -Group: X11 +Group: Fonts Source0: http://xorg.freedesktop.org/X11R7.0-RC0/font/font-alias-%{version}.tar.bz2 # Source0-md5: 31344a6fad2a6ec4c8ab995231d5a746 URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/font-alias-%{version}-root-%(id -u -n) +BuildRequires: xorg-util-util-macros +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -font-alias +X font alias databases. %description -l pl -font-alias - +Baza alias?w font?w X. %prep %setup -q -n font-alias-%{version} - %build %{__aclocal} %{__autoconf} @@ -36,18 +32,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_libdir}/X11/fonts/100dpi/fonts.alias @@ -55,13 +48,15 @@ %{_libdir}/X11/fonts/cyrillic/fonts.alias %{_libdir}/X11/fonts/misc/fonts.alias - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 18:42:17 qboosh +- cleanups, better Group; TODO: use PLD fonts infrastructure + Revision 1.2 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-font-font-arabic-misc.spec diff -u SPECS/xorg-font-font-arabic-misc.spec:1.2 SPECS/xorg-font-font-arabic-misc.spec:1.3 --- SPECS/xorg-font-font-arabic-misc.spec:1.2 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-font-font-arabic-misc.spec Sat Aug 27 20:42:17 2005 @@ -1,37 +1,33 @@ # $Revision$, $Date$ -# $Rev: 3195 $, $Date$ -# -Summary: font-arabic-misc -Summary(pl): font-arabic-misc +Summary: arabic-misc font +Summary(pl): Font arabic-misc Name: xorg-font-font-arabic-misc Version: 0.99.0 Release: 0.01 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-encodings.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-alias.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-arabic-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-lucidatypewriter-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-ttf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-100dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-75dpi.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-bitstream-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cronyx-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-cursor-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-daewoo-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-dec-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-ibm-type1.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-isas-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-jis-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-micro-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-mutt-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-schumacher-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sony-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-sun-misc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-font-font-xfree86-type1.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 20:46:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-lib-libSM.spec, xorg-lib-libXdamage.spec, xorg-lib-lib... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:46:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - just name in BuildRoot ---- Files affected: SPECS: xorg-lib-libSM.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.4 SPECS/xorg-lib-libSM.spec:1.5 --- SPECS/xorg-lib-libSM.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-lib-xtrans-devel BuildRequires: xorg-util-util-macros Obsoletes: libSM -BuildRoot: %{tmpdir}/libSM-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.4 SPECS/xorg-lib-libXdamage.spec:1.5 --- SPECS/xorg-lib-libXdamage.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 20:46:09 2005 @@ -17,7 +17,7 @@ BuildRequires: xorg-proto-damageproto-devel BuildRequires: xorg-util-util-macros Obsoletes: libXdamage -BuildRoot: %{tmpdir}/libXdamage-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -112,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.3 SPECS/xorg-lib-libXprintAppUtil.spec:1.4 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 20:46:09 2005 @@ -15,7 +15,7 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXprintUtil-devel BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/libXprintAppUtil-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -108,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-xtrans.spec diff -u SPECS/xorg-lib-xtrans.spec:1.4 SPECS/xorg-lib-xtrans.spec:1.5 --- SPECS/xorg-lib-xtrans.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-xtrans.spec Sat Aug 27 20:46:09 2005 @@ -13,7 +13,7 @@ BuildRequires: automake BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-util-util-macros -BuildRoot: %{tmpdir}/xtrans-%{version}-root-%(id -u -n) +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /usr/X11R6 @@ -81,6 +81,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 18:46:09 qboosh +- just name in BuildRoot + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 20:48:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:39 2005 Subject: SOURCES: ncurses-ac_hack.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 18:48:22 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: ncurses-ac_hack.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sat Aug 27 20:49:04 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: mysql-ruby.spec - up to 2.7 In-Reply-To: References: Message-ID: Author: aredridel Date: Sat Aug 27 18:49:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.7 ---- Files affected: SPECS: mysql-ruby.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/mysql-ruby.spec diff -u SPECS/mysql-ruby.spec:1.10 SPECS/mysql-ruby.spec:1.11 --- SPECS/mysql-ruby.spec:1.10 Mon Aug 15 11:07:00 2005 +++ SPECS/mysql-ruby.spec Sat Aug 27 20:48:57 2005 @@ -4,12 +4,12 @@ Summary: MySQL module for Ruby Summary(pl): Modu? MySQL dla j?zyka Ruby Name: mysql-ruby -Version: 2.6 +Version: 2.7 Release: 1 License: GPL Group: Development/Languages Source0: http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz -# Source0-md5: 1eefc5a170de0752816c5092869426b1 +# Source0-md5: c6668900e68f0d6a137612c818d5fd01 URL: http://www.tmtm.org/mysql/ruby/ BuildRequires: mysql-devel BuildRequires: ruby @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/27 18:48:57 aredridel +- up to 2.7 + Revision 1.10 2005/08/15 09:07:00 qboosh - updated Source0 URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-ruby.spec?r1=1.10&r2=1.11&f=u From aredridel at pld-linux.org Sat Aug 27 20:49:17 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: mysql-ruby-2.7.tar.gz Message-ID: <3202.1125168557@distfiles.pld-linux.org> Files fetched: 1 STORED: http://tmtm.org/downloads/mysql/ruby/mysql-ruby-2.7.tar.gz c6668900e68f0d6a137612c818d5fd01 mysql-ruby-2.7.tar.gz Size: 29620 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sat Aug 27 20:50:52 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-font-font-util.spec - kill /usr/X11R6 In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 18:50:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-font-font-util.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-font-font-util.spec diff -u SPECS/xorg-font-font-util.spec:1.3 SPECS/xorg-font-font-util.spec:1.4 --- SPECS/xorg-font-font-util.spec:1.3 Sat Aug 27 20:42:17 2005 +++ SPECS/xorg-font-font-util.spec Sat Aug 27 20:50:47 2005 @@ -15,10 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man -%define _datadir /usr/share - %description Font utilities. @@ -62,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 18:50:47 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 18:42:17 qboosh - cleanups, better Group; TODO: use PLD fonts infrastructure ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-font-font-util.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 20:58:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: cedega-commercial.spec - fix URL In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 18:58:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix URL ---- Files affected: SPECS: cedega-commercial.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/cedega-commercial.spec diff -u SPECS/cedega-commercial.spec:1.14 SPECS/cedega-commercial.spec:1.15 --- SPECS/cedega-commercial.spec:1.14 Mon Jul 25 22:20:58 2005 +++ SPECS/cedega-commercial.spec Sat Aug 27 20:58:11 2005 @@ -10,7 +10,7 @@ Source0: cedega_%{version}-1.i386.tgz # NoSource0-md5: 589a5d4a698e8c7336c67c1afb6d986d NoSource: 0 -URL: http://www.transgaming.com +URL: http://www.transgaming.com/ BuildRequires: sed >= 4.0 BuildRequires: tar Requires: OpenGL @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/27 18:58:11 darekr +- fix URL + Revision 1.14 2005/07/25 20:20:58 adamg - updated to 4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cedega-commercial.spec?r1=1.14&r2=1.15&f=u From darekr at pld-linux.org Sat Aug 27 21:32:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SOURCES: vim2html-VIM_HOME.patch (NEW) - fix VIM_HOME variable In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:32:03 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix VIM_HOME variable ---- Files affected: SOURCES: vim2html-VIM_HOME.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vim2html-VIM_HOME.patch diff -u /dev/null SOURCES/vim2html-VIM_HOME.patch:1.1 --- /dev/null Sat Aug 27 21:32:03 2005 +++ SOURCES/vim2html-VIM_HOME.patch Sat Aug 27 21:31:57 2005 @@ -0,0 +1,12 @@ +--- vim2html-1.46/vim2html.orig 2005-08-27 21:24:57.000000000 +0200 ++++ vim2html-1.46/vim2html 2005-08-27 21:25:18.000000000 +0200 +@@ -16,7 +16,8 @@ + + #### begin user settings #### + +-VIM_HOME="`find /usr/share/vim -type d -mindepth 1 -maxdepth 1|sort|tail -1`" ++ ++VIM_HOME="`find /usr/share/vim -mindepth 1 -maxdepth 1 -type d |sort|head -1`" + # normally, no need to change this + + SYNTAX="$VIM_HOME/syntax/2html.vim" ================================================================ From wiget at pld-linux.org Sat Aug 27 21:33:04 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: xorg-proto-bigreqsproto.spec, xorg-proto-compositeproto.spe... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:33:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-proto-bigreqsproto.spec (1.3 -> 1.4) , xorg-proto-compositeproto.spec (1.4 -> 1.5) , xorg-proto-damageproto.spec (1.4 -> 1.5) , xorg-proto-dmxproto.spec (1.3 -> 1.4) , xorg-proto-evieext.spec (1.3 -> 1.4) , xorg-proto-fixesproto.spec (1.4 -> 1.5) , xorg-proto-fontcacheproto.spec (1.3 -> 1.4) , xorg-proto-fontsproto.spec (1.3 -> 1.4) , xorg-proto-inputproto.spec (1.3 -> 1.4) , xorg-proto-kbproto.spec (1.3 -> 1.4) , xorg-proto-printproto.spec (1.3 -> 1.4) , xorg-proto-randrproto.spec (1.4 -> 1.5) , xorg-proto-recordproto.spec (1.4 -> 1.5) , xorg-proto-renderproto.spec (1.4 -> 1.5) , xorg-proto-resourceproto.spec (1.4 -> 1.5) , xorg-proto-scrnsaverproto.spec (1.3 -> 1.4) , xorg-proto-trapproto.spec (1.3 -> 1.4) , xorg-proto-videoproto.spec (1.3 -> 1.4) , xorg-proto-xcmiscproto.spec (1.3 -> 1.4) , xorg-proto-xextproto.spec (1.4 -> 1.5) , xorg-proto-xf86bigfontproto.spec (1.3 -> 1.4) , xorg-proto-xf86dgaproto.spec (1.3 -> 1.4) , xorg-proto-xf86driproto.spec (1.3 -> 1.4) , xorg-proto-xf86miscproto.spec (1.3 -> 1.4) , xorg-proto-xf86rushproto.spec (1.3 -> 1.4) , xorg-proto-xf86vidmodeproto.spec (1.3 -> 1.4) , xorg-proto-xproto.spec (1.4 -> 1.5) , xorg-proto-xproxymanagementprotocol.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-proto-bigreqsproto.spec diff -u SPECS/xorg-proto-bigreqsproto.spec:1.3 SPECS/xorg-proto-bigreqsproto.spec:1.4 --- SPECS/xorg-proto-bigreqsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-bigreqsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description BigReqs protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-compositeproto.spec diff -u SPECS/xorg-proto-compositeproto.spec:1.4 SPECS/xorg-proto-compositeproto.spec:1.5 --- SPECS/xorg-proto-compositeproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-compositeproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Composite protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-damageproto.spec diff -u SPECS/xorg-proto-damageproto.spec:1.4 SPECS/xorg-proto-damageproto.spec:1.5 --- SPECS/xorg-proto-damageproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-damageproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Damage protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-dmxproto.spec diff -u SPECS/xorg-proto-dmxproto.spec:1.3 SPECS/xorg-proto-dmxproto.spec:1.4 --- SPECS/xorg-proto-dmxproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-dmxproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description DMX protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-evieext.spec diff -u SPECS/xorg-proto-evieext.spec:1.3 SPECS/xorg-proto-evieext.spec:1.4 --- SPECS/xorg-proto-evieext.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-evieext.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description EvIE protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fixesproto.spec diff -u SPECS/xorg-proto-fixesproto.spec:1.4 SPECS/xorg-proto-fixesproto.spec:1.5 --- SPECS/xorg-proto-fixesproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fixesproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fixes protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontcacheproto.spec diff -u SPECS/xorg-proto-fontcacheproto.spec:1.3 SPECS/xorg-proto-fontcacheproto.spec:1.4 --- SPECS/xorg-proto-fontcacheproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontcacheproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fontcache protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-fontsproto.spec diff -u SPECS/xorg-proto-fontsproto.spec:1.3 SPECS/xorg-proto-fontsproto.spec:1.4 --- SPECS/xorg-proto-fontsproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-fontsproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Fonts protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-inputproto.spec diff -u SPECS/xorg-proto-inputproto.spec:1.3 SPECS/xorg-proto-inputproto.spec:1.4 --- SPECS/xorg-proto-inputproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-inputproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Input protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-kbproto.spec diff -u SPECS/xorg-proto-kbproto.spec:1.3 SPECS/xorg-proto-kbproto.spec:1.4 --- SPECS/xorg-proto-kbproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-kbproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description KB protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-printproto.spec diff -u SPECS/xorg-proto-printproto.spec:1.3 SPECS/xorg-proto-printproto.spec:1.4 --- SPECS/xorg-proto-printproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-printproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Print protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-randrproto.spec diff -u SPECS/xorg-proto-randrproto.spec:1.4 SPECS/xorg-proto-randrproto.spec:1.5 --- SPECS/xorg-proto-randrproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-randrproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Randr protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-recordproto.spec diff -u SPECS/xorg-proto-recordproto.spec:1.4 SPECS/xorg-proto-recordproto.spec:1.5 --- SPECS/xorg-proto-recordproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-recordproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Record protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-renderproto.spec diff -u SPECS/xorg-proto-renderproto.spec:1.4 SPECS/xorg-proto-renderproto.spec:1.5 --- SPECS/xorg-proto-renderproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-renderproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Render protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-resourceproto.spec diff -u SPECS/xorg-proto-resourceproto.spec:1.4 SPECS/xorg-proto-resourceproto.spec:1.5 --- SPECS/xorg-proto-resourceproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-resourceproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Resource protocol and ancillary headers. @@ -68,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-scrnsaverproto.spec diff -u SPECS/xorg-proto-scrnsaverproto.spec:1.3 SPECS/xorg-proto-scrnsaverproto.spec:1.4 --- SPECS/xorg-proto-scrnsaverproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-scrnsaverproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description ScrnSaver protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-trapproto.spec diff -u SPECS/xorg-proto-trapproto.spec:1.3 SPECS/xorg-proto-trapproto.spec:1.4 --- SPECS/xorg-proto-trapproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-trapproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Trap protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-videoproto.spec diff -u SPECS/xorg-proto-videoproto.spec:1.3 SPECS/xorg-proto-videoproto.spec:1.4 --- SPECS/xorg-proto-videoproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-videoproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Video protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xcmiscproto.spec diff -u SPECS/xorg-proto-xcmiscproto.spec:1.3 SPECS/xorg-proto-xcmiscproto.spec:1.4 --- SPECS/xorg-proto-xcmiscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xcmiscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XCMisc protocol and ancillary headers. @@ -66,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xextproto.spec diff -u SPECS/xorg-proto-xextproto.spec:1.4 SPECS/xorg-proto-xextproto.spec:1.5 --- SPECS/xorg-proto-xextproto.spec:1.4 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xextproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XExt protocol and ancillary headers. @@ -69,6 +67,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86bigfontproto.spec diff -u SPECS/xorg-proto-xf86bigfontproto.spec:1.3 SPECS/xorg-proto-xf86bigfontproto.spec:1.4 --- SPECS/xorg-proto-xf86bigfontproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86bigfontproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86BigFont protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86dgaproto.spec diff -u SPECS/xorg-proto-xf86dgaproto.spec:1.3 SPECS/xorg-proto-xf86dgaproto.spec:1.4 --- SPECS/xorg-proto-xf86dgaproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86dgaproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DGA protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86driproto.spec diff -u SPECS/xorg-proto-xf86driproto.spec:1.3 SPECS/xorg-proto-xf86driproto.spec:1.4 --- SPECS/xorg-proto-xf86driproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86driproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86DRI protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86miscproto.spec diff -u SPECS/xorg-proto-xf86miscproto.spec:1.3 SPECS/xorg-proto-xf86miscproto.spec:1.4 --- SPECS/xorg-proto-xf86miscproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86miscproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Misc protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:42:48 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-proto-xf86rushproto.spec diff -u SPECS/xorg-proto-xf86rushproto.spec:1.3 SPECS/xorg-proto-xf86rushproto.spec:1.4 --- SPECS/xorg-proto-xf86rushproto.spec:1.3 Sat Aug 27 19:42:48 2005 +++ SPECS/xorg-proto-xf86rushproto.spec Sat Aug 27 21:32:50 2005 @@ -15,8 +15,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XF86Rush protocol and ancillary headers. @@ -67,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:32:50 wiget +- kill /usr/X11R6 + <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-proto-bigreqsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-compositeproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-damageproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-dmxproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-evieext.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fixesproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontcacheproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-fontsproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-inputproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-kbproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-printproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-randrproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-recordproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-renderproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-resourceproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-scrnsaverproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-trapproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-videoproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xcmiscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xextproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86bigfontproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86dgaproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86driproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86miscproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86rushproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xf86vidmodeproto.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-proto-xproxymanagementprotocol.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 21:33:31 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: vim2html.spec - updated to 1.46 - added -VIM_HOME patch, fi... In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:33:31 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.46 - added -VIM_HOME patch, fixed Source0 ---- Files affected: SPECS: vim2html.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/vim2html.spec diff -u SPECS/vim2html.spec:1.1 SPECS/vim2html.spec:1.2 --- SPECS/vim2html.spec:1.1 Sun May 2 13:41:10 2004 +++ SPECS/vim2html.spec Sat Aug 27 21:33:26 2005 @@ -2,13 +2,14 @@ Summary: Vim-editable file converter to HTML Summary(pl): Konwerter edytowalnych plik?w Vima do formatu HTML Name: vim2html -Version: 1.42 +Version: 1.46 Release: 1 License: GPL v2 Group: Applications/Text -Source0: http://norlug.org/~chipster/download_handler/cat5/%{name}-%{version}.tar.gz -# Source0-md5: da1a1c79b17181fdf3d69f2417f90e0b -URL: http://norlug.org/~chipster/vim2html +Source0: http://norlug.org/~chipster/resources/vim2html/%{name}-%{version}.tar.gz +# Source0-md5: 4fcccd28b2a28519bdc65e90120c7204 +URL: http://norlug.org/~chipster/vim2html/ +Patch0: %{name}-VIM_HOME.patch Requires: tidy BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -51,6 +53,10 @@ * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 19:33:26 darekr +- updated to 1.46 +- added -VIM_HOME patch, fixed Source0 + Revision 1.1 2004/05/02 11:41:10 yogib - added ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vim2html.spec?r1=1.1&r2=1.2&f=u From darekr at pld-linux.org Sat Aug 27 21:34:11 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: DISTFILES: vim2html-1.46.tar.gz Message-ID: <6091.1125171251@distfiles.pld-linux.org> Files fetched: 1 STORED: http://norlug.org/~chipster/resources/vim2html/vim2html-1.46.tar.gz 4fcccd28b2a28519bdc65e90120c7204 vim2html-1.46.tar.gz Size: 12065 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sat Aug 27 21:38:15 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:39 2005 Subject: SPECS: vis5d.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:38:15 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vis5d.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/vis5d.spec diff -u SPECS/vis5d.spec:1.17 SPECS/vis5d.spec:1.18 --- SPECS/vis5d.spec:1.17 Wed Mar 30 17:27:46 2005 +++ SPECS/vis5d.spec Sat Aug 27 21:38:10 2005 @@ -31,7 +31,7 @@ Summary: Vis5d - sample data Summary(pl): Vis5d - przyk?adowe dane Group: X11/Applications -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description data Sample data. @@ -43,7 +43,7 @@ Summary: Vis5d development information Summary(pl): Vis5d - informacje dla programist?w Group: Development -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel Vis5d development information. API and script info. @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/27 19:38:10 darekr +- strict deps + Revision 1.17 2005/03/30 15:27:46 darekr - missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vis5d.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sat Aug 27 21:38:14 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xorg-lib-libFS.spec, xorg-lib-libICE.spec, xorg-lib-libSM.s... In-Reply-To: References: Message-ID: Author: wiget Date: Sat Aug 27 19:38:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill /usr/X11R6 ---- Files affected: SPECS: xorg-lib-libFS.spec (1.3 -> 1.4) , xorg-lib-libICE.spec (1.4 -> 1.5) , xorg-lib-libSM.spec (1.5 -> 1.6) , xorg-lib-libX11.spec (1.4 -> 1.5) , xorg-lib-libXScrnSaver.spec (1.3 -> 1.4) , xorg-lib-libXTrap.spec (1.3 -> 1.4) , xorg-lib-libXau.spec (1.4 -> 1.5) , xorg-lib-libXaw.spec (1.4 -> 1.5) , xorg-lib-libXcomposite.spec (1.4 -> 1.5) , xorg-lib-libXcursor.spec (1.4 -> 1.5) , xorg-lib-libXdamage.spec (1.5 -> 1.6) , xorg-lib-libXdmcp.spec (1.4 -> 1.5) , xorg-lib-libXevie.spec (1.3 -> 1.4) , xorg-lib-libXext.spec (1.4 -> 1.5) , xorg-lib-libXfixes.spec (1.4 -> 1.5) , xorg-lib-libXfont.spec (1.5 -> 1.6) , xorg-lib-libXfontcache.spec (1.3 -> 1.4) , xorg-lib-libXft.spec (1.4 -> 1.5) , xorg-lib-libXi.spec (1.4 -> 1.5) , xorg-lib-libXinerama.spec (1.4 -> 1.5) , xorg-lib-libXmu.spec (1.4 -> 1.5) , xorg-lib-libXp.spec (1.4 -> 1.5) , xorg-lib-libXpm.spec (1.4 -> 1.5) , xorg-lib-libXprintAppUtil.spec (1.4 -> 1.5) , xorg-lib-libXprintUtil.spec (1.3 -> 1.4) , xorg-lib-libXrandr.spec (1.4 -> 1.5) , xorg-lib-libXrender.spec (1.4 -> 1.5) , xorg-lib-libXres.spec (1.4 -> 1.5) , xorg-lib-libXt.spec (1.4 -> 1.5) , xorg-lib-libXtst.spec (1.4 -> 1.5) , xorg-lib-libXv.spec (1.4 -> 1.5) , xorg-lib-libXvMC.spec (1.3 -> 1.4) , xorg-lib-libXxf86dga.spec (1.3 -> 1.4) , xorg-lib-libXxf86misc.spec (1.3 -> 1.4) , xorg-lib-libXxf86vm.spec (1.3 -> 1.4) , xorg-lib-libdmx.spec (1.3 -> 1.4) , xorg-lib-libfontenc.spec (1.4 -> 1.5) , xorg-lib-liblbxutil.spec (1.4 -> 1.5) , xorg-lib-liboldX.spec (1.3 -> 1.4) , xorg-lib-libxkbfile.spec (1.3 -> 1.4) , xorg-lib-libxkbui.spec (1.3 -> 1.4) , xorg-lib-xtrans.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libFS.spec diff -u SPECS/xorg-lib-libFS.spec:1.3 SPECS/xorg-lib-libFS.spec:1.4 --- SPECS/xorg-lib-libFS.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libFS.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description FS library. @@ -109,6 +107,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libICE.spec diff -u SPECS/xorg-lib-libICE.spec:1.4 SPECS/xorg-lib-libICE.spec:1.5 --- SPECS/xorg-lib-libICE.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libICE.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ Obsoletes: libICE BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Inter Client Exchange library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libSM.spec diff -u SPECS/xorg-lib-libSM.spec:1.5 SPECS/xorg-lib-libSM.spec:1.6 --- SPECS/xorg-lib-libSM.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libSM.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libSM BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Session Management library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libX11.spec diff -u SPECS/xorg-lib-libX11.spec:1.4 SPECS/xorg-lib-libX11.spec:1.5 --- SPECS/xorg-lib-libX11.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libX11.spec Sat Aug 27 21:38:03 2005 @@ -26,9 +26,6 @@ Obsoletes: libX11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X11 Base library. @@ -126,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXScrnSaver.spec diff -u SPECS/xorg-lib-libXScrnSaver.spec:1.3 SPECS/xorg-lib-libXScrnSaver.spec:1.4 --- SPECS/xorg-lib-libXScrnSaver.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXScrnSaver.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description XScrnSaver library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXTrap.spec diff -u SPECS/xorg-lib-libXTrap.spec:1.3 SPECS/xorg-lib-libXTrap.spec:1.4 --- SPECS/xorg-lib-libXTrap.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXTrap.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XTrap library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXau.spec diff -u SPECS/xorg-lib-libXau.spec:1.4 SPECS/xorg-lib-libXau.spec:1.5 --- SPECS/xorg-lib-libXau.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXau.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXau BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xau - Authorization Protocol for X. @@ -112,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXaw.spec diff -u SPECS/xorg-lib-libXaw.spec:1.4 SPECS/xorg-lib-libXaw.spec:1.5 --- SPECS/xorg-lib-libXaw.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXaw.spec Sat Aug 27 21:38:03 2005 @@ -20,9 +20,6 @@ Obsoletes: libXaw BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Athena Widgets library. @@ -118,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcomposite.spec diff -u SPECS/xorg-lib-libXcomposite.spec:1.4 SPECS/xorg-lib-libXcomposite.spec:1.5 --- SPECS/xorg-lib-libXcomposite.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcomposite.spec Sat Aug 27 21:38:03 2005 @@ -20,8 +20,6 @@ Obsoletes: libXcomposite BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Composite extension library. @@ -114,6 +112,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXcursor.spec diff -u SPECS/xorg-lib-libXcursor.spec:1.4 SPECS/xorg-lib-libXcursor.spec:1.5 --- SPECS/xorg-lib-libXcursor.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXcursor.spec Sat Aug 27 21:38:03 2005 @@ -21,9 +21,6 @@ Obsoletes: xcursor BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Cursor - client-side cursor loading library. @@ -120,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXdamage.spec diff -u SPECS/xorg-lib-libXdamage.spec:1.5 SPECS/xorg-lib-libXdamage.spec:1.6 --- SPECS/xorg-lib-libXdamage.spec:1.5 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXdamage.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdamage BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Damage extension library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXdmcp.spec diff -u SPECS/xorg-lib-libXdmcp.spec:1.4 SPECS/xorg-lib-libXdmcp.spec:1.5 --- SPECS/xorg-lib-libXdmcp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXdmcp.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXdmcp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Display Manager Control Protocol library. @@ -113,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXevie.spec diff -u SPECS/xorg-lib-libXevie.spec:1.3 SPECS/xorg-lib-libXevie.spec:1.4 --- SPECS/xorg-lib-libXevie.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXevie.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Evie extension library. @@ -110,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXext.spec diff -u SPECS/xorg-lib-libXext.spec:1.4 SPECS/xorg-lib-libXext.spec:1.5 --- SPECS/xorg-lib-libXext.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXext.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXext BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfixes.spec diff -u SPECS/xorg-lib-libXfixes.spec:1.4 SPECS/xorg-lib-libXfixes.spec:1.5 --- SPECS/xorg-lib-libXfixes.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfixes.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXfixes BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Fixes extension library. @@ -114,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfont.spec diff -u SPECS/xorg-lib-libXfont.spec:1.5 SPECS/xorg-lib-libXfont.spec:1.6 --- SPECS/xorg-lib-libXfont.spec:1.5 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfont.spec Sat Aug 27 21:38:03 2005 @@ -22,8 +22,6 @@ Obsoletes: libXfont BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X font library used by the X server. @@ -124,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.5 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXfontcache.spec diff -u SPECS/xorg-lib-libXfontcache.spec:1.3 SPECS/xorg-lib-libXfontcache.spec:1.4 --- SPECS/xorg-lib-libXfontcache.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXfontcache.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xfontcache library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.3 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXft.spec diff -u SPECS/xorg-lib-libXft.spec:1.4 SPECS/xorg-lib-libXft.spec:1.5 --- SPECS/xorg-lib-libXft.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXft.spec Sat Aug 27 21:38:03 2005 @@ -23,9 +23,6 @@ Obsoletes: xft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description Xft is a font rendering library for X. @@ -127,6 +124,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXi.spec diff -u SPECS/xorg-lib-libXi.spec:1.4 SPECS/xorg-lib-libXi.spec:1.5 --- SPECS/xorg-lib-libXi.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXi.spec Sat Aug 27 21:38:03 2005 @@ -18,9 +18,6 @@ Obsoletes: libXi BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description X Input extension library. @@ -111,6 +108,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXinerama.spec diff -u SPECS/xorg-lib-libXinerama.spec:1.4 SPECS/xorg-lib-libXinerama.spec:1.5 --- SPECS/xorg-lib-libXinerama.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXinerama.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXinerama BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description Xinerama extension library. @@ -111,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXmu.spec diff -u SPECS/xorg-lib-libXmu.spec:1.4 SPECS/xorg-lib-libXmu.spec:1.5 --- SPECS/xorg-lib-libXmu.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXmu.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: libXmu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Miscellaneous Utilities library. @@ -112,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXp.spec diff -u SPECS/xorg-lib-libXp.spec:1.4 SPECS/xorg-lib-libXp.spec:1.5 --- SPECS/xorg-lib-libXp.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXp.spec Sat Aug 27 21:38:03 2005 @@ -19,9 +19,6 @@ Obsoletes: libXp BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man - %description DtPrint extension library. @@ -113,6 +110,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXpm.spec diff -u SPECS/xorg-lib-libXpm.spec:1.4 SPECS/xorg-lib-libXpm.spec:1.5 --- SPECS/xorg-lib-libXpm.spec:1.4 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXpm.spec Sat Aug 27 21:38:03 2005 @@ -19,8 +19,6 @@ Obsoletes: xpm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description X Pixmap library. @@ -130,6 +128,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 17:56:06 qboosh - cleanups, ported back to Linux ================================================================ Index: SPECS/xorg-lib-libXprintAppUtil.spec diff -u SPECS/xorg-lib-libXprintAppUtil.spec:1.4 SPECS/xorg-lib-libXprintAppUtil.spec:1.5 --- SPECS/xorg-lib-libXprintAppUtil.spec:1.4 Sat Aug 27 20:46:09 2005 +++ SPECS/xorg-lib-libXprintAppUtil.spec Sat Aug 27 21:38:03 2005 @@ -17,8 +17,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 - %description XprintAppUtil library. @@ -108,6 +106,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:38:03 wiget +- kill /usr/X11R6 + Revision 1.4 2005/08/27 18:46:09 qboosh - just name in BuildRoot ================================================================ Index: SPECS/xorg-lib-libXprintUtil.spec diff -u SPECS/xorg-lib-libXprintUtil.spec:1.3 SPECS/xorg-lib-libXprintUtil.spec:1.4 --- SPECS/xorg-lib-libXprintUtil.spec:1.3 Sat Aug 27 19:56:06 2005 +++ SPECS/xorg-lib-libXprintUtil.spec Sat Aug 27 21:38:03 2005 @@ -18,8 +18,6 @@ BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/X11R6 <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libFS.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXScrnSaver.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXTrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXevie.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXfontcache.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintAppUtil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXprintUtil.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86misc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libXxf86vm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libdmx.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libfontenc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liblbxutil.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-liboldX.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbfile.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-libxkbui.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-lib-xtrans.spec?r1=1.5&r2=1.6&f=u From darekr at pld-linux.org Sat Aug 27 21:51:43 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: darkstat.spec - removed NEWS from %doc (see ChangeLog) In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 19:51:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed NEWS from %doc (see ChangeLog) ---- Files affected: SPECS: darkstat.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/darkstat.spec diff -u SPECS/darkstat.spec:1.4 SPECS/darkstat.spec:1.5 --- SPECS/darkstat.spec:1.4 Thu Aug 4 10:22:49 2005 +++ SPECS/darkstat.spec Sat Aug 27 21:51:36 2005 @@ -42,7 +42,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog README %attr(755,root,root) %{_sbindir}/* %{_mandir}/man1/* @@ -52,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 19:51:36 darekr +- removed NEWS from %doc (see ChangeLog) + Revision 1.4 2005/08/04 08:22:49 nail2k - URL fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/darkstat.spec?r1=1.4&r2=1.5&f=u From areq at pld-linux.org Sat Aug 27 22:00:32 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: linux-2.6.12.5.tar.bz2 mISDN-CVS-2005-07-06.tar.bz2 Message-ID: <12167.1125172832@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.5.tar.bz2 076f0dc714112c764c790fbaef19e228 linux-2.6.12.5.tar.bz2 STORED: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-CVS-2005-07-06.tar.bz2 f8892d49e00e3fa26e65e22084edd472 mISDN-CVS-2005-07-06.tar.bz2 Size: 259290 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 22:00:29 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS (LINUX_2_6): kernel.spec - add mISDN (ix86 only) In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:00:29 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - add mISDN (ix86 only) ---- Files affected: SPECS: kernel.spec (1.441.2.1168 -> 1.441.2.1169) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1168 SPECS/kernel.spec:1.441.2.1169 --- SPECS/kernel.spec:1.441.2.1168 Fri Aug 26 14:52:05 2005 +++ SPECS/kernel.spec Sat Aug 27 22:00:19 2005 @@ -105,7 +105,7 @@ %define _procps_ver 3.2.0 %define _oprofile_ver 0.5.3 -%define _rel 0.4 +%define _rel 0.5 %define _netfilter_snap 20050801 @@ -115,6 +115,7 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 +%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -168,6 +169,10 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config +Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 +# Source100-md5: f8892d49e00e3fa26e65e22084edd472 + + Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -621,7 +626,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} +%setup -q -n linux-%{version}%{_rc} -a 100 %patch0 -p1 %patch1 -p0 @@ -743,6 +748,12 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig +# mISDN +%ifarch %{ix86} +cd mISDN-%{mISDN_version} +./std2kern -k ../ +%endif + %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1490,6 +1501,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1169 2005/08/27 20:00:19 areq +- add mISDN (ix86 only) + Revision 1.441.2.1168 2005/08/26 12:52:05 baggins - uncommented atm patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1168&r2=1.441.2.1169&f=u From wiget at pld-linux.org Sat Aug 27 22:00:58 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:00:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanups, kill /usr/X11R6 ---- Files affected: SPECS: xorg-app-appres.spec (1.2 -> 1.3) , xorg-app-bdftopcf.spec (1.2 -> 1.3) , xorg-app-beforelight.spec (1.2 -> 1.3) , xorg-app-bitmap.spec (1.2 -> 1.3) , xorg-app-editres.spec (1.2 -> 1.3) , xorg-app-fonttosfnt.spec (1.2 -> 1.3) , xorg-app-fslsfonts.spec (1.2 -> 1.3) , xorg-app-fstobdf.spec (1.2 -> 1.3) , xorg-app-iceauth.spec (1.2 -> 1.3) , xorg-app-ico.spec (1.2 -> 1.3) , xorg-app-lbxproxy.spec (1.2 -> 1.3) , xorg-app-listres.spec (1.2 -> 1.3) , xorg-app-luit.spec (1.2 -> 1.3) , xorg-app-mkfontdir.spec (1.2 -> 1.3) , xorg-app-mkfontscale.spec (1.2 -> 1.3) , xorg-app-oclock.spec (1.2 -> 1.3) , xorg-app-pclcomp.spec (1.2 -> 1.3) , xorg-app-proxymngr.spec (1.2 -> 1.3) , xorg-app-rgb.spec (1.2 -> 1.3) , xorg-app-rstart.spec (1.2 -> 1.3) , xorg-app-scripts.spec (1.2 -> 1.3) , xorg-app-setxkbmap.spec (1.2 -> 1.3) , xorg-app-showfont.spec (1.2 -> 1.3) , xorg-app-smproxy.spec (1.2 -> 1.3) , xorg-app-twm.spec (1.2 -> 1.3) , xorg-app-viewres.spec (1.2 -> 1.3) , xorg-app-x11perf.spec (1.2 -> 1.3) , xorg-app-xauth.spec (1.2 -> 1.3) , xorg-app-xbiff.spec (1.2 -> 1.3) , xorg-app-xcalc.spec (1.2 -> 1.3) , xorg-app-xclipboard.spec (1.2 -> 1.3) , xorg-app-xclock.spec (1.2 -> 1.3) , xorg-app-xcmsdb.spec (1.2 -> 1.3) , xorg-app-xconsole.spec (1.2 -> 1.3) , xorg-app-xcursorgen.spec (1.2 -> 1.3) , xorg-app-xdbedizzy.spec (1.2 -> 1.3) , xorg-app-xditview.spec (1.2 -> 1.3) , xorg-app-xdpyinfo.spec (1.2 -> 1.3) , xorg-app-xedit.spec (1.2 -> 1.3) , xorg-app-xev.spec (1.2 -> 1.3) , xorg-app-xeyes.spec (1.2 -> 1.3) , xorg-app-xf86dga.spec (1.2 -> 1.3) , xorg-app-xfd.spec (1.2 -> 1.3) , xorg-app-xfontsel.spec (1.2 -> 1.3) , xorg-app-xfs.spec (1.2 -> 1.3) , xorg-app-xfsinfo.spec (1.2 -> 1.3) , xorg-app-xfwp.spec (1.2 -> 1.3) , xorg-app-xgamma.spec (1.2 -> 1.3) , xorg-app-xgc.spec (1.2 -> 1.3) , xorg-app-xhost.spec (1.2 -> 1.3) , xorg-app-xkbcomp.spec (1.2 -> 1.3) , xorg-app-xkbevd.spec (1.2 -> 1.3) , xorg-app-xkbprint.spec (1.2 -> 1.3) , xorg-app-xkbutils.spec (1.2 -> 1.3) , xorg-app-xkill.spec (1.2 -> 1.3) , xorg-app-xlogo.spec (1.2 -> 1 .3) , xorg-app-xlsatoms.spec (1.2 -> 1.3) , xorg-app-xlsclients.spec (1.2 -> 1.3) , xorg-app-xlsfonts.spec (1.2 -> 1.3) , xorg-app-xmag.spec (1.2 -> 1.3) , xorg-app-xman.spec (1.2 -> 1.3) , xorg-app-xmessage.spec (1.2 -> 1.3) , xorg-app-xmh.spec (1.2 -> 1.3) , xorg-app-xmodmap.spec (1.2 -> 1.3) , xorg-app-xmore.spec (1.2 -> 1.3) , xorg-app-xphelloworld.spec (1.2 -> 1.3) , xorg-app-xplsprinters.spec (1.2 -> 1.3) , xorg-app-xpr.spec (1.2 -> 1.3) , xorg-app-xprehashprinterlist.spec (1.2 -> 1.3) , xorg-app-xprop.spec (1.2 -> 1.3) , xorg-app-xrandr.spec (1.2 -> 1.3) , xorg-app-xrdb.spec (1.2 -> 1.3) , xorg-app-xrefresh.spec (1.2 -> 1.3) , xorg-app-xset.spec (1.2 -> 1.3) , xorg-app-xsetmode.spec (1.2 -> 1.3) , xorg-app-xsetpointer.spec (1.2 -> 1.3) , xorg-app-xsetroot.spec (1.2 -> 1.3) , xorg-app-xsm.spec (1.2 -> 1.3) , xorg-app-xstdcmap.spec (1.2 -> 1.3) , xorg-app-xtrap.spec (1.2 -> 1.3) , xorg-app-xvidtune.spec (1.2 -> 1.3) , xorg-app-xvinfo.spec (1.2 -> 1.3) , xorg-app-xwd.spec (1.2 -> 1.3) , xorg-app-xwininfo.spec (1.2 -> 1.3) , xorg-app-xwud.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.2 SPECS/xorg-app-appres.spec:1.3 --- SPECS/xorg-app-appres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3335 $, $Date$ -# Summary: appres application Summary(pl): Aplikacja appres Name: xorg-app-appres @@ -17,10 +15,7 @@ BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/appres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description appres application. @@ -28,12 +23,10 @@ %description -l pl Aplikacja appres. - %prep %setup -q -n appres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -43,30 +36,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/appres %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.2 SPECS/xorg-app-bdftopcf.spec:1.3 --- SPECS/xorg-app-bdftopcf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3336 $, $Date$ -# Summary: bdftopcf application Summary(pl): Aplikacja bdftopcf Name: xorg-app-bdftopcf @@ -16,10 +14,7 @@ BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/bdftopcf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bdftopcf application. @@ -27,11 +22,9 @@ %description -l pl Aplikacja bdftopcf. - %prep %setup -q -n bdftopcf-%{version} - %build %{__aclocal} %{__autoconf} @@ -41,30 +34,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.2 SPECS/xorg-app-beforelight.spec:1.3 --- SPECS/xorg-app-beforelight.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3339 $, $Date$ -# Summary: beforelight application Summary(pl): Aplikacja beforelight Name: xorg-app-beforelight @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/beforelight-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description beforelight application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja beforelight. - %prep %setup -q -n beforelight-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light %attr(755,root,wheel) %{_bindir}/beforelight %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.2 SPECS/xorg-app-bitmap.spec:1.3 --- SPECS/xorg-app-bitmap.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3345 $, $Date$ -# Summary: bitmap application Summary(pl): Aplikacja bitmap Name: xorg-app-bitmap @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/bitmap-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description bitmap application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja bitmap. - %prep %setup -q -n bitmap-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,18 +37,15 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* @@ -63,13 +53,15 @@ %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.2 SPECS/xorg-app-editres.spec:1.3 --- SPECS/xorg-app-editres.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3340 $, $Date$ -# Summary: editres application Summary(pl): Aplikacja editres Name: xorg-app-editres @@ -18,10 +16,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/editres-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description editres application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja editres. - %prep %setup -q -n editres-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,31 +37,30 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.2 SPECS/xorg-app-fonttosfnt.spec:1.3 --- SPECS/xorg-app-fonttosfnt.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3341 $, $Date$ -# Summary: fonttosfnt application Summary(pl): Aplikacja fonttosfnt Name: xorg-app-fonttosfnt @@ -20,10 +18,7 @@ BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps -BuildRoot: %{tmpdir}/fonttosfnt-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fonttosfnt application. @@ -31,12 +26,10 @@ %description -l pl Aplikacja fonttosfnt. - %prep %setup -q -n fonttosfnt-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -46,30 +39,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.2 SPECS/xorg-app-fslsfonts.spec:1.3 --- SPECS/xorg-app-fslsfonts.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3342 $, $Date$ -# Summary: fslsfonts application Summary(pl): Aplikacja fslsfonts Name: xorg-app-fslsfonts @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fslsfonts-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fslsfonts application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fslsfonts. - %prep %setup -q -n fslsfonts-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.2 SPECS/xorg-app-fstobdf.spec:1.3 --- SPECS/xorg-app-fstobdf.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3344 $, $Date$ -# Summary: fstobdf application Summary(pl): Aplikacja fstobdf Name: xorg-app-fstobdf @@ -18,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/fstobdf-%{version}-root-%(id -u -n) - -%define _prefix /usr/X11R6 -%define _mandir %{_prefix}/man +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description fstobdf application. @@ -29,12 +24,10 @@ %description -l pl Aplikacja fstobdf. - %prep %setup -q -n fstobdf-%{version} %patch0 -p1 - %build %{__aclocal} %{__autoconf} @@ -44,30 +37,29 @@ %{__make} - %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(644,root,root,755) %attr(755,root,wheel) %{_bindir}/* %{_mandir}/man1/*.1* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:00:44 wiget +- cleanups, kill /usr/X11R6 + Revision 1.2 2005/08/27 17:42:47 wiget - s/pkg-config/pkgconfig/ in BR: ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.2 SPECS/xorg-app-iceauth.spec:1.3 --- SPECS/xorg-app-iceauth.spec:1.2 Sat Aug 27 19:42:47 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:00:44 2005 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# $Rev: 3346 $, $Date$ -# Summary: iceauth application Summary(pl): Aplikacja iceauth Name: xorg-app-iceauth @@ -8,7 +6,6 @@ Release: 0.02 License: MIT Group: X11/Application -###### Unknown group! Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/iceauth-%{version}.tar.bz2 # Source0-md5: 64ac4d6ebaf4eec9cdc4d968e0e9840b Patch0: iceauth-man.patch @@ -19,10 +16,7 @@ BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 -BuildRoot: %{tmpdir}/iceauth-%{version}-root-%(id -u -n) - <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.2&r2=1.3&f=u From darekr at pld-linux.org Sat Aug 27 22:01:39 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vkeybd.spec - kill obsolete "-c" install option In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:01:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - kill obsolete "-c" install option ---- Files affected: SPECS: vkeybd.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vkeybd.spec diff -u SPECS/vkeybd.spec:1.13 SPECS/vkeybd.spec:1.14 --- SPECS/vkeybd.spec:1.13 Fri Nov 5 08:29:06 2004 +++ SPECS/vkeybd.spec Sat Aug 27 22:01:32 2005 @@ -47,8 +47,8 @@ %{__make} install-all \ DESTDIR=$RPM_BUILD_ROOT -install -c %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd -install -c %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vkeybd +install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} mv $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd.png rm -f $RPM_BUILD_ROOT%{_pixmapsdir}/vkeybd_* @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:01:32 darekr +- kill obsolete "-c" install option + Revision 1.13 2004/11/05 07:29:06 ankry - amd64 build fix, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vkeybd.spec?r1=1.13&r2=1.14&f=u From areq at pld-linux.org Sat Aug 27 22:01:34 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES (LINUX_2_6): kernel-i386-smp.config, kernel-i386.config - ... In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 20:01:34 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - MISDN ---- Files affected: SOURCES: kernel-i386-smp.config (1.59.10.104 -> 1.59.10.105) , kernel-i386.config (1.82.10.109 -> 1.82.10.110) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386-smp.config diff -u SOURCES/kernel-i386-smp.config:1.59.10.104 SOURCES/kernel-i386-smp.config:1.59.10.105 --- SOURCES/kernel-i386-smp.config:1.59.10.104 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386-smp.config Sat Aug 27 22:01:28 2005 @@ -1122,6 +1122,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1464,7 +1465,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.109 SOURCES/kernel-i386.config:1.82.10.110 --- SOURCES/kernel-i386.config:1.82.10.109 Fri Aug 26 12:51:12 2005 +++ SOURCES/kernel-i386.config Sat Aug 27 22:01:28 2005 @@ -1136,6 +1136,7 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1480,7 +1481,64 @@ # # ISDN subsystem # -# CONFIG_ISDN is not set +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +# CONFIG_ISDN_I4L is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +CONFIG_MISDN_MEMDEBUG=n +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_HFCPCI=y +CONFIG_MISDN_HFCMULTI=y +CONFIG_HFCMULTI_PCIMEM=y +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y # # Telephony Support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.104&r2=1.59.10.105&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.109&r2=1.82.10.110&f=u From wiget at pld-linux.org Sat Aug 27 22:04:21 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: wiget Date: Sat Aug 27 20:04:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - standard permisions to binaries ---- Files affected: SPECS: xorg-app-appres.spec (1.3 -> 1.4) , xorg-app-bdftopcf.spec (1.3 -> 1.4) , xorg-app-beforelight.spec (1.3 -> 1.4) , xorg-app-bitmap.spec (1.3 -> 1.4) , xorg-app-editres.spec (1.3 -> 1.4) , xorg-app-fonttosfnt.spec (1.3 -> 1.4) , xorg-app-fslsfonts.spec (1.3 -> 1.4) , xorg-app-fstobdf.spec (1.3 -> 1.4) , xorg-app-iceauth.spec (1.3 -> 1.4) , xorg-app-ico.spec (1.3 -> 1.4) , xorg-app-lbxproxy.spec (1.3 -> 1.4) , xorg-app-listres.spec (1.3 -> 1.4) , xorg-app-luit.spec (1.3 -> 1.4) , xorg-app-mkfontdir.spec (1.3 -> 1.4) , xorg-app-mkfontscale.spec (1.3 -> 1.4) , xorg-app-oclock.spec (1.3 -> 1.4) , xorg-app-pclcomp.spec (1.3 -> 1.4) , xorg-app-proxymngr.spec (1.3 -> 1.4) , xorg-app-rgb.spec (1.3 -> 1.4) , xorg-app-rstart.spec (1.3 -> 1.4) , xorg-app-scripts.spec (1.3 -> 1.4) , xorg-app-setxkbmap.spec (1.3 -> 1.4) , xorg-app-showfont.spec (1.3 -> 1.4) , xorg-app-smproxy.spec (1.3 -> 1.4) , xorg-app-twm.spec (1.3 -> 1.4) , xorg-app-viewres.spec (1.3 -> 1.4) , xorg-app-x11perf.spec (1.3 -> 1.4) , xorg-app-xauth.spec (1.3 -> 1.4) , xorg-app-xbiff.spec (1.3 -> 1.4) , xorg-app-xcalc.spec (1.3 -> 1.4) , xorg-app-xclipboard.spec (1.3 -> 1.4) , xorg-app-xclock.spec (1.3 -> 1.4) , xorg-app-xcmsdb.spec (1.3 -> 1.4) , xorg-app-xconsole.spec (1.3 -> 1.4) , xorg-app-xcursorgen.spec (1.3 -> 1.4) , xorg-app-xdbedizzy.spec (1.3 -> 1.4) , xorg-app-xditview.spec (1.3 -> 1.4) , xorg-app-xdpyinfo.spec (1.3 -> 1.4) , xorg-app-xedit.spec (1.3 -> 1.4) , xorg-app-xev.spec (1.3 -> 1.4) , xorg-app-xeyes.spec (1.3 -> 1.4) , xorg-app-xf86dga.spec (1.3 -> 1.4) , xorg-app-xfd.spec (1.3 -> 1.4) , xorg-app-xfontsel.spec (1.3 -> 1.4) , xorg-app-xfs.spec (1.3 -> 1.4) , xorg-app-xfsinfo.spec (1.3 -> 1.4) , xorg-app-xfwp.spec (1.3 -> 1.4) , xorg-app-xgamma.spec (1.3 -> 1.4) , xorg-app-xgc.spec (1.3 -> 1.4) , xorg-app-xhost.spec (1.3 -> 1.4) , xorg-app-xkbcomp.spec (1.3 -> 1.4) , xorg-app-xkbevd.spec (1.3 -> 1.4) , xorg-app-xkbprint.spec (1.3 -> 1.4) , xorg-app-xkbutils.spec (1.3 -> 1.4) , xorg-app-xkill.spec (1.3 -> 1.4) , xorg-app-xlogo.spec (1.3 -> 1 .4) , xorg-app-xlsatoms.spec (1.3 -> 1.4) , xorg-app-xlsclients.spec (1.3 -> 1.4) , xorg-app-xlsfonts.spec (1.3 -> 1.4) , xorg-app-xmag.spec (1.3 -> 1.4) , xorg-app-xman.spec (1.3 -> 1.4) , xorg-app-xmessage.spec (1.3 -> 1.4) , xorg-app-xmh.spec (1.3 -> 1.4) , xorg-app-xmodmap.spec (1.3 -> 1.4) , xorg-app-xmore.spec (1.3 -> 1.4) , xorg-app-xphelloworld.spec (1.3 -> 1.4) , xorg-app-xplsprinters.spec (1.3 -> 1.4) , xorg-app-xpr.spec (1.3 -> 1.4) , xorg-app-xprehashprinterlist.spec (1.3 -> 1.4) , xorg-app-xprop.spec (1.3 -> 1.4) , xorg-app-xrandr.spec (1.3 -> 1.4) , xorg-app-xrdb.spec (1.3 -> 1.4) , xorg-app-xrefresh.spec (1.3 -> 1.4) , xorg-app-xset.spec (1.3 -> 1.4) , xorg-app-xsetmode.spec (1.3 -> 1.4) , xorg-app-xsetpointer.spec (1.3 -> 1.4) , xorg-app-xsetroot.spec (1.3 -> 1.4) , xorg-app-xsm.spec (1.3 -> 1.4) , xorg-app-xstdcmap.spec (1.3 -> 1.4) , xorg-app-xtrap.spec (1.3 -> 1.4) , xorg-app-xvidtune.spec (1.3 -> 1.4) , xorg-app-xvinfo.spec (1.3 -> 1.4) , xorg-app-xwd.spec (1.3 -> 1.4) , xorg-app-xwininfo.spec (1.3 -> 1.4) , xorg-app-xwud.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.3 SPECS/xorg-app-appres.spec:1.4 --- SPECS/xorg-app-appres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/appres +%attr(755,root,root) %{_bindir}/appres %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.3 SPECS/xorg-app-bdftopcf.spec:1.4 --- SPECS/xorg-app-bdftopcf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/bdftopcf +%attr(755,root,root) %{_bindir}/bdftopcf %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.3 SPECS/xorg-app-beforelight.spec:1.4 --- SPECS/xorg-app-beforelight.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/B4light -%attr(755,root,wheel) %{_bindir}/beforelight +%attr(755,root,root) %{_bindir}/beforelight %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.3 SPECS/xorg-app-bitmap.spec:1.4 --- SPECS/xorg-app-bitmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_includedir}/X11/bitmaps/* %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.3 SPECS/xorg-app-editres.spec:1.4 --- SPECS/xorg-app-editres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.3 SPECS/xorg-app-fonttosfnt.spec:1.4 --- SPECS/xorg-app-fonttosfnt.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.3 SPECS/xorg-app-fslsfonts.spec:1.4 --- SPECS/xorg-app-fslsfonts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.3 SPECS/xorg-app-fstobdf.spec:1.4 --- SPECS/xorg-app-fstobdf.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.3 SPECS/xorg-app-iceauth.spec:1.4 --- SPECS/xorg-app-iceauth.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.3 SPECS/xorg-app-ico.spec:1.4 --- SPECS/xorg-app-ico.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.3 SPECS/xorg-app-lbxproxy.spec:1.4 --- SPECS/xorg-app-lbxproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 22:04:01 2005 @@ -54,7 +54,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.3 SPECS/xorg-app-listres.spec:1.4 --- SPECS/xorg-app-listres.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.3 SPECS/xorg-app-luit.spec:1.4 --- SPECS/xorg-app-luit.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 22:04:01 2005 @@ -50,7 +50,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.3 SPECS/xorg-app-mkfontdir.spec:1.4 --- SPECS/xorg-app-mkfontdir.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 22:04:01 2005 @@ -44,7 +44,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.3 SPECS/xorg-app-mkfontscale.spec:1.4 --- SPECS/xorg-app-mkfontscale.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.3 SPECS/xorg-app-oclock.spec:1.4 --- SPECS/xorg-app-oclock.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 22:04:01 2005 @@ -48,7 +48,7 @@ %files %defattr(644,root,root,755) %{_sysconfdir}/X11/app-defaults/* -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.3 SPECS/xorg-app-pclcomp.spec:1.4 --- SPECS/xorg-app-pclcomp.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 22:04:01 2005 @@ -46,7 +46,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.3 SPECS/xorg-app-proxymngr.spec:1.4 --- SPECS/xorg-app-proxymngr.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 22:04:01 2005 @@ -49,7 +49,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/proxymngr/pmconfig %{_mandir}/man1/*.1* @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.3 SPECS/xorg-app-rgb.spec:1.4 --- SPECS/xorg-app-rgb.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/rgb.txt %{_mandir}/man1/*.1* @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.3 SPECS/xorg-app-rstart.spec:1.4 --- SPECS/xorg-app-rstart.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 22:04:01 2005 @@ -47,9 +47,9 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_libdir}/X11/rstart/config -%attr(755,root,wheel) %{_libdir}/X11/rstart/rstartd.real +%attr(755,root,root) %{_libdir}/X11/rstart/rstartd.real %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.3 SPECS/xorg-app-scripts.spec:1.4 --- SPECS/xorg-app-scripts.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.3 SPECS/xorg-app-setxkbmap.spec:1.4 --- SPECS/xorg-app-setxkbmap.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 22:04:01 2005 @@ -45,7 +45,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-showfont.spec diff -u SPECS/xorg-app-showfont.spec:1.3 SPECS/xorg-app-showfont.spec:1.4 --- SPECS/xorg-app-showfont.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-showfont.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-smproxy.spec diff -u SPECS/xorg-app-smproxy.spec:1.3 SPECS/xorg-app-smproxy.spec:1.4 --- SPECS/xorg-app-smproxy.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-smproxy.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:04:01 wiget +- standard permisions to binaries + Revision 1.3 2005/08/27 20:00:44 wiget - cleanups, kill /usr/X11R6 ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.3 SPECS/xorg-app-twm.spec:1.4 --- SPECS/xorg-app-twm.spec:1.3 Sat Aug 27 22:00:44 2005 +++ SPECS/xorg-app-twm.spec Sat Aug 27 22:04:01 2005 @@ -47,7 +47,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,wheel) %{_bindir}/* +%attr(755,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.3&r2=1.4&f=u From darekr at pld-linux.org Sat Aug 27 22:04:57 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vera.spec - cosmetics, added %doc In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:04:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics, added %doc ---- Files affected: SPECS: vera.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/vera.spec diff -u SPECS/vera.spec:1.7 SPECS/vera.spec:1.8 --- SPECS/vera.spec:1.7 Fri Jul 11 14:28:24 2003 +++ SPECS/vera.spec Sat Aug 27 22:04:52 2005 @@ -9,8 +9,8 @@ Source0: ftp://ftp.gnu.org/gnu/vera/%{name}-%{version}.tar.gz # Source0-md5: ed6120dd9739c71580a92868a34776b0 Patch0: %{name}-direntry.patch -BuildRequires: texinfo URL: http://www.sacredchao.net/software/reed/ +BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -29,6 +29,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_infodir} + install vera.info* $RPM_BUILD_ROOT%{_infodir} %clean @@ -42,6 +43,7 @@ %files %defattr(644,root,root,755) +%doc README %{_infodir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -50,6 +52,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:04:52 darekr +- cosmetics, added %doc + Revision 1.7 2003/07/11 12:28:24 ankry - URL fixes and other cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vera.spec?r1=1.7&r2=1.8&f=u From darekr at pld-linux.org Sat Aug 27 22:16:07 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vdkbuilder.spec - added -devel subpackage In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:16:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added -devel subpackage ---- Files affected: SPECS: vdkbuilder.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.13 SPECS/vdkbuilder.spec:1.14 --- SPECS/vdkbuilder.spec:1.13 Sun Oct 31 15:59:29 2004 +++ SPECS/vdkbuilder.spec Sat Aug 27 22:16:00 2005 @@ -28,6 +28,18 @@ VDKBuilder jest narz?dziem RAD bazuj?cym na VDK, bibliotece wrapuj?cej znan? bibliotek? widget?w - GTK+. +%package devel +Summary: Header files for vdkbuilder +Summary(pl): Pliki nag??wkowe bibliotek vdkbuilder +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +vdkbuilder header files. + +%description devel -l pl +Pliki nag??wkowe blibliotek vdkbuilder. + %prep %setup -q @@ -58,18 +70,24 @@ %doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* -%{_libdir}/lib*.la -%{_includedir}/vdkb2 %{_mandir}/man1/* %{_pixmapsdir}/*.png %{_datadir}/vdkb2 +%files devel +%defattr(644,root,root,755) +%{_libdir}/lib*.la +%{_includedir}/vdkb2 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 20:16:00 darekr +- added -devel subpackage + Revision 1.13 2004/10/31 14:59:29 paladine - spaces->tabs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.13&r2=1.14&f=u From darekr at pld-linux.org Sat Aug 27 22:17:21 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vdk.spec - strict deps In-Reply-To: References: Message-ID: Author: darekr Date: Sat Aug 27 20:17:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict deps ---- Files affected: SPECS: vdk.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.22 SPECS/vdk.spec:1.23 --- SPECS/vdk.spec:1.22 Sat Nov 27 19:52:09 2004 +++ SPECS/vdk.spec Sat Aug 27 22:17:16 2005 @@ -37,7 +37,7 @@ Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: gtk+2-devel >= 2.0.0 %description devel @@ -50,7 +50,7 @@ Summary: VDK static libraries Summary(pl): Biblioteki statyczne VDK Group: X11/Development/Libraries -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{version}-%{release} %description static VDK static libraries. @@ -115,6 +115,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:17:16 darekr +- strict deps + Revision 1.22 2004/11/27 18:52:09 saq - massive attack: add missing gtk+2-devel epoch in BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sat Aug 27 22:23:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: xchm-pl.po-update.patch (NEW) - pl.po update In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:23:50 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - pl.po update ---- Files affected: SOURCES: xchm-pl.po-update.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchm-pl.po-update.patch diff -u /dev/null SOURCES/xchm-pl.po-update.patch:1.1 --- /dev/null Sat Aug 27 22:23:50 2005 +++ SOURCES/xchm-pl.po-update.patch Sat Aug 27 22:23:45 2005 @@ -0,0 +1,32 @@ +--- xchm-1.1/po/pl.po.orig 2005-08-26 22:39:37.000000000 +0200 ++++ xchm-1.1/po/pl.po 2005-08-27 20:55:48.746583032 +0200 +@@ -1,15 +1,15 @@ + # Polish translation for xchm. + # This file is distributed under the same license as the xchm package. +-# Jakub Bogusz , 2004. ++# Jakub Bogusz , 2004-2005. + # + # vi:encoding=utf-8 + # + msgid "" + msgstr "" +-"Project-Id-Version: xchm 0.9\n" ++"Project-Id-Version: xchm 1.1\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-08-26 23:39+0300\n" +-"PO-Revision-Date: 2004-03-01 22:50+0100\n" ++"PO-Revision-Date: 2005-08-27 20:52+0200\n" + "Last-Translator: Jakub Bogusz \n" + "Language-Team: Polish \n" + "MIME-Version: 1.0\n" +@@ -241,9 +241,8 @@ + msgstr "W &ty??" + + #: src/chmhtmlwindow.cpp:43 +-#, fuzzy + msgid "Copy &link location" +-msgstr "&Kopiuj zaznaczenie" ++msgstr "Kopiuj po??o??enie &odno??nika" + + #: src/chmhtmlwindow.cpp:46 + msgid "&Copy selection" ================================================================ From qboosh at pld-linux.org Sat Aug 27 22:24:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xchm.spec - added pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:24:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added pl.po-update patch ---- Files affected: SPECS: xchm.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/xchm.spec diff -u SPECS/xchm.spec:1.37 SPECS/xchm.spec:1.38 --- SPECS/xchm.spec:1.37 Sat Aug 27 16:25:23 2005 +++ SPECS/xchm.spec Sat Aug 27 22:24:44 2005 @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/xchm/%{name}-%{version}.tar.gz # Source0-md5: 801ce6a079e559bc5b7d814e86861500 Source1: %{name}.desktop +Patch0: %{name}-pl.po-update.patch URL: http://xchm.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -27,6 +28,9 @@ %prep %setup -q +%patch0 -p1 + +rm -f po/stamp-po %build %{__gettextize} @@ -67,6 +71,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:24:44 qboosh +- added pl.po-update patch + Revision 1.37 2005/08/27 14:25:23 paladine - updated to 1.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchm.spec?r1=1.37&r2=1.38&f=u From arekm at pld-linux.org Sat Aug 27 22:28:11 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: dspam.spec - add verbose bcond In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 20:28:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add verbose bcond ---- Files affected: SPECS: dspam.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/dspam.spec diff -u SPECS/dspam.spec:1.37 SPECS/dspam.spec:1.38 --- SPECS/dspam.spec:1.37 Wed Aug 10 15:48:34 2005 +++ SPECS/dspam.spec Sat Aug 27 22:28:06 2005 @@ -18,6 +18,7 @@ %bcond_with pgsql # enable PostgreSQL storage driver (disable sqlite/mysql driver) %bcond_with sqlite # enable SQLite3 storage driver %bcond_with daemon +%bcond_with verbose %if %{with mysql} && %{with pgsql} %undefine with_pgsql @@ -178,6 +179,7 @@ %{__autoconf} %{__automake} %configure \ + %{?with_verbose: --enable-debug --enable-verbose-debug} \ --enable-trusted-user-security \ --enable-bayesian-dobly \ --enable-chained-tokens \ @@ -368,6 +370,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.38 2005/08/27 20:28:06 arekm +- add verbose bcond + Revision 1.37 2005/08/10 13:48:34 glen - make it possible to have all db backend bconds on at same time (for future) - fixes to make vim syntax work properly ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.37&r2=1.38&f=u From qboosh at pld-linux.org Sat Aug 27 22:41:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: man-man2html.patch (REMOVED) - outdated In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:41:07 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - outdated ---- Files affected: SOURCES: man-man2html.patch (1.8 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: Sman-0.96.tar.gz Message-ID: <17354.1125175619@distfiles.pld-linux.org> Files fetched: 1 STORED: http://joshr.com/src/sman/Sman-0.96.tar.gz fe3bf53899b35dd7b0e736ea290d4641 Sman-0.96.tar.gz Size: 27053 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sat Aug 27 22:46:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: Sman.spec - up to 0.96 In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:46:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.96 ---- Files affected: SPECS: Sman.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.2 SPECS/Sman.spec:1.3 --- SPECS/Sman.spec:1.2 Wed Aug 24 19:50:07 2005 +++ SPECS/Sman.spec Sat Aug 27 22:46:54 2005 @@ -7,13 +7,13 @@ Summary: Searcher for Man pages Summary(pl): Wyszukiwarka stron Man Name: Sman -Version: 0.95 +Version: 0.96 Release: 0.1 # "same as perl" License: Artistic Group: Development/Languages/Perl Source0: http://joshr.com/src/sman/%{name}-%{version}.tar.gz -# Source0-md5: b786338eba068a4a110bf2bbda51e695 +# Source0-md5: fe3bf53899b35dd7b0e736ea290d4641 URL: http://joshr.com/src/sman/ BuildRequires: perl-Cache-Cache BuildRequires: perl-Compress-Zlib @@ -121,6 +121,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 20:46:54 twittner +- up to 0.96 + Revision 1.2 2005/08/24 17:50:07 qboosh - pl, missing dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 22:47:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: serialmail.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:47:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: serialmail.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/serialmail.spec diff -u SPECS/serialmail.spec:1.22 SPECS/serialmail.spec:1.23 --- SPECS/serialmail.spec:1.22 Sat Jul 23 17:58:55 2005 +++ SPECS/serialmail.spec Sat Aug 27 22:47:52 2005 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # TODO # - check license -Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities. -Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty. +Summary: Qmail Mail Transfer Agent - Serial Mail Delivery Utilities +Summary(pl): Qmail Mail Transfer Agent - Narz?dzie do dostarczenia poczty Name: serialmail Version: 0.75 Release: 1 @@ -16,13 +16,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -serialmail is a collection of tools for passing mail across serial links. It -works with qmail: you use qmail to deliver messages to a maildir, and then -serialmail to deliver messages out of the maildir. +serialmail is a collection of tools for passing mail across serial +links. It works with qmail: you use qmail to deliver messages to a +maildir, and then serialmail to deliver messages out of the maildir. serialmail supports SMTP, including ESMTP PIPELINING, and QMTP. -#description -l pl +%description -l pl +serialmail to zestaw narz?dzi do przekazywania poczty po ??czach +szeregowych. Dzia?a z qmailem - qmaila u?ywa si? do dostarczania +wiadomo?ci do maildir?w, a nast?pnie serialmaila do dostarczania +wiadomo?ci z maildir?w. %prep %setup -q @@ -61,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/27 20:47:52 qboosh +- pl desc + Revision 1.22 2005/07/23 15:58:55 glen - more appropriate license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/serialmail.spec?r1=1.22&r2=1.23&f=u From twittner at pld-linux.org Sat Aug 27 22:50:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: Sman.spec - added _noautoreq 'perl(Sman::IndexVersion)' In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 20:50:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added _noautoreq 'perl(Sman::IndexVersion)' ---- Files affected: SPECS: Sman.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/Sman.spec diff -u SPECS/Sman.spec:1.3 SPECS/Sman.spec:1.4 --- SPECS/Sman.spec:1.3 Sat Aug 27 22:46:54 2005 +++ SPECS/Sman.spec Sat Aug 27 22:50:23 2005 @@ -24,6 +24,8 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'perl(Sman::IndexVersion)' + %description Sman is the Searcher for Man pages. Based on the example of the same name in Josh Rabinowitz's article "How To Index Anything" in the July, @@ -121,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/27 20:50:23 twittner +- added _noautoreq 'perl(Sman::IndexVersion)' + Revision 1.3 2005/08/27 20:46:54 twittner - up to 0.96 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Sman.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sat Aug 27 22:50:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: ayam.spec - removed unused prefix define, some cleanups In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:50:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed unused prefix define, some cleanups ---- Files affected: SPECS: ayam.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/ayam.spec diff -u SPECS/ayam.spec:1.7 SPECS/ayam.spec:1.8 --- SPECS/ayam.spec:1.7 Thu Jul 21 12:57:24 2005 +++ SPECS/ayam.spec Sat Aug 27 22:50:22 2005 @@ -16,8 +16,6 @@ BuildRequires: tk-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define prefix /usr - %description Ayam is a free (as in free speech, BSD-licensed) 3D modelling environment for the RenderMan interface. Free means that neither the @@ -75,13 +73,12 @@ %build mv src/affine/src/write.c src/affine/src/write.cpp -# TODO: optflags %{__make} -C src -f Makefile.shared clean +# TODO: optflags %{__make} -C src -f Makefile.shared %install rm -rf $RPM_BUILD_ROOT -# create directories if necessary install -d $RPM_BUILD_ROOT %{__make} -C src -f Makefile.shared install \ @@ -93,16 +90,9 @@ %files %defattr(644,root,root,755) %doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO - -# if _sysconfdir != /etc: -#%%dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/* - %attr(755,root,root) %{_bindir}/* - %{_datadir}/%{name} - -# initscript and its config %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} @@ -112,6 +102,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/27 20:50:22 qboosh +- removed unused prefix define, some cleanups + Revision 1.7 2005/07/21 10:57:24 cieciwa - removed precompilant and building oncagain. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ayam.spec?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sat Aug 27 22:57:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: syslogger.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 20:57:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: syslogger.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/syslogger.spec diff -u SPECS/syslogger.spec:1.4 SPECS/syslogger.spec:1.5 --- SPECS/syslogger.spec:1.4 Wed May 28 15:02:09 2003 +++ SPECS/syslogger.spec Sat Aug 27 22:56:58 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -Summary: copy lines from stdin to syslog -Summary(pl): kopiowanie linii ze standardowego wej?cia do sysloga +# TODO: optflags +Summary: Copy lines from stdin to syslog +Summary(pl): Kopiowanie linii ze standardowego wej?cia do sysloga Name: syslogger Version: 1.03 Release: 1 @@ -13,7 +14,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Syslogger copies lines from the standard input, and logs them to syslog. +Syslogger copies lines from the standard input, and logs them to +syslog. %description -l pl Syslogger kopiuje linie ze standardowego wej?cia i zapisuje je do @@ -30,7 +32,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8} - install %{name} $RPM_BUILD_ROOT%{_bindir} install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -48,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 20:56:58 qboosh +- cosmetics + Revision 1.4 2003/05/28 13:02:09 malekith - massive attack: source-md5 @@ -60,4 +64,3 @@ Revision 1.1 2003/03/03 09:19:50 zagrodzki - initial revision - STBR - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/syslogger.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:01:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: OilWar.spec - cleanup/cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:01:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanup/cosmetics ---- Files affected: SPECS: OilWar.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/OilWar.spec diff -u SPECS/OilWar.spec:1.11 SPECS/OilWar.spec:1.12 --- SPECS/OilWar.spec:1.11 Mon Aug 18 10:07:52 2003 +++ SPECS/OilWar.spec Sat Aug 27 23:01:41 2005 @@ -12,10 +12,10 @@ Source2: %{name}.desktop Patch0: %{name}-am_remove_install-data-local.patch URL: http://www.2ndpoint.fi/projektit/oilwar.html -BuildRequires: autoconf -BuildRequires: automake BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel +BuildRequires: autoconf +BuildRequires: automake BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -25,17 +25,16 @@ the mother land... %description -l pl -OilWar jest prost? gr? w kt?rej strzelasz do ?o?nierzy i czo?g?w -nieprzyjaciela za pomoc? myszki. Armia wroga atakuje twoje terytorium -i stara si? ukra?? zasoby oleju. Twoja misja: zniszczy? naje?d?c?w, -chroni? olej, chroni? ojczyzn?... +OilWar jest prost? gr? w kt?rej strzela si? do ?o?nierzy i czo?g?w +nieprzyjaciela za pomoc? myszki. Armia wroga atakuje terytorium gracza +i stara si? ukra?? zasoby oleju. Misja: zniszczy? naje?d?c?w, chroni? +olej, chroni? ojczyzn?... %prep -%setup -q +%setup -q %patch0 -p1 %build -rm -f missing %{__aclocal} %{__autoconf} %{__automake} @@ -69,7 +68,11 @@ %changelog * %{date} PLD Team All persons listed below can be reached at @pld-linux.org + $Log$ +Revision 1.12 2005/08/27 21:01:41 qboosh +- cleanup/cosmetics + Revision 1.11 2003/08/18 08:07:52 gotar - mass commit: cosmetics (removed trailing white spaces) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/OilWar.spec?r1=1.11&r2=1.12&f=u From paladine at pld-linux.org Sat Aug 27 23:02:37 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: dbus.spec - updated to 0.36.1 In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:02:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.36.1 ---- Files affected: SPECS: dbus.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/dbus.spec diff -u SPECS/dbus.spec:1.93 SPECS/dbus.spec:1.94 --- SPECS/dbus.spec:1.93 Wed Aug 24 17:08:15 2005 +++ SPECS/dbus.spec Sat Aug 27 23:02:32 2005 @@ -22,12 +22,12 @@ Summary: D-BUS message bus Summary(pl): Magistrala przesy?ania komunikat?w D-BUS Name: dbus -Version: 0.36 +Version: 0.36.1 Release: 0.1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: c969d0a11599e5950fb28eeed8b353ba +# Source0-md5: 48bcfc0806bb7bc914cc5cd2f7d40d69 Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -545,6 +545,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.94 2005/08/27 21:02:32 paladine +- updated to 0.36.1 + Revision 1.93 2005/08/24 15:08:15 paladine - updated to 0.36 - removed python_types patch (already in sources) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.93&r2=1.94&f=u From paladine at pld-linux.org Sat Aug 27 23:02:44 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: dbus-0.36.1.tar.gz Message-ID: <7426.1125176564@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dbus.freedesktop.org/releases/dbus-0.36.1.tar.gz 48bcfc0806bb7bc914cc5cd2f7d40d69 dbus-0.36.1.tar.gz Size: 1596804 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sat Aug 27 23:11:48 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: capi4k-utils.spec - 2005.07.18 In-Reply-To: References: Message-ID: Author: areq Date: Sat Aug 27 21:11:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 2005.07.18 ---- Files affected: SPECS: capi4k-utils.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/capi4k-utils.spec diff -u SPECS/capi4k-utils.spec:1.12 SPECS/capi4k-utils.spec:1.13 --- SPECS/capi4k-utils.spec:1.12 Sun May 22 01:43:23 2005 +++ SPECS/capi4k-utils.spec Sat Aug 27 23:11:40 2005 @@ -6,14 +6,14 @@ Summary(de): CAPI 2.0 Werkzeuge f?r verschiedene ISDN Karten Summary(pl): Biblioteki i narz?dzia konfiguracyjne CAPI 2.0 Name: capi4k-utils -Version: 2004.10.06 -Release: 3 +Version: 2005.07.18 +Release: 1 License: GPL Group: Applications/Communications -Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2004-10-06.tar.gz -# Source0-md5: 54992ff362ca44629fdf59773a6864cd +Source0: ftp://ftp.in-berlin.de/pub/capi4linux/%{name}-2005-07-18.tar.gz +# Source0-md5: c745759b6b3d64e19763727176648cdf Source1: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES -# Source1-md5: 054b9f2bf1b0c0fc1eb5010ca0c9380d +# Source1-md5: 03739a0170eba14f03f7dc7ccc58bba8 Source10: capi.conf Source11: capi.init Patch0: %{name}-make.patch @@ -259,6 +259,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/27 21:11:40 areq +- 2005.07.18 + Revision 1.12 2005/05/21 23:43:23 averne - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/capi4k-utils.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sat Aug 27 23:12:01 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: capi4k-utils-2005-07-18.tar.gz CHANGES Message-ID: <20352.1125177121@distfiles.pld-linux.org> Files fetched: 2 STORED: ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz c745759b6b3d64e19763727176648cdf capi4k-utils-2005-07-18.tar.gz Size: 862826 bytes STORED: ftp://ftp.in-berlin.de/pub/capi4linux/CHANGES 03739a0170eba14f03f7dc7ccc58bba8 CHANGES Size: 10191 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sat Aug 27 23:15:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xorg-lib-libXvMC.spec - it contains libXvMCW as well - obso... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:15:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - it contains libXvMCW as well - obsolete standalone version ---- Files affected: SPECS: xorg-lib-libXvMC.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-lib-libXvMC.spec diff -u SPECS/xorg-lib-libXvMC.spec:1.4 SPECS/xorg-lib-libXvMC.spec:1.5 --- SPECS/xorg-lib-libXvMC.spec:1.4 Sat Aug 27 21:38:03 2005 +++ SPECS/xorg-lib-libXvMC.spec Sat Aug 27 23:15:17 2005 @@ -17,6 +17,8 @@ BuildRequires: xorg-lib-libXv-devel BuildRequires: xorg-proto-videoproto-devel BuildRequires: xorg-util-util-macros +Provides: libXvMCW = %{version} +Obsoletes: libXvMCW BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,6 +33,8 @@ Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-lib-libXv-devel +Provides: libXvMCW-devel = %{version} +Obsoletes: libXvMCW-devel %description devel XvMC library. @@ -49,16 +53,18 @@ Summary(pl): Biblioteki statyczne libXvMC Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} +Provides: libXvMCW-static = %{version} +Obsoletes: libXvMCW-static %description static XvMC library. -This package contains the static libXvMC library. +This package contains the static libXvMC libraries. %description static -l pl Biblioteka XvMC. -Pakiet zawiera statyczn? bibliotek? libXvMC. +Pakiet zawiera statyczne biblioteki libXvMC. %prep %setup -q -n libXvMC-%{version} @@ -108,6 +114,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:15:17 qboosh +- it contains libXvMCW as well - obsolete standalone version + Revision 1.4 2005/08/27 19:38:03 wiget - kill /usr/X11R6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-lib-libXvMC.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sat Aug 27 23:18:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: ndisc6.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:18:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: ndisc6.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/ndisc6.spec diff -u SPECS/ndisc6.spec:1.2 SPECS/ndisc6.spec:1.3 --- SPECS/ndisc6.spec:1.2 Sat Aug 27 17:08:19 2005 +++ SPECS/ndisc6.spec Sat Aug 27 23:18:50 2005 @@ -1,6 +1,7 @@ # $Revision$, $Date$ -# +# TODO: optflags Summary: Neighbor Discovery tools for IPv6 +Summary(pl): Narz?dzia do rozpoznawania s?siad?w dla IPv6 Name: ndisc6 Version: 0.1.5 Release: 1 @@ -17,6 +18,14 @@ respectively. It is primarily meant for IPv6 networking diagnostics or to detect rogue IPv6 nodes or routers on an Ethernet segment. +%description -l pl +ndisc6 zawiera dwa ma?e narz?dzia dzia?aj?ce z linii polece? (ndisc6 i +rdisc6) wykonuj?ce odpowiednio ICMPv6 Neighbor Discovery +(rozpoznawanie s?siad?w) i ICMPv6 Router Discovery (rozpoznawanie +router?w). S? przeznaczone g??wnie do diagnostyki sieci IPv6 oraz +wykrywania bezprawnych w?z??w lub router?w IPv6 w segmencie sieci +Ethernet. + %prep %setup -q @@ -28,7 +37,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} install ndisc6 rdisc6 $RPM_BUILD_ROOT%{_sbindir} -install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install ndisc6.8 rdisc6.8 $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -45,9 +54,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/27 21:18:50 qboosh +- pl + Revision 1.2 2005/08/27 15:08:19 aredridel - adapterised Revision 1.1 2005/08/27 15:07:59 aredridel - added - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ndisc6.spec?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sat Aug 27 23:20:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: asterisk-chan_capi.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 21:20:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: asterisk-chan_capi.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/asterisk-chan_capi.spec diff -u SPECS/asterisk-chan_capi.spec:1.1 SPECS/asterisk-chan_capi.spec:1.2 --- SPECS/asterisk-chan_capi.spec:1.1 Sat Aug 27 16:26:43 2005 +++ SPECS/asterisk-chan_capi.spec Sat Aug 27 23:20:30 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Asterisk ISDN CAPI channel driver +Summary(pl): Sterownik kana?u CAPI ISDN dla Asteriska Name: asterisk-chan_capi Version: 0.5.4 Release: 0.1 @@ -7,7 +8,7 @@ Group: Applications Source0: http://dl.sourceforge.net/chan-capi/chan_capi-cm-%{version}.tar.gz # Source0-md5: a7a9c0f90395909ee06528f17fc608d2 -URL: http://sourceforge.net/projects/chan-capi +URL: http://sourceforge.net/projects/chan-capi/ BuildRequires: asterisk-devel BuildRequires: capi-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -16,6 +17,10 @@ ISDN CAPI Channel driver (chan_capi) for the Asterisk Open Source VOIP Platform. +%description -l pl +Sterownik kana?u CAPI ISDN (chan_capi) dla Asteriska - platformy VOIP +o otwartych ?r?d?ach. + %prep %setup -q -n chan_capi-%{version} @@ -45,7 +50,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 21:20:30 qboosh +- pl + Revision 1.1 2005/08/27 14:26:43 areq - init PLD spec - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asterisk-chan_capi.spec?r1=1.1&r2=1.2&f=u From paladine at pld-linux.org Sat Aug 27 23:25:58 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: hal-pld_policy.patch In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:25:58 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: ---- Files affected: SOURCES: hal-pld_policy.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.1 SOURCES/hal-pld_policy.patch:1.2 --- SOURCES/hal-pld_policy.patch:1.1 Sun Aug 7 21:53:42 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:25:53 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sat Aug 27 23:28:22 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: SPE.spec - up to 0.7.5.c (new working url for Source0) - SP... In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:28:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.7.5.c (new working url for Source0) - SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} - added desktop and icon files ---- Files affected: SPECS: SPE.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.15 SPECS/SPE.spec:1.16 --- SPECS/SPE.spec:1.15 Thu Jun 2 20:14:45 2005 +++ SPECS/SPE.spec Sat Aug 27 23:28:16 2005 @@ -1,24 +1,24 @@ # $Revision$, $Date$ # TODO: # - fix %%files (doc to %%doc, no .py, remove unused files) - -%define _wx 2.5.4.1 +%define _wx 2.6.1.0 %define _bl 2.35 Summary: SPE - Stani's Python Editor Summary(pl): SPE - pythonowy edytor Staniego Name: SPE -Version: 0.7.3.a +Version: 0.7.5.c Release: 0.1 License: LGPL 2.1+ (except sm library and sm_idle ) Group: Applications/Text -Source0: http://projects.blender.org/frs/download.php/271/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.zip -# Source0-md5: 52b1d02f179bab7a71b57f5698343230 +Source0: http://download.berlios.de/python/%{name}-%{version}-wx%{_wx}.-bl%{_bl}.tar.gz +# Source0-md5: c40a24a3ed79ebba8c4fb208c000f67c +Source1: %{name}.desktop +Source2: %{name}.png URL: http://spe.pycs.net/ BuildRequires: python BuildRequires: python-devel BuildRequires: python-modules -BuildRequires: unzip %pyrequires_eq python-modules Requires: python-wxPython >= %{_wx} BuildArch: noarch @@ -52,12 +52,17 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} python setup.py install \ --optimize=2 \ --root=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.py' -exec rm "{}" ";" +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} + +# SPE doesn't work without *.py files so don't remove them +#%%py_postclean %clean rm -rf $RPM_BUILD_ROOT @@ -67,6 +72,8 @@ %doc README.txt %attr(755,root,root) %{_bindir}/* %{py_sitescriptdir}/* +%{_desktopdir}/* +%{_pixmapsdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -74,6 +81,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/27 21:28:16 twittner +- up to 0.7.5.c (new working url for Source0) +- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- added desktop and icon files + Revision 1.15 2005/06/02 18:14:45 glen - findutils already required by rpm-build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.15&r2=1.16&f=u From twittner at pld-linux.org Sat Aug 27 23:28:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Message-ID: <10385.1125178130@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/python/SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz c40a24a3ed79ebba8c4fb208c000f67c SPE-0.7.5.c-wx2.6.1.0.-bl2.35.tar.gz Size: 2917691 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:29:00 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: hal-pld_policy.patch - reverted last commit In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:29:00 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - reverted last commit ---- Files affected: SOURCES: hal-pld_policy.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.2 SOURCES/hal-pld_policy.patch:1.3 --- SOURCES/hal-pld_policy.patch:1.2 Sat Aug 27 23:25:53 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:28:55 2005 @@ -1,6 +1,6 @@ -diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 -+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 +diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 ++++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 @@ -6,11 +6,11 @@ @@ -17,60 +17,7 @@ true -@@ -44,6 +44,19 @@ - - - -+ -+ -+ true -+ true -+ -+ -+ -+ true -+ -+ -+ true -+ -+ - - - -@@ -51,25 +64,25 @@ - auto - cdrom - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ cdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - -- cdrecorder -+ dvdwriter - - - -@@ -96,6 +109,9 @@ +@@ -96,6 +96,9 @@ @@ -80,18 +27,3 @@ true -@@ -195,5 +211,14 @@ - hald-addon-storage - - -+ -+ -+ -+ -+ -+ true -+ -+ -+ - - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.2&r2=1.3&f=u From paladine at pld-linux.org Sat Aug 27 23:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: hal-pld_policy.patch - some fixes from other distros In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:30:45 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - some fixes from other distros ---- Files affected: SOURCES: hal-pld_policy.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/hal-pld_policy.patch diff -u SOURCES/hal-pld_policy.patch:1.3 SOURCES/hal-pld_policy.patch:1.4 --- SOURCES/hal-pld_policy.patch:1.3 Sat Aug 27 23:28:55 2005 +++ SOURCES/hal-pld_policy.patch Sat Aug 27 23:30:40 2005 @@ -1,6 +1,6 @@ -diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi ---- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-05-13 20:41:20.000000000 +0200 -+++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-04 22:04:05.000000000 +0200 +diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi +--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:13:17.239258560 +0200 ++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi 2005-08-27 22:29:24.738176368 +0200 @@ -6,11 +6,11 @@ @@ -17,7 +17,60 @@ true -@@ -96,6 +96,9 @@ +@@ -44,6 +44,19 @@ + + + ++ ++ ++ true ++ true ++ ++ ++ ++ true ++ ++ ++ true ++ ++ + + + +@@ -51,25 +64,25 @@ + auto + cdrom + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ cdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + +- cdrecorder ++ dvdwriter + + + +@@ -96,6 +109,9 @@ @@ -27,3 +80,18 @@ true +@@ -195,5 +211,14 @@ + hald-addon-storage + + ++ ++ ++ ++ ++ ++ true ++ ++ ++ + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.3&r2=1.4&f=u From paladine at pld-linux.org Sat Aug 27 23:31:05 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: hal-0.5.4.tar.gz Message-ID: <14060.1125178265@distfiles.pld-linux.org> Files fetched: 1 STORED: http://freedesktop.org/~david/dist/hal-0.5.4.tar.gz 2f84ddbc22bc35baa9388e7794d1fa31 hal-0.5.4.tar.gz Size: 1476396 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sat Aug 27 23:31:01 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: hal.spec - merged from DEVEL and updated to final 0.5.4 - c... In-Reply-To: References: Message-ID: Author: paladine Date: Sat Aug 27 21:31:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL and updated to final 0.5.4 - changed and uncommented pld_policy patch - sorted %%configure options - dropped fstab-sync support again (back to pmount) ---- Files affected: SPECS: hal.spec (1.82 -> 1.83) ---- Diffs: ================================================================ Index: SPECS/hal.spec diff -u SPECS/hal.spec:1.82 SPECS/hal.spec:1.83 --- SPECS/hal.spec:1.82 Wed Aug 24 13:02:29 2005 +++ SPECS/hal.spec Sat Aug 27 23:30:56 2005 @@ -1,17 +1,18 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without docs # disable documentation building +%bcond_without docs # disable documentation building +%bcond_with fstab_sync # build with fstab-sync # Summary: HAL - Hardware Abstraction Layer Summary(pl): HAL - abstrakcyjna warstwa dost?pu do sprz?tu Name: hal -Version: 0.5.3 -Release: 3 +Version: 0.5.4 +Release: 0.1 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz -# Source0-md5: bc4005ef21c7c8bfe3444cf0f3fa6d68 +# Source0-md5: 2f84ddbc22bc35baa9388e7794d1fa31 Source1: %{name}daemon.init Source2: %{name}d.sysconfig Source3: %{name}-device-manager.desktop @@ -100,8 +101,8 @@ Summary(pl): Zarz?dca urz?dze? HALa dla GNOME Group: X11/Applications Requires: python-gnome-ui -Requires: python-pygtk-glade Requires: python-gnome-vfs +Requires: python-pygtk-glade Requires: %{name} = %{version}-%{release} %description device-manager @@ -114,9 +115,11 @@ %setup -q %patch0 -p1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 %build +%{__glib_gettextize} +%{__intltoolize} %{__libtoolize} %{__aclocal} %{__autoheader} @@ -124,19 +127,21 @@ %{__automake} %configure \ %{?with_docs:--enable-docbook-docs} \ + %{!?with_docs:--disable-docbook-docs} \ %{?with_docs:--enable-doxygen-docs} \ + %{!?with_docs:--disable-doxygen-docs} \ + %{?with_fstab_sync:--enable-fstab-sync} \ --enable-pcmcia-support \ --enable-selinux \ - --with-hwdata=%{_sysconfdir} \ - --enable-fstab-sync \ --enable-verbose-mode \ + --with-hwdata=%{_sysconfdir} \ --with-pid-file=%{_localstatedir}/run/hald.pid %{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ - $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir},/var/run/hald} \ + $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir}} \ $RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe} %{__make} install \ @@ -182,13 +187,10 @@ %attr(755,root,root) %{_bindir}/hal-set-property %attr(755,root,root) %{_bindir}/lshal %attr(755,root,root) %{_libdir}/hald-* -%{_mandir}/man8/fstab-sync.8* %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir}/%{name} - %{_sysconfdir}/%{name}/fdi %{_sysconfdir}/hotplug.d/default/* - %attr(754,root,root) /etc/rc.d/init.d/* %attr(755,root,root) %{_libdir}/hal.hotplug %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald @@ -196,7 +198,8 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/fdi -%dir /var/run/hald +%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*} +%{_examplesdir}/%{name}-%{version} %files libs %defattr(644,root,root,755) @@ -231,6 +234,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.83 2005/08/27 21:30:56 paladine +- merged from DEVEL and updated to final 0.5.4 +- changed and uncommented pld_policy patch +- sorted %%configure options +- dropped fstab-sync support again (back to pmount) + Revision 1.82 2005/08/24 11:02:29 paladine - changed pid file - commentedout pld_policy patch @@ -255,6 +264,19 @@ - dropped fstab-sync support (we got pmount now), fixed %%files, added missing hal.hotplug symlink (yeah, it works now like a charm), cleanup, dropped mount-options patch (not needed anymore), rel.1 + +Revision 1.75.2.4 2005/08/27 08:07:45 aredridel +- prevent docs building with --without docs + +Revision 1.75.2.3 2005/08/03 17:29:36 wiget +- don't duplicate %{_datadir}/%{name}/device-manger + +Revision 1.75.2.2 2005/08/03 10:26:38 freetz +- cosmetics + +Revision 1.75.2.1 2005/08/02 22:08:47 freetz +- for brave ones: 0.5.4 20050801 snap, fstab-sync bconded (we don't need it + anymore - obsoleted by pmount), more pldize macros Revision 1.75 2005/08/02 15:54:12 saq - reqs from NEWS ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.82&r2=1.83&f=u From twittner at pld-linux.org Sat Aug 27 23:43:28 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: FHS.spec, SPE.spec - fixed typos in my commitlogs In-Reply-To: References: Message-ID: Author: twittner Date: Sat Aug 27 21:43:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed typos in my commitlogs ---- Files affected: SPECS: FHS.spec (1.103 -> 1.104) , SPE.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/FHS.spec diff -u SPECS/FHS.spec:1.103 SPECS/FHS.spec:1.104 --- SPECS/FHS.spec:1.103 Thu Jun 30 22:15:26 2005 +++ SPECS/FHS.spec Sat Aug 27 23:43:22 2005 @@ -234,11 +234,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.104 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.103 2005/06/30 20:15:26 twittner - changed location for cgi programs: %%{_libdir}/cgi-bin -> %%{_prefix}/lib/cgi-bin . There's no need to have two different directories on - diffrent archs (/usr/lib vs. /usr/lib64 issue) - one + different archs (/usr/lib vs. /usr/lib64 issue) - one /usr/lib/cgi-bin is sufficient and good for all archs. - rel. 12 ================================================================ Index: SPECS/SPE.spec diff -u SPECS/SPE.spec:1.16 SPECS/SPE.spec:1.17 --- SPECS/SPE.spec:1.16 Sat Aug 27 23:28:16 2005 +++ SPECS/SPE.spec Sat Aug 27 23:43:22 2005 @@ -81,9 +81,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.17 2005/08/27 21:43:22 twittner +- fixed typos in my commitlogs + Revision 1.16 2005/08/27 21:28:16 twittner - up to 0.7.5.c (new working url for Source0) -- SPE doesn't work without *.py files - do remove them from %%{py_sitescriptdir} +- SPE doesn't work without *.py files - don't remove them from %%{py_sitescriptdir} - added desktop and icon files Revision 1.15 2005/06/02 18:14:45 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/FHS.spec?r1=1.103&r2=1.104&f=u http://cvs.pld-linux.org/SPECS/SPE.spec?r1=1.16&r2=1.17&f=u From qboosh at pld-linux.org Sat Aug 27 23:46:28 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: xorg-app-appres.spec, xorg-app-bdftopcf.spec, xorg-app-befo... In-Reply-To: Message-ID: Author: qboosh Date: Sat Aug 27 21:46:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sorted BRs ---- Files affected: SPECS: xorg-app-appres.spec (1.4 -> 1.5) , xorg-app-bdftopcf.spec (1.4 -> 1.5) , xorg-app-beforelight.spec (1.4 -> 1.5) , xorg-app-bitmap.spec (1.4 -> 1.5) , xorg-app-editres.spec (1.4 -> 1.5) , xorg-app-fonttosfnt.spec (1.4 -> 1.5) , xorg-app-fslsfonts.spec (1.4 -> 1.5) , xorg-app-fstobdf.spec (1.4 -> 1.5) , xorg-app-iceauth.spec (1.4 -> 1.5) , xorg-app-ico.spec (1.4 -> 1.5) , xorg-app-lbxproxy.spec (1.4 -> 1.5) , xorg-app-listres.spec (1.4 -> 1.5) , xorg-app-luit.spec (1.4 -> 1.5) , xorg-app-mkfontdir.spec (1.4 -> 1.5) , xorg-app-mkfontscale.spec (1.4 -> 1.5) , xorg-app-oclock.spec (1.4 -> 1.5) , xorg-app-pclcomp.spec (1.4 -> 1.5) , xorg-app-proxymngr.spec (1.4 -> 1.5) , xorg-app-rgb.spec (1.4 -> 1.5) , xorg-app-rstart.spec (1.4 -> 1.5) , xorg-app-scripts.spec (1.4 -> 1.5) , xorg-app-setxkbmap.spec (1.4 -> 1.5) , xorg-app-showfont.spec (1.4 -> 1.5) , xorg-app-smproxy.spec (1.4 -> 1.5) , xorg-app-twm.spec (1.4 -> 1.5) , xorg-app-viewres.spec (1.4 -> 1.5) , xorg-app-x11perf.spec (1.4 -> 1.5) , xorg-app-xauth.spec (1.4 -> 1.5) , xorg-app-xbiff.spec (1.4 -> 1.5) , xorg-app-xcalc.spec (1.4 -> 1.5) , xorg-app-xclipboard.spec (1.4 -> 1.5) , xorg-app-xclock.spec (1.4 -> 1.5) , xorg-app-xcmsdb.spec (1.4 -> 1.5) , xorg-app-xconsole.spec (1.4 -> 1.5) , xorg-app-xcursorgen.spec (1.4 -> 1.5) , xorg-app-xdbedizzy.spec (1.4 -> 1.5) , xorg-app-xditview.spec (1.4 -> 1.5) , xorg-app-xdpyinfo.spec (1.4 -> 1.5) , xorg-app-xedit.spec (1.4 -> 1.5) , xorg-app-xev.spec (1.4 -> 1.5) , xorg-app-xeyes.spec (1.4 -> 1.5) , xorg-app-xf86dga.spec (1.4 -> 1.5) , xorg-app-xfd.spec (1.4 -> 1.5) , xorg-app-xfontsel.spec (1.4 -> 1.5) , xorg-app-xfsinfo.spec (1.4 -> 1.5) , xorg-app-xfs.spec (1.4 -> 1.5) , xorg-app-xfwp.spec (1.4 -> 1.5) , xorg-app-xgamma.spec (1.4 -> 1.5) , xorg-app-xgc.spec (1.4 -> 1.5) , xorg-app-xhost.spec (1.4 -> 1.5) , xorg-app-xkbcomp.spec (1.4 -> 1.5) , xorg-app-xkbevd.spec (1.4 -> 1.5) , xorg-app-xkbprint.spec (1.4 -> 1.5) , xorg-app-xkbutils.spec (1.4 -> 1.5) , xorg-app-xkill.spec (1.4 -> 1.5) , xorg-app-xlogo.spec (1.4 -> 1 .5) , xorg-app-xlsatoms.spec (1.4 -> 1.5) , xorg-app-xlsclients.spec (1.4 -> 1.5) , xorg-app-xlsfonts.spec (1.4 -> 1.5) , xorg-app-xmag.spec (1.4 -> 1.5) , xorg-app-xman.spec (1.4 -> 1.5) , xorg-app-xmessage.spec (1.4 -> 1.5) , xorg-app-xmh.spec (1.4 -> 1.5) , xorg-app-xmodmap.spec (1.4 -> 1.5) , xorg-app-xmore.spec (1.4 -> 1.5) , xorg-app-xphelloworld.spec (1.4 -> 1.5) , xorg-app-xplsprinters.spec (1.4 -> 1.5) , xorg-app-xprehashprinterlist.spec (1.4 -> 1.5) , xorg-app-xprop.spec (1.4 -> 1.5) , xorg-app-xpr.spec (1.4 -> 1.5) , xorg-app-xrandr.spec (1.4 -> 1.5) , xorg-app-xrdb.spec (1.4 -> 1.5) , xorg-app-xrefresh.spec (1.4 -> 1.5) , xorg-app-xsetmode.spec (1.4 -> 1.5) , xorg-app-xsetpointer.spec (1.4 -> 1.5) , xorg-app-xsetroot.spec (1.4 -> 1.5) , xorg-app-xset.spec (1.4 -> 1.5) , xorg-app-xsm.spec (1.4 -> 1.5) , xorg-app-xstdcmap.spec (1.4 -> 1.5) , xorg-app-xtrap.spec (1.4 -> 1.5) , xorg-app-xvidtune.spec (1.4 -> 1.5) , xorg-app-xvinfo.spec (1.4 -> 1.5) , xorg-app-xwd.spec (1.4 -> 1.5) , xorg-app-xwininfo.spec (1.4 -> 1.5) , xorg-app-xwud.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/xorg-app-appres.spec diff -u SPECS/xorg-app-appres.spec:1.4 SPECS/xorg-app-appres.spec:1.5 --- SPECS/xorg-app-appres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-appres.spec Sat Aug 27 23:46:17 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bdftopcf.spec diff -u SPECS/xorg-app-bdftopcf.spec:1.4 SPECS/xorg-app-bdftopcf.spec:1.5 --- SPECS/xorg-app-bdftopcf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bdftopcf.spec Sat Aug 27 23:46:17 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-beforelight.spec diff -u SPECS/xorg-app-beforelight.spec:1.4 SPECS/xorg-app-beforelight.spec:1.5 --- SPECS/xorg-app-beforelight.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-beforelight.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-bitmap.spec diff -u SPECS/xorg-app-bitmap.spec:1.4 SPECS/xorg-app-bitmap.spec:1.5 --- SPECS/xorg-app-bitmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-bitmap.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-editres.spec diff -u SPECS/xorg-app-editres.spec:1.4 SPECS/xorg-app-editres.spec:1.5 --- SPECS/xorg-app-editres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-editres.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-lib-libXaw-devel -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-data-xbitmaps +BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fonttosfnt.spec diff -u SPECS/xorg-app-fonttosfnt.spec:1.4 SPECS/xorg-app-fonttosfnt.spec:1.5 --- SPECS/xorg-app-fonttosfnt.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fonttosfnt.spec Sat Aug 27 23:46:17 2005 @@ -13,11 +13,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-data-xbitmaps BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-data-xbitmaps BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fslsfonts.spec diff -u SPECS/xorg-app-fslsfonts.spec:1.4 SPECS/xorg-app-fslsfonts.spec:1.5 --- SPECS/xorg-app-fslsfonts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fslsfonts.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-fstobdf.spec diff -u SPECS/xorg-app-fstobdf.spec:1.4 SPECS/xorg-app-fstobdf.spec:1.5 --- SPECS/xorg-app-fstobdf.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-fstobdf.spec Sat Aug 27 23:46:17 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:17 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-iceauth.spec diff -u SPECS/xorg-app-iceauth.spec:1.4 SPECS/xorg-app-iceauth.spec:1.5 --- SPECS/xorg-app-iceauth.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-iceauth.spec Sat Aug 27 23:46:18 2005 @@ -12,10 +12,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-ico.spec diff -u SPECS/xorg-app-ico.spec:1.4 SPECS/xorg-app-ico.spec:1.5 --- SPECS/xorg-app-ico.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-ico.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-lbxproxy.spec diff -u SPECS/xorg-app-lbxproxy.spec:1.4 SPECS/xorg-app-lbxproxy.spec:1.5 --- SPECS/xorg-app-lbxproxy.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-lbxproxy.spec Sat Aug 27 23:46:18 2005 @@ -13,14 +13,14 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-liblbxutil-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 -BuildRequires: xorg-proto-xproxymanagementprotocol-devel BuildRequires: xorg-lib-xtrans-devel +BuildRequires: xorg-proto-bigreqsproto-devel +BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-listres.spec diff -u SPECS/xorg-app-listres.spec:1.4 SPECS/xorg-app-listres.spec:1.5 --- SPECS/xorg-app-listres.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-listres.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-luit.spec diff -u SPECS/xorg-app-luit.spec:1.4 SPECS/xorg-app-luit.spec:1.5 --- SPECS/xorg-app-luit.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-luit.spec Sat Aug 27 23:46:18 2005 @@ -13,10 +13,10 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontdir.spec diff -u SPECS/xorg-app-mkfontdir.spec:1.4 SPECS/xorg-app-mkfontdir.spec:1.5 --- SPECS/xorg-app-mkfontdir.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontdir.spec Sat Aug 27 23:46:18 2005 @@ -11,15 +11,15 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description mkfontdir application. %description -l pl -Aplikacja mkfontdir +Aplikacja mkfontdir. %prep %setup -q -n mkfontdir-%{version} @@ -53,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-mkfontscale.spec diff -u SPECS/xorg-app-mkfontscale.spec:1.4 SPECS/xorg-app-mkfontscale.spec:1.5 --- SPECS/xorg-app-mkfontscale.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-mkfontscale.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-oclock.spec diff -u SPECS/xorg-app-oclock.spec:1.4 SPECS/xorg-app-oclock.spec:1.5 --- SPECS/xorg-app-oclock.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-oclock.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-pclcomp.spec diff -u SPECS/xorg-app-pclcomp.spec:1.4 SPECS/xorg-app-pclcomp.spec:1.5 --- SPECS/xorg-app-pclcomp.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-pclcomp.spec Sat Aug 27 23:46:18 2005 @@ -12,8 +12,8 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,6 +55,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-proxymngr.spec diff -u SPECS/xorg-app-proxymngr.spec:1.4 SPECS/xorg-app-proxymngr.spec:1.5 --- SPECS/xorg-app-proxymngr.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-proxymngr.spec Sat Aug 27 23:46:18 2005 @@ -12,11 +12,11 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-app-lbxproxy BuildRequires: xorg-lib-libXt-devel -BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproxymanagementprotocol-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -59,6 +59,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rgb.spec diff -u SPECS/xorg-app-rgb.spec:1.4 SPECS/xorg-app-rgb.spec:1.5 --- SPECS/xorg-app-rgb.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rgb.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: xorg-util-util-macros BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-proto-xproto-devel +BuildRequires: xorg-util-util-macros BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,6 +57,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-rstart.spec diff -u SPECS/xorg-app-rstart.spec:1.4 SPECS/xorg-app-rstart.spec:1.5 --- SPECS/xorg-app-rstart.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-rstart.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -58,6 +58,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-scripts.spec diff -u SPECS/xorg-app-scripts.spec:1.4 SPECS/xorg-app-scripts.spec:1.5 --- SPECS/xorg-app-scripts.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-scripts.spec Sat Aug 27 23:46:18 2005 @@ -12,9 +12,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -56,6 +56,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs + Revision 1.4 2005/08/27 20:04:01 wiget - standard permisions to binaries ================================================================ Index: SPECS/xorg-app-setxkbmap.spec diff -u SPECS/xorg-app-setxkbmap.spec:1.4 SPECS/xorg-app-setxkbmap.spec:1.5 --- SPECS/xorg-app-setxkbmap.spec:1.4 Sat Aug 27 22:04:01 2005 +++ SPECS/xorg-app-setxkbmap.spec Sat Aug 27 23:46:18 2005 @@ -11,9 +11,9 @@ URL: http://xorg.freedesktop.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libxkbfile-devel BuildRequires: xorg-util-util-macros -BuildRequires: pkgconfig >= 0.19 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +54,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/27 21:46:18 qboosh +- sorted BRs <> ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-appres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bdftopcf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-beforelight.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-bitmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-editres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fonttosfnt.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fslsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-fstobdf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-iceauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-ico.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-lbxproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-listres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-luit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontdir.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-mkfontscale.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-oclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-pclcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-proxymngr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rgb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-rstart.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-scripts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-setxkbmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-showfont.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-smproxy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-viewres.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-x11perf.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xbiff.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcalc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclipboard.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xclock.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcmsdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xconsole.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xcursorgen.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdbedizzy.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xditview.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xdpyinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xedit.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xev.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xeyes.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xf86dga.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfontsel.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfsinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xfwp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgamma.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xgc.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xhost.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbcomp.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbevd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbprint.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkbutils.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xkill.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlogo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsatoms.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsclients.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xlsfonts.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmag.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xman.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmessage.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmodmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xmore.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xphelloworld.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xplsprinters.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprehashprinterlist.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xprop.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xpr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrandr.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrdb.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xrefresh.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetmode.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetpointer.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsetroot.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xset.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xsm.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xstdcmap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xtrap.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvidtune.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xvinfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwininfo.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/xorg-app-xwud.spec?r1=1.4&r2=1.5&f=u From arekm at pld-linux.org Sun Aug 28 00:01:51 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: python-pydspam.spec (NEW) - new; unfortunately only dspam 2... In-Reply-To: References: Message-ID: Author: arekm Date: Sat Aug 27 22:01:51 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new; unfortunately only dspam 2.x supported ---- Files affected: SPECS: python-pydspam.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u /dev/null SPECS/python-pydspam.spec:1.1 --- /dev/null Sun Aug 28 00:01:51 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:01:44 2005 @@ -0,0 +1,54 @@ +# $Revision$, $Date$ +Summary: Python interface for dspam library +Summary(pl): Interfejs Pythona do biblioteki dspam +%define module pydspam +Name: python-%{module} +Version: 1.1.9 +Release: 1 +License: GPL +Group: Libraries/Python +Source0: http://dl.sourceforge.net/pymilter/%{module}-%{version}.tar.gz +# Source0-md5: 1caff10d2fa3968ed8e0def126f74b40 +Patch0: %{name}-setup.patch +URL: http://www.bmsi.com/python/dspam.html +BuildRequires: dspam-devel +BuildRequires: python-devel >= 2.2.1 +%pyrequires_eq python-modules +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Python interface for dspam library. + +%description -l pl +Interfejs Pythona do biblioteki dspam + +%prep +%setup -q -n %{module}-%{version} +%patch0 -p1 + +%build + +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT + +python setup.py install --optimize=2 --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc NEWS dspam.html +%attr(755,root,root) %{py_sitedir}/*.so + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/27 22:01:44 arekm +- new; unfortunately only dspam 2.x supported + ================================================================ From arekm at pld-linux.org Sun Aug 28 00:01:56 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: pydspam-1.1.9.tar.gz Message-ID: <24796.1125180116@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/pymilter/pydspam-1.1.9.tar.gz 1caff10d2fa3968ed8e0def126f74b40 pydspam-1.1.9.tar.gz Size: 56996 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 00:04:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: python-pydspam.spec - cosmetics In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:04:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics ---- Files affected: SPECS: python-pydspam.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/python-pydspam.spec diff -u SPECS/python-pydspam.spec:1.1 SPECS/python-pydspam.spec:1.2 --- SPECS/python-pydspam.spec:1.1 Sun Aug 28 00:01:44 2005 +++ SPECS/python-pydspam.spec Sun Aug 28 00:04:46 2005 @@ -20,14 +20,13 @@ Python interface for dspam library. %description -l pl -Interfejs Pythona do biblioteki dspam +Interfejs Pythona do biblioteki dspam. %prep %setup -q -n %{module}-%{version} %patch0 -p1 %build - python setup.py build %install @@ -49,6 +48,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/27 22:04:46 qboosh +- cosmetics + Revision 1.1 2005/08/27 22:01:44 arekm - new; unfortunately only dspam 2.x supported - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-pydspam.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 00:05:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: crossmingw32-binutils.spec - updated to 2.16.91.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:05:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 ---- Files affected: SPECS: crossmingw32-binutils.spec (1.55 -> 1.56) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-binutils.spec diff -u SPECS/crossmingw32-binutils.spec:1.55 SPECS/crossmingw32-binutils.spec:1.56 --- SPECS/crossmingw32-binutils.spec:1.55 Mon Aug 15 02:22:31 2005 +++ SPECS/crossmingw32-binutils.spec Sun Aug 28 00:05:43 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - Mingw32 binutils Summary(tr): GNU geli?tirme ara?lar? - Mingw32 binutils Name: crossmingw32-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -113,6 +113,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.56 2005/08/27 22:05:43 qboosh +- updated to 2.16.91.0.3 + Revision 1.55 2005/08/15 00:22:31 qboosh - updated to 2.16.91.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-binutils.spec?r1=1.55&r2=1.56&f=u From qboosh at pld-linux.org Sun Aug 28 00:11:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: crossmingw32-pcre.spec - updated to 6.3 (fixes CAN-2005-249... In-Reply-To: References: Message-ID: Author: qboosh Date: Sat Aug 27 22:11:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 6.3 (fixes CAN-2005-2491) - removed obsolete cxx patch ---- Files affected: SPECS: crossmingw32-pcre.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/crossmingw32-pcre.spec diff -u SPECS/crossmingw32-pcre.spec:1.13 SPECS/crossmingw32-pcre.spec:1.14 --- SPECS/crossmingw32-pcre.spec:1.13 Sat Aug 6 15:30:27 2005 +++ SPECS/crossmingw32-pcre.spec Sun Aug 28 00:11:23 2005 @@ -3,13 +3,12 @@ Summary: Perl-Compatible Regular Expression library - Mingw32 cross version Summary(pl): Biblioteka perlowych wyra?e? regularnych - wersja skro?na dla Mingw32 Name: crossmingw32-%{realname} -Version: 6.2 +Version: 6.3 Release: 1 License: BSD (see LICENCE) Group: Libraries Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{realname}-%{version}.tar.bz2 -# Source0-md5: d8a2024eb56c331bb5c55601c3cd9ce1 -Patch0: pcre-cxx.patch +# Source0-md5: e6779ead12cd20fa055fb3a05b004f2c URL: http://www.pcre.org/ BuildRequires: autoconf BuildRequires: automake @@ -58,7 +57,6 @@ %prep %setup -q -n %{realname}-%{version} -%patch0 -p1 %build CC=%{target}-gcc ; export CC @@ -123,6 +121,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/27 22:11:23 qboosh +- updated to 6.3 (fixes CAN-2005-2491) +- removed obsolete cxx patch + Revision 1.13 2005/08/06 13:30:27 qboosh - updated to 6.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossmingw32-pcre.spec?r1=1.13&r2=1.14&f=u From aredridel at pld-linux.org Sun Aug 28 02:18:48 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: PTlink6.19.4.tar.gz Message-ID: <3131.1125188328@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.4.tar.gz e7c1ac8e0f6eb5486378b84d3949cc2b PTlink6.19.4.tar.gz Size: 786808 bytes -- Virtually Yours: distfiles. From aredridel at pld-linux.org Sun Aug 28 02:18:41 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: ircd-ptlink.spec - up to 6.19.4 In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 00:18:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 6.19.4 ---- Files affected: SPECS: ircd-ptlink.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/ircd-ptlink.spec diff -u SPECS/ircd-ptlink.spec:1.13 SPECS/ircd-ptlink.spec:1.14 --- SPECS/ircd-ptlink.spec:1.13 Sun May 1 19:31:30 2005 +++ SPECS/ircd-ptlink.spec Sun Aug 28 02:18:34 2005 @@ -9,12 +9,12 @@ Summary: Internet Relay Chat Server Summary(pl): Serwer IRC Name: ircd-ptlink -Version: 6.19.3 +Version: 6.19.4 Release: 1 License: GPL v2 Group: Daemons Source0: ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink%{version}.tar.gz -# Source0-md5: d46979f76e28757fedc508544dd0b5fa +# Source0-md5: e7c1ac8e0f6eb5486378b84d3949cc2b Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-config.patch @@ -64,7 +64,8 @@ %{__autoconf} CFLAGS="%{rpmcflags} %{?debug:-DDEBUGMODE}" %configure \ - %{?with_ipv6:--enable-ipv6} + %{?with_ipv6:--enable-ipv6} \ + --enable-utf-8 %{__make} \ LIBDIR=%{_libdir} @@ -117,7 +118,8 @@ %doc doc/{*.txt,*.conf,server-version-info,Tao-of-IRC.940110} doc_hybrid6/* CHANGES README %attr(755,root,root) %{_sbindir}/* %attr(770,root,ircd) %dir %{_sysconfdir} -%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ircd.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf +%attr(660,ircd,ircd) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.dconf %attr(754,root,root) /etc/rc.d/init.d/ircd %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/ircd %dir %{_libdir}/ircd @@ -131,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.14 2005/08/28 00:18:34 aredridel +- up to 6.19.4 + Revision 1.13 2005/05/01 17:31:30 glen - use %useradd/%groupadd macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ircd-ptlink.spec?r1=1.13&r2=1.14&f=u From twittner at pld-linux.org Sun Aug 28 02:25:11 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: vdkbuilder-ac_FLAGS.patch (NEW) - don't introduce own fla... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:25:11 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configue (for vdkbuilder-2.4.0) ---- Files affected: SOURCES: vdkbuilder-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder-ac_FLAGS.patch diff -u /dev/null SOURCES/vdkbuilder-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:25:11 2005 +++ SOURCES/vdkbuilder-ac_FLAGS.patch Sun Aug 28 02:25:06 2005 @@ -0,0 +1,37 @@ +diff -Nurb o.vdkbuilder2-2.4.0/configure.in n.vdkbuilder2-2.4.0/configure.in +--- o.vdkbuilder2-2.4.0/configure.in 2004-05-18 14:31:17.000000000 +0200 ++++ n.vdkbuilder2-2.4.0/configure.in 2005-08-28 01:40:11.341036792 +0200 +@@ -65,8 +65,6 @@ + dnl------------------- + AC_ARG_ENABLE(devel, [ --enable-devel[=yes/no] Compile VDKBuilder with all info for debug [default=no]],,enable_devel=no) + +-AC_ARG_ENABLE(opt, [ --enable-opt[=OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) +- + dnl AC_ARG_ENABLE(gnome,[ --enable-gnome=[yes/no] Enable use of gnome[default=no], not required if vdk was compiled with gnome-support], + dnl gnome=$enableval, gnome=no) + +@@ -85,22 +83,11 @@ + dnl check user options + dnl ------------------- + if test "x$enable_devel" = "xyes"; then +- cflag="-g" + AC_DEFINE(VDKBDEBUG) +-else +- cflag="-s" +-fi +- +-if test "x$enable_opt" != "xno"; then +- cflag="$cflag -O$enable_opt" +-fi +- +-if test "x$prefix" = "xNONE"; then +- prefix="/usr/local" + fi + +-CFLAGS="$cflag -I../include -Wall" +-CXXFLAGS="$cflag -I../include -Wall" ++CFLAGS="-I../include -Wall $CFLAGS" ++CXXFLAGS="-I../include -Wall $CXXFLAGS" + + dnl check vdkxdb support + if test "x$enable_vdkxdb" == "xyes"; then ================================================================ From twittner at pld-linux.org Sun Aug 28 02:26:50 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz Message-ID: <13583.1125188810@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz Size: 1079112 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 02:26:49 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vdkbuilder.spec - up to 2.4.0 - added -ac_FLAGS.patch (don'... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:26:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdkbuilder.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.14 SPECS/vdkbuilder.spec:1.15 --- SPECS/vdkbuilder.spec:1.14 Sat Aug 27 22:16:00 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 02:26:44 2005 @@ -2,19 +2,20 @@ Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder -Version: 2.0.1 -Release: 2 +Version: 2.4.0 +Release: 0.1 License: GPL Group: Development/Tools -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: 6a004c7a8ed51a30722383eb50ee69f8 +Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz +# Source0-md5: 91216ce6659e447862b2bdc7335074fc +Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: freetype-devel >= 2.0.0 BuildRequires: glib2-devel >= 2.0.0 BuildRequires: libtool -BuildRequires: vdk-devel >= 2.0.1 +BuildRequires: vdk-devel >= 2.4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _omf_dest_dir %(scrollkeeper-config --omfdir) @@ -41,10 +42,10 @@ Pliki nag??wkowe blibliotek vdkbuilder. %prep -%setup -q +%setup -q -n %{name}2-%{version} +%patch0 -p1 %build -#CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" %{__libtoolize} %{__aclocal} %{__autoconf} @@ -67,7 +68,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO TUTOR* example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* @@ -85,6 +86,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.15 2005/08/28 00:26:44 twittner +- up to 2.4.0 +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.14 2005/08/27 20:16:00 darekr - added -devel subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.14&r2=1.15&f=u From twittner at pld-linux.org Sun Aug 28 02:31:44 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: vdk-ac_FLAGS.patch (NEW) - don't introduce own flags - ho... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:31:44 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u /dev/null SOURCES/vdk-ac_FLAGS.patch:1.1 --- /dev/null Sun Aug 28 02:31:44 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 02:31:39 2005 @@ -0,0 +1,54 @@ +diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in +--- o.vdk-2.4.1/configure.in 2004-11-06 19:16:43.000000000 +0100 ++++ n.vdk-2.4.1/configure.in 2005-08-28 02:02:50.092475176 +0200 +@@ -2,8 +2,6 @@ + AC_PREREQ(2.52) + AC_INIT(vdk/vdk.h) + +-cflags_set=${CFLAGS+set} +- + VDK_VERSION_MAJOR=2 + VDK_VERSION_MINOR=4 + VDK_VERSION_MICRO=1 +@@ -121,28 +119,15 @@ + dnl ========================== + dnl user configurable options + dnl ========================== +-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) +-AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) ++AC_ARG_ENABLE(vdkdebug, [ --enable-vdkdebug=[no/yes] enable vdkdebug information [default=no]],,enable_debug=no) + AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) + dnl doxygen options + AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) + AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) + AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) + +-if test "x$enable_debug" = "xminimum"; then +- AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-s" +-else +- if test "x$enable_debug" = "xyes"; then ++if test "x$enable_vdkdebug" = "xyes"; then + AC_DEFINE(VDKDEBUG) +- CXXFLAGS="-g" +- else +- CXXFLAGS="-s" +- fi +-fi +- +-if test "x$enable_opt" != "xno"; then +- CXXFLAGS="$CXXFLAGS -O$enable_opt" + fi + + if test "x$enable_testvdk" = "xyes"; then +@@ -179,10 +164,6 @@ + TAG_SIGC="" + fi + +-if test "x$enable_devel" = "xyes"; then +- cflag="-g" +-fi +- + if test "x$enable_doc_latex" = "xyes"; then + GENERATE_LATEX=YES + # TAG_SIGC=USE_SIGCPLUSPLUS ================================================================ From twittner at pld-linux.org Sun Aug 28 02:39:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vdk.spec - up to 2.4.1 - removed -ac-am-fixes.patch (mostly... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 00:39:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary C(XX)FLAGS from %%configure) ---- Files affected: SPECS: vdk.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.23 SPECS/vdk.spec:1.24 --- SPECS/vdk.spec:1.23 Sat Aug 27 22:17:16 2005 +++ SPECS/vdk.spec Sun Aug 28 02:39:21 2005 @@ -1,21 +1,26 @@ # $Revision$, $Date$ +# +# Conditional build: +# +%bcond_without static_libs # don't build static libraries +# %include /usr/lib/rpm/macros.perl -Summary: C++ Wrapper over GTK+ 2.0.x library -Summary(pl): Wrapper C++ dla GTK+ 2.0.x +Summary: C++ Wrapper over GTK+ 2.x library +Summary(pl): Wrapper C++ dla GTK+ 2.x Name: vdk -Version: 2.0.3 -Release: 2 +Version: 2.4.1 +Release: 0.1 License: LGPL Group: X11/Libraries -Source0: http://dl.sourceforge.net/vdkbuilder/%{name}-%{version}.tar.gz -# Source0-md5: b76be21a0014d089c176442ba68bd3c7 -Patch0: %{name}-ac-am-fixes.patch -URL: http://vdkbuilder.sourceforge.net/ -BuildRequires: autoconf +Source0: http://kent.dl.sourceforge.net/sourceforge/vdklib/%{name}-%{version}.tar.gz +# Source0-md5: f388bf265a476880e98ddec7ac4e63f7 +Patch0: %{name}-ac_FLAGS.patch +URL: http://www.mariomotta.it/vdklib/ +BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.0.0 +BuildRequires: gtk+2-devel >= 1:2.4.0 BuildRequires: imlib-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel @@ -28,17 +33,17 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -C++ Wrapper over GTK+ 2.0.x library. +C++ Wrapper over GTK+ 2.x library. %description -l pl -Wrapper C++ dla GTK+ 2.0.x. +Wrapper C++ dla GTK+ 2.x. %package devel Summary: VDK header files, development documentation Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 2.0.0 +Requires: gtk+2-devel >= 1:2.4.0 %description devel Header files and development documentation for VDK library. @@ -70,7 +75,8 @@ %{__autoconf} %{__automake} %configure \ - --enable-static=yes + %{?with_static_libs:--enable-static=yes} \ + %{!?with_static_libs:--enable-static=no} %{__make} %{__make} docs @@ -104,10 +110,13 @@ %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_pkgconfigdir}/* +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/lib*.a +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -115,6 +124,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 00:39:21 twittner +- up to 2.4.1 +- removed -ac-am-fixes.patch (mostly contains content from vim backup files) +- added -ac_FLAGS.patch (don't introduce own flags - honor ordinary + C(XX)FLAGS from %%configure) + Revision 1.23 2005/08/27 20:17:16 darekr - strict deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.23&r2=1.24&f=u From twittner at pld-linux.org Sun Aug 28 02:39:38 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: DISTFILES: vdk-2.4.1.tar.gz Message-ID: <29335.1125189578@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kent.dl.sourceforge.net/sourceforge/vdklib/vdk-2.4.1.tar.gz f388bf265a476880e98ddec7ac4e63f7 vdk-2.4.1.tar.gz Size: 1062475 bytes -- Virtually Yours: distfiles. From twittner at pld-linux.org Sun Aug 28 03:01:25 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: vdk-ac_FLAGS.patch - don't append the same things (CXXFLA... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:01:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't append the same things (CXXFLAGS) twice. ---- Files affected: SOURCES: vdk-ac_FLAGS.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac_FLAGS.patch diff -u SOURCES/vdk-ac_FLAGS.patch:1.1 SOURCES/vdk-ac_FLAGS.patch:1.2 --- SOURCES/vdk-ac_FLAGS.patch:1.1 Sun Aug 28 02:31:39 2005 +++ SOURCES/vdk-ac_FLAGS.patch Sun Aug 28 03:01:19 2005 @@ -52,3 +52,25 @@ if test "x$enable_doc_latex" = "xyes"; then GENERATE_LATEX=YES # TAG_SIGC=USE_SIGCPLUSPLUS +diff -Nurb o.vdk-2.4.1/testvdk/Makefile.am n.vdk-2.4.1/testvdk/Makefile.am +--- o.vdk-2.4.1/testvdk/Makefile.am 2004-11-06 18:47:14.000000000 +0100 ++++ n.vdk-2.4.1/testvdk/Makefile.am 2005-08-28 02:45:08.377597184 +0200 +@@ -5,7 +5,6 @@ + EXTRA_PROGRAMS = testvdk testvdkstring + + INCLUDES = @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + testvdk_LDFLAGS = $(GTK_LIBS) + testvdk_LDADD = $(top_srcdir)/vdk/libvdk.la +diff -Nurb o.vdk-2.4.1/vdk/Makefile.am n.vdk-2.4.1/vdk/Makefile.am +--- o.vdk-2.4.1/vdk/Makefile.am 2004-11-06 18:47:10.000000000 +0100 ++++ n.vdk-2.4.1/vdk/Makefile.am 2005-08-28 02:45:22.032521320 +0200 +@@ -186,7 +186,6 @@ + -version-info $(LT_VDK_CURRENT):$(LT_VDK_REVISION):$(LT_VDK_AGE) + + INCLUDES = -I$(top_srcdir)/include @INCLUDES@ +-AM_CXXFLAGS = @CXXFLAGS@ + + AM_LDFLAGS = $(GTK_CFLAGS) + LIBS = $(GTK_LIBS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac_FLAGS.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:03:16 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: vdk-ac-am-fixes.patch - replaced by vdk-ac_FLAGS.patch In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:03:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/vdk-ac-am-fixes.patch diff -u SOURCES/vdk-ac-am-fixes.patch:1.1 SOURCES/vdk-ac-am-fixes.patch:1.2 --- SOURCES/vdk-ac-am-fixes.patch:1.1 Sat Apr 10 00:05:35 2004 +++ SOURCES/vdk-ac-am-fixes.patch Sun Aug 28 03:03:11 2005 @@ -47,722 +47,6 @@ dnl contrib/Makefile -diff -burN vdk-2.0.3-oryg/configure.in~ vdk-2.0.3/configure.in~ ---- vdk-2.0.3-oryg/configure.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in~ 2004-04-09 22:51:14.000000000 +0200 -@@ -0,0 +1,345 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ fi -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ -+AC_SUBST(SIGCDEFINE) -+ -+ -+if test "x$enable_testsigc" = "xyes" && test "$SIGCDEFINE" != ""; then -+ TESTSIGCVDK="testsigcvdk" -+ WITHTESTSIGCVDK="yes" -+else -+ TESTSIGCVDK="" -+ WITHTESTSIGCVDK="no" -+fi -+ -+AC_SUBST(TESTSIGCVDK) -+ -+dnl doxygen support -+ -+if test "x$enable_doc_html" = "xyes"; then -+ GENERATE_HTML=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_HTML=NO -+ TAG_SIGC="" -+fi -+ -+if test "x$enable_devel" = "xyes"; then -+ cflag="-g" -+fi -+ -+if test "x$enable_doc_latex" = "xyes"; then -+ GENERATE_LATEX=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_LATEX=NO -+fi -+ -+if test "x$enable_doc_man" = "xyes"; then -+ GENERATE_MAN=YES -+ TAG_SIGC=USE_SIGCPLUSPLUS -+else -+ GENERATE_MAN=NO -+ -+fi -+ -+AC_SUBST(GENERATE_HTML) -+AC_SUBST(GENERATE_LATEX) -+AC_SUBST(GENERATE_MAN) -+AC_SUBST(TAG_SIGC) -+ -+ -+GNOMEDEFINE="" -+GNOME_CFLAGS="" -+GNOME_LIBS="" -+GNOME_VDK="" -+ -+AC_SUBST(GNOMEDEFINE) -+AC_SUBST(GNOME_LIBS) -+AC_SUBST(GNOME_CFLAGS) -+AC_SUBST(GNOME_VDK) -+ -+# just to be fully gtk2.x compliant... -+dnlCXXFLAGS="$CXXFLAGS -DGTK_DISABLE_DEPRECATED -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+CXXFLAGS="$CXXFLAGS -Wall -Wcast-qual -Woverloaded-virtual -Wconversion -Wstrict-prototypes -Winline" -+ -+INCLUDES="$GTK_CFLAGS $SIGC_CFLAGS $SIGCDEFINE" -+ -+ -+dnl contrib/Makefile -+dnl testvdk/pixmap/Makefile -+dnl sigcvdktest/Makefile -+dnl vdk.spec \ -+ -+AC_OUTPUT([Makefile \ -+ vdk/Makefile \ -+ vdk/vdkfeatures.h \ -+ testvdk/Makefile \ -+ sigcvdktest/Makefile \ -+ example/Makefile \ -+ doc/Makefile \ -+ doc/doxy/Makefile \ -+ doc/doxy/Doxyfile \ -+ vdk-2.m4 \ -+ vdk-config-2], \ -+ [chmod +x vdk-config-2]) -+ -+if test -z $DOXYGEN; then -+ echo "*****************************************************"; -+ echo "* doxygen was not found, i will not be able to *"; -+ echo "* generate the docs by myself. *"; -+ echo "* Doxygen is recommended, please check: *"; -+ echo "* http://www.doxygen.org/download.html *"; -+ echo "* for the latest version of doxygen. *"; -+ echo "*****************************************************"; -+ WITHDOCHTML="no" -+else -+ WITHDOCHTML="yes" -+fi -+ -+echo "" -+echo "VDK configure finished" -+echo "VDK configuration:" -+echo " - Version : $VERSION" -+echo " - Make static lib : $enable_static" -+echo " - Make vdk test program : $enable_testvdk" -+echo " - Libsigc++ signal extension support: $WITHSIGC" -+echo " - Make signal extension test program: $WITHTESTSIGCVDK" -+if test "x$WITHSIGC" = "xyes"; then -+echo "**************************************************************" -+echo "You have choosed to use Libsigc++ with VDK which is" -+echo "deprecated and will be unsupported in the near future" -+echo "**************************************************************" -+fi -+echo " - Gnome support : $WITHGNOME" -+echo " - Debug : $enable_debug" -+echo " - Optimization : $enable_opt" -+echo " - Make docs on html format : $WITHDOCHTML" -+echo " * Host : $host" -+echo " * Installation Prefix : $prefix" -+echo " * Compiler version :" `g++ --version` -+echo " * Target machine :" `c++ -dumpmachine` -+#echo " * CPU :" `cat /proc/cpuinfo` -diff -burN vdk-2.0.3-oryg/configure.in-oryg vdk-2.0.3/configure.in-oryg ---- vdk-2.0.3-oryg/configure.in-oryg 1970-01-01 01:00:00.000000000 +0100 -+++ vdk-2.0.3/configure.in-oryg 2004-04-09 22:40:13.000000000 +0200 -@@ -0,0 +1,362 @@ -+dnl configure.in for VDK -+AC_PREREQ(2.52) -+AC_INIT(vdk/vdk.h) -+ -+cflags_set=${CFLAGS+set} -+ -+VDK_VERSION_MAJOR=2 -+VDK_VERSION_MINOR=0 -+VDK_VERSION_MICRO=3 -+ -+ -+dnl put the right date here as we release a new version -+VDK_RELEASE_DATE="02-25-2003" -+ -+VDK_VERSION=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR.$VDK_VERSION_MICRO -+ -+AC_SUBST(VDK_VERSION_MAJOR) -+AC_SUBST(VDK_VERSION_MINOR) -+AC_SUBST(VDK_VERSION_MICRO) -+AC_SUBST(VDK_VERSION) -+AC_SUBST(VDK_RELEASE_DATE) -+ -+dnl Libtool -+LT_VDK_RELEASE=$VDK_VERSION_MAJOR.$VDK_VERSION_MINOR -+LT_VDK_CURRENT=`expr $VDK_VERSION_MAJOR + $VDK_VERSION_MINOR` -+LT_VDK_REVISION=$VDK_VERSION_MICRO -+LT_VDK_AGE=$VDK_VERSION_MINOR -+AC_SUBST(LT_VDK_RELEASE) -+AC_SUBST(LT_VDK_CURRENT) -+AC_SUBST(LT_VDK_REVISION) -+AC_SUBST(LT_VDK_AGE) -+ -+dnl For Automake -+VERSION=$VDK_VERSION -+PACKAGE=vdk -+ -+dnl Initialize automake stuff -+AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AC_CANONICAL_HOST -+ -+ -+dnl Initialize Libtool -+AM_PROG_LIBTOOL -+AM_MAINTAINER_MODE -+ -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+AC_LANG_CPLUSPLUS -+AC_SUBST(LIBS) -+AC_SUBST(CFLAGS) -+ -+ -+AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+if test x$PKG_CONFIG = xno ; then -+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -+fi -+ -+if ! pkg-config --atleast-pkgconfig-version 0.8 ; then -+ AC_MSG_ERROR([*** pkg-config too old; version 0.8 or better required.]) -+fi -+echo "checking if an updated version of gtk+ is installed" -+if $PKG_CONFIG --atleast-version 2.0.0 gtk+-2.0 ; then -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ GTK_DEPLIBS=$GTK_LIBS -+# AC_MSG_RESULT($GTK_CFLAGS $GTK_LIBS) -+ echo " gtk+ version:" + `pkg-config gtk+-2.0 --modversion` -+ else -+ AC_MSG_ERROR([ -+*** GTK+ 2.0.0 or newer is required. The latest version of GTK -+*** is available from http://gtk.org/ -+*** or get latest cvs at http://gnome.org: -+ ]) -+ fi -+ -+AC_SUBST(GTK_CFLAGS) -+AC_SUBST(GTK_LIBS) -+ -+ -+dnl Now check C++ compiler -+ -+AC_MSG_CHECKING(if C++ compiler supports bool (required)) -+AC_TRY_COMPILE( -+[ -+],[ -+ bool b=true; -+ bool b1=false; -+],[ -+ ac_bool=yes -+],[ -+ config_error=yes -+ AC_WARN(bool type is not supported by your compiler) -+]) -+AC_MSG_RESULT([$ac_bool]) -+ -+AC_MSG_CHECKING(if C++ compiler supports templates well enough (required)) -+AC_TRY_LINK( -+[ -+class foo { public: int a(float,int,int,foo*,foo**) { return 0; } }; -+template -+class k { -+public: -+ rettype (T::*method)(P1,P2,P3,P4,P5); -+}; -+],[ -+ k a; -+],[ -+ ac_vdk_template_support_well=yes -+],[ -+ ac_vdk_template_support_well=no -+ config_error=yes -+ AC_WARN(your C++ compiler does not support templates well enough) -+]) -+AC_MSG_RESULT([$ac_vdk_template_support_well]) -+ -+AC_MSG_CHECKING(if C++ environment has working auto_ptr<>) -+AC_TRY_COMPILE( -+[ -+#include -+],[ -+ std::auto_ptr a; -+],[ -+ vdk_autoptr_ok=yes -+ AC_DEFINE(HAVE_AUTO_PTR) -+],[ -+ vdk_autoptr_ok=no -+]) -+AC_MSG_RESULT([$vdk_autoptr_ok]) -+ -+AC_MSG_CHECKING(if C++ environment has working string class (required)) -+AC_TRY_LINK( -+[ -+#include -+ using namespace std; -+ class foo { -+ public: -+ void f(const string &s); -+ }; -+ void foo::f(const string &s) { -+ f(s.c_str()); -+ } -+],[ -+ foo f1; -+ f1.f("test"); -+],[ -+ vdk_string_ok=yes -+],[ -+ vdk_string_ok=no -+ config_error=yes -+ AC_WARN(C++ compilers string support does not work) -+]) -+AC_MSG_RESULT([$vdk_string_ok]) -+ -+AC_MSG_CHECKING(if C++ environment provides all required features) -+if test "x$config_error" = xyes ; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Your compiler is not powerful enough to compile VDK. If it should be, see config.log for more information of why it failed.]) -+fi -+AC_MSG_RESULT([yes]) -+ -+dnl check if doxygen is installed -+AC_PATH_PROG(DOXYGEN, doxygen) -+AC_PATH_PROG(PERL, perl) -+ -+dnl added by Raff -+dnl you must tell your programs that DOXYGEN exists -+AC_SUBST(DOXYGEN) -+AC_SUBST(PERL) -+ -+dnl AM_CONFIG_HEADER(./include/vdk/vdkfeatures.h:./include/vdk/vdkfeatures.h.in) -+AM_CONFIG_HEADER(config.h) -+ -+dnl ========================== -+dnl user configurable options -+dnl ========================== -+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] enable debug information [default=no]],,enable_debug=no) -+AC_ARG_ENABLE(opt, [ --enable-opt=[OPTIMIZATION/no] Compile with -Ox optimization [default=2]],,enable_opt=2) -+AC_ARG_ENABLE(testvdk, [ --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes) -+AC_ARG_ENABLE(sigc, [ --enable-sigc=[yes/no] Enable libsigc++-extension [default=no]],,enable_sigc=no) -+AC_ARG_ENABLE(testsigc, [ --enable-testsigc=[yes/no] Compile testsigcvdk program [default=no]],,enable_testsigc=no) -+ -+dnl waiting for gnome support to gtk+2.0 -+dnl gnome support -+dnl AC_ARG_ENABLE(gnome, -+dnl [ --enable-gnome=[yes/no] enable use of gnome[default=no]], -+dnl gnome=$enableval, gnome=no) -+ -+ -+dnl doxygen options -+AC_ARG_ENABLE(doc-html, [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes) -+AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no) -+AC_ARG_ENABLE(doc-man, [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no) -+ -+if test "x$enable_debug" = "xminimum"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-s" -+else -+ if test "x$enable_debug" = "xyes"; then -+ AC_DEFINE(VDKDEBUG) -+ CXXFLAGS="-g" -+ else -+ CXXFLAGS="-s" -+ fi -+fi -+ -+if test "x$enable_opt" != "xno"; then -+ CXXFLAGS="$CXXFLAGS -O$enable_opt" -+fi -+ -+if test "x$enable_testvdk" = "xyes"; then -+ TESTVDK="testvdk" -+else -+ TESTVDK="" -+fi -+ -+AC_SUBST(TESTVDK) -+ -+dnl anyhow we have to add -lpthread -+if test "x$enable_sigc" = "xyes" && test "$SIGC_LIBS"!=""; then -+dnl earlier versions of libsigc++ might also work (>= 0.85) -+ AM_PATH_SIGC(1.0.0,, -+ AC_MSG_WARN(Couldn't find libgsigc++ VDK will be build without it)) -+ LIBS="$LIBS $SIGC_LIBS" -+ CFLAGS="$CFLAGS $SIGC_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" -+ SIGCDEFINE="-DUSE_SIGCPLUSPLUS" -+ WITHSIGC="yes" -+else -+ SIGCDEFINE="" -+ SIGC_CFLAGS="" -+ SIGC_LIBS="-lpthread" -+ WITHSIGC="no" -+fi -+ <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/vdk-ac-am-fixes.patch?r1=1.1&r2=1.2&f=u From twittner at pld-linux.org Sun Aug 28 03:06:59 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: vdk-ac-am-fixes.patch (REMOVED) - replaced by vdk-ac_FLAG... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 01:06:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - replaced by vdk-ac_FLAGS.patch (next rm attempt) ---- Files affected: SOURCES: vdk-ac-am-fixes.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:36:54 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: rhythmbox-gtk2.8-crash.patch (NEW) - added - evil hack to... In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:36:53 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added - evil hack to fix crash ---- Files affected: SOURCES: rhythmbox-gtk2.8-crash.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/rhythmbox-gtk2.8-crash.patch diff -u /dev/null SOURCES/rhythmbox-gtk2.8-crash.patch:1.1 --- /dev/null Sun Aug 28 03:36:53 2005 +++ SOURCES/rhythmbox-gtk2.8-crash.patch Sun Aug 28 03:36:47 2005 @@ -0,0 +1,12 @@ +diff -ur rhythmbox-0.9.0-o/shell/main.c rhythmbox-0.9.0/shell/main.c +--- rhythmbox-0.9.0-o/shell/main.c 2005-08-10 07:23:28.000000000 -0600 ++++ rhythmbox-0.9.0/shell/main.c 2005-08-27 19:14:43.000000000 -0600 +@@ -166,6 +166,8 @@ + = (void *) gst_init_get_popt_table (); + #endif + ++ gtk_init(NULL, NULL); ++ + gtk_set_locale (); + program = gnome_program_init (PACKAGE, VERSION, + LIBGNOMEUI_MODULE, argc+1, new_argv, ================================================================ From aredridel at pld-linux.org Sun Aug 28 03:37:14 2005 From: aredridel at pld-linux.org (aredridel) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS (DEVEL): rhythmbox.spec - added gtk 2.8 crash patch In-Reply-To: References: Message-ID: Author: aredridel Date: Sun Aug 28 01:37:14 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - added gtk 2.8 crash patch ---- Files affected: SPECS: rhythmbox.spec (1.46.2.8 -> 1.46.2.9) ---- Diffs: ================================================================ Index: SPECS/rhythmbox.spec diff -u SPECS/rhythmbox.spec:1.46.2.8 SPECS/rhythmbox.spec:1.46.2.9 --- SPECS/rhythmbox.spec:1.46.2.8 Thu Aug 18 13:45:50 2005 +++ SPECS/rhythmbox.spec Sun Aug 28 03:37:08 2005 @@ -10,6 +10,7 @@ # Source0-md5: 3e01834c5085af7fc11d0b98b76b9354 Patch0: %{name}-desktop.patch Patch1: %{name}-broken_locale.patch +Patch2: %{name}-gtk2.8-crash.patch URL: http://www.rhythmbox.org/ BuildRequires: autoconf BuildRequires: automake @@ -53,6 +54,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # broken rm po/{ar,mn}.po @@ -129,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46.2.9 2005/08/28 01:37:08 aredridel +- added gtk 2.8 crash patch + Revision 1.46.2.8 2005/08/18 11:45:50 aflinta - rebuild with cair, rel. 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rhythmbox.spec?r1=1.46.2.8&r2=1.46.2.9&f=u From qboosh at pld-linux.org Sun Aug 28 09:16:38 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SPECS: vdk.spec - updated gtk+2 epoch; sorted BRs In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:16:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated gtk+2 epoch; sorted BRs ---- Files affected: SPECS: vdk.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.24 SPECS/vdk.spec:1.25 --- SPECS/vdk.spec:1.24 Sun Aug 28 02:39:21 2005 +++ SPECS/vdk.spec Sun Aug 28 09:16:28 2005 @@ -1,7 +1,6 @@ # $Revision$, $Date$ # # Conditional build: -# %bcond_without static_libs # don't build static libraries # %include /usr/lib/rpm/macros.perl @@ -20,8 +19,10 @@ BuildRequires: automake BuildRequires: doxygen BuildRequires: freetype-devel >= 2.0.0 -BuildRequires: gtk+2-devel >= 1:2.4.0 +BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel +# both??? +BuildRequires: libsigc++1-devel BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool @@ -29,7 +30,6 @@ BuildRequires: pkgconfig BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: zlib-devel -BuildRequires: libsigc++1-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,7 +43,7 @@ Summary(pl): Pliki nag??wkowe VDK, dokumentacja dla programist?w Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel >= 1:2.4.0 +Requires: gtk+2-devel >= 2:2.4.0 %description devel Header files and development documentation for VDK library. @@ -69,7 +69,6 @@ %build # exceptions and rtti are used in this package --misiek -rm -f missing %{__libtoolize} %{__aclocal} %{__autoconf} @@ -103,13 +102,13 @@ %files devel %defattr(644,root,root,755) %doc README ChangeLog AUTHORS NEWS BUGS TODO doc/doxy/html -%{_examplesdir}/%{name}-%{version} +%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%attr(755,root,root) %{_bindir}/* %{_aclocaldir}/*.m4 %{_includedir}/vdk2 %{_mandir}/man1/* +%{_examplesdir}/%{name}-%{version} %{_pkgconfigdir}/* %if %{with static_libs} @@ -124,6 +123,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 07:16:28 qboosh +- updated gtk+2 epoch; sorted BRs + Revision 1.24 2005/08/28 00:39:21 twittner - up to 2.4.1 - removed -ac-am-fixes.patch (mostly contains content from vim backup files) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 09:19:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:40 2005 Subject: SOURCES: uClibc-gcc4.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:19:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: uClibc-gcc4.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 09:20:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: uClibc-newsoname.patch, uClibc-sparc.patch - updated for ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:20:21 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.9.28 ---- Files affected: SOURCES: uClibc-newsoname.patch (1.2 -> 1.3) , uClibc-sparc.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-newsoname.patch diff -u SOURCES/uClibc-newsoname.patch:1.2 SOURCES/uClibc-newsoname.patch:1.3 --- SOURCES/uClibc-newsoname.patch:1.2 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-newsoname.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,5 @@ -diff -urN uClibc-0.9.26.org/libpthread/Makefile uClibc-0.9.26/libpthread/Makefile ---- uClibc-0.9.26.org/libpthread/Makefile 2004-01-25 15:20:49.547594064 +0100 -+++ uClibc-0.9.26/libpthread/Makefile 2004-01-25 15:33:34.026392026 +0100 +--- uClibc-0.9.28/libpthread/Makefile.orig 2005-08-18 00:49:49.000000000 +0200 ++++ uClibc-0.9.28/libpthread/Makefile 2005-08-28 00:04:19.595072696 +0200 @@ -21,7 +21,8 @@ #Adjust the soname version to avoid namespace collisions with glibc's libpthread @@ -11,12 +10,12 @@ LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so LIBTHREAD_DB=libthread_db.a -@@ -90,6 +91,8 @@ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \ - $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ - $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ -+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ -+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION); \ - fi; - if [ -f $(LIBTHREAD_DB) ] ; then \ - set -e; \ +@@ -84,6 +85,8 @@ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED) + $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) ++ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ ++ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION) + endif + ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y) + $(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols -soname=$(LIBTHREAD_DB_SHARED).1 \ ================================================================ Index: SOURCES/uClibc-sparc.patch diff -u SOURCES/uClibc-sparc.patch:1.4 SOURCES/uClibc-sparc.patch:1.5 --- SOURCES/uClibc-sparc.patch:1.4 Sun Jan 16 17:36:25 2005 +++ SOURCES/uClibc-sparc.patch Sun Aug 28 09:20:16 2005 @@ -1,6 +1,6 @@ ---- uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c.orig 2005-01-16 10:50:58.798433255 +0000 -+++ uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c 2005-01-16 10:57:08.966876531 +0000 -@@ -93,7 +93,7 @@ +--- uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c 2005-08-28 00:19:02.940783736 +0200 +@@ -81,7 +81,7 @@ if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) { @@ -9,149 +9,51 @@ _dl_progname, reloc_type); _dl_exit(30); }; -@@ -140,8 +140,10 @@ +@@ -128,8 +128,10 @@ got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff)); #endif +#if defined (__SUPPORT_LD_DEBUG__) -+ if (_dl_debug_bindings) ++ if (_dl_debug_bindings) _dl_dprintf(2, "Address = %x\n",new_addr); - _dl_exit(32); +#endif return (unsigned int) new_addr; } -@@ -154,20 +156,20 @@ - int reloc_type; - int symtab_index; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - struct elf_resolve * tpnt = rpnt->dyn; - - /* Now parse the relocation information */ -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i += sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i += sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - - switch(reloc_type){ - case R_SPARC_NONE: -@@ -194,22 +196,22 @@ - int reloc_type; - int goof = 0; - Elf32_Sym * symtab; -- Elf32_Rela * rpnt; -+ Elf32_Rela * relpnt; - unsigned int * reloc_addr; - unsigned int symbol_addr; - int symtab_index; - struct elf_resolve * tpnt = rpnt->dyn; - /* Now parse the relocation information */ - -- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); -+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); - - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); - -- for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), rpnt++){ -- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset); -- reloc_type = ELF32_R_TYPE(rpnt->r_info); -- symtab_index = ELF32_R_SYM(rpnt->r_info); -+ for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), relpnt++){ -+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset); -+ reloc_type = ELF32_R_TYPE(relpnt->r_info); -+ symtab_index = ELF32_R_SYM(relpnt->r_info); - symbol_addr = 0; - - if(symtab_index) { -@@ -229,33 +231,33 @@ - case R_SPARC_NONE: - break; - case R_SPARC_32: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_DISP32: -- *reloc_addr = symbol_addr + rpnt->r_addend - (unsigned int) reloc_addr; -+ *reloc_addr = symbol_addr + relpnt->r_addend - (unsigned int) reloc_addr; - break; - case R_SPARC_GLOB_DAT: -- *reloc_addr = symbol_addr + rpnt->r_addend; -+ *reloc_addr = symbol_addr + relpnt->r_addend; - break; - case R_SPARC_JMP_SLOT: - reloc_addr[1] = 0x03000000 | ((symbol_addr >> 10) & 0x3fffff); - reloc_addr[2] = 0x81c06000 | (symbol_addr & 0x3ff); - break; - case R_SPARC_RELATIVE: -- *reloc_addr += (unsigned int) tpnt->loadaddr + rpnt->r_addend; -+ *reloc_addr += (unsigned int) tpnt->loadaddr + relpnt->r_addend; - break; - case R_SPARC_HI22: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & 0xffc00000)|(symbol_addr >> 10); - break; - case R_SPARC_LO10: - if (!symbol_addr) -- symbol_addr = tpnt->loadaddr + rpnt->r_addend; -+ symbol_addr = tpnt->loadaddr + relpnt->r_addend; - else -- symbol_addr += rpnt->r_addend; -+ symbol_addr += relpnt->r_addend; - *reloc_addr = (*reloc_addr & ~0x3ff)|(symbol_addr & 0x3ff); - break; - case R_SPARC_WDISP30: ---- uClibc-0.9.27/ldso/ldso/ldso.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/ldso.c 2005-01-16 11:21:49.751151256 +0000 -@@ -648,7 +648,7 @@ +--- uClibc-0.9.28/ldso/ldso/ldso.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/ldso.c 2005-08-28 00:19:31.295473168 +0200 +@@ -597,7 +597,7 @@ + for (; runp; runp = runp->next) { + if (runp->tpnt == tcurr) { struct elf_resolve *here = init_fini_list[k]; - #ifdef __SUPPORT_LD_DEBUG__ - if(_dl_debug) -- _dl_dprintf(2, "Move %s from pos %d to %d in INIT/FINI list.\n", here->libname, k, j); -+ _dl_dprintf(2, "Move %s from pos %x to %x in INIT/FINI list.\n", here->libname, k, j); - #endif +- _dl_if_debug_dprint("Move %s from pos %d to %d in INIT/FINI list\n", here->libname, k, j); ++ _dl_if_debug_dprint("Move %s from pos %x to %x in INIT/FINI list\n", here->libname, k, j); for (i = (k - j); i; --i) init_fini_list[i+j] = init_fini_list[i+j-1]; -@@ -911,7 +911,7 @@ + init_fini_list[j] = here; +@@ -837,7 +837,7 @@ + void *retval; #if 0 - #ifdef __SUPPORT_LD_DEBUG_EARLY__ -- _dl_dprintf(2, "malloc: request for %d bytes\n", size); -+ _dl_dprintf(2, "malloc: request for %x bytes\n", size); - #endif +- _dl_debug_early("request for %d bytes\n", size); ++ _dl_debug_early("request for %x bytes\n", size); #endif ---- uClibc-0.9.27/ldso/ldso/dl-elf.c.orig 2005-01-12 07:59:21.000000000 +0000 -+++ uClibc-0.9.27/ldso/ldso/dl-elf.c 2005-01-16 11:23:39.541794934 +0000 -@@ -827,7 +827,8 @@ + if (_dl_malloc_function) +--- uClibc-0.9.28/ldso/ldso/dl-elf.c.orig 2005-08-18 00:49:41.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/dl-elf.c 2005-08-28 00:20:16.525597144 +0200 +@@ -813,7 +813,8 @@ else _dl_write(fd, string, _dl_strlen(string)); break; - +#ifndef __sparc__ -+ /* _dl_simple_ltoa uses undefined .udiv */ ++ /* _dl_simple_ltoa() uses undefined .udiv */ case 'i': case 'd': { -@@ -838,6 +839,7 @@ +@@ -824,6 +825,7 @@ _dl_write(fd, string, _dl_strlen(string)); break; } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/SOURCES/uClibc-sparc.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: uClibc.spec - updated to 0.9.28 (x86_64 port introduced) - ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:25:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ---- Files affected: SPECS: uClibc.spec (1.111 -> 1.112) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.111 SPECS/uClibc.spec:1.112 --- SPECS/uClibc.spec:1.111 Thu Feb 17 00:19:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:25:22 2005 @@ -2,25 +2,24 @@ Summary: C library optimized for size Summary(pl): Biblioteka C zoptymalizowana na rozmiar Name: uClibc -Version: 0.9.27 -Release: 1.1 +Version: 0.9.28 +Release: 0.1 Epoch: 2 License: LGPL Group: Libraries Source0: http://uclibc.org/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 6250bd6524283bd8e7bc976d43a46ec0 +# Source0-md5: 1ada58d919a82561061e4741fb6abd29 Patch0: %{name}-newsoname.patch Patch1: %{name}-alpha.patch Patch2: %{name}-toolchain-wrapper.patch Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch -Patch6: %{name}-gcc4.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 BuildRequires: which -ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 +ExclusiveArch: alpha %{ix86} ppc sparc sparc64 sparcv9 %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) @@ -68,7 +67,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -e ' %ifarch sparc sparc64 sparcv9 @@ -80,6 +78,9 @@ %ifarch ppc ppc64 s/default TARGET_i386/default TARGET_powerpc/ %endif +%ifarch %{x8664} + s/default TARGET_i386/default TARGET_x86_64/ +%endif ' extra/Configs/Config.in > Conf.in.tmp mv -f Conf.in.tmp extra/Configs/Config.in @@ -156,7 +157,6 @@ ln -sf /usr/include/asm-sparc64 $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/asm-sparc64 %endif ln -sf /usr/include/linux $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include/linux -rm $RPM_BUILD_ROOT/%{_prefix}/*-linux-uclibc/usr/include/.cvsignore %clean rm -rf $RPM_BUILD_ROOT @@ -164,7 +164,7 @@ %files %defattr(644,root,root,755) %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif @@ -178,7 +178,7 @@ %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -193,6 +193,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.112 2005/08/28 07:25:22 qboosh +- updated to 0.9.28 (x86_64 port introduced) +- updated newsoname,sparc patches, removed obsolete gcc4 patch + Revision 1.111 2005/02/16 23:19:22 tommat - be more compatible with our glibc, allow to build for example ash ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.111&r2=1.112&f=u From qboosh at pld-linux.org Sun Aug 28 09:25:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: uClibc-0.9.28.tar.bz2 Message-ID: <3841.1125213933@distfiles.pld-linux.org> Files fetched: 1 STORED: http://uclibc.org/downloads/uClibc-0.9.28.tar.bz2 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 Size: 1763847 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 09:54:26 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: uClibc.spec - fix ldso prefix (use runtime, not devel) In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 07:54:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix ldso prefix (use runtime, not devel) ---- Files affected: SPECS: uClibc.spec (1.112 -> 1.113) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.112 SPECS/uClibc.spec:1.113 --- SPECS/uClibc.spec:1.112 Sun Aug 28 09:25:22 2005 +++ SPECS/uClibc.spec Sun Aug 28 09:54:20 2005 @@ -109,7 +109,8 @@ sed -e 's/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/; s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; - s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/ + s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; + s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -193,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.113 2005/08/28 07:54:20 qboosh +- fix ldso prefix (use runtime, not devel) + Revision 1.112 2005/08/28 07:25:22 qboosh - updated to 0.9.28 (x86_64 port introduced) - updated newsoname,sparc patches, removed obsolete gcc4 patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.112&r2=1.113&f=u From arekm at pld-linux.org Sun Aug 28 10:14:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: kexec-tools.spec - up to 1.101 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.101 ---- Files affected: SPECS: kexec-tools.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.8 SPECS/kexec-tools.spec:1.9 --- SPECS/kexec-tools.spec:1.8 Tue Dec 14 21:56:49 2004 +++ SPECS/kexec-tools.spec Sun Aug 28 10:13:53 2005 @@ -1,26 +1,22 @@ # $Revision$, $Date$ -# TODO: -# - %desc en and pl are out of sync -# - kernel version needs to reviewed. -%define kernel_version 2.5.73 Summary: Tool for starting new kernel without reboot Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools -Version: 1.98 -Release: 0.5 +Version: 1.101 +Release: 0.1 License: GPL Group: Applications/System -Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tgz -# Source0-md5: 834823637153e07a85d4544b02944080 +Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz +# Source0-md5: b4f7ffcc294d41a6a4c40d6e44b7734d Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 -Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: glibc-static -Requires: kernel >= %{kernel_version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sbindir /sbin + %description kexec is a set of system calls that allows you to load another kernel from the currently executing Linux kernel. The current implementation @@ -38,21 +34,19 @@ %prep %setup -q -%patch -p1 %build -# why is this here? -%{?debug:find ./objdir -type f | xargs rm -f} - +%configure %{__make} \ CC="%{__cc}" \ OPTFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sbindir},/sbin} -install objdir/build/sbin/kexec $RPM_BUILD_ROOT/sbin -install objdir/build/bin/kexec_test $RPM_BUILD_ROOT%{_sbindir} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE2} README @@ -61,10 +55,9 @@ %files %defattr(644,root,root,755) -%doc TODO News README -%attr(755,root,root) %{_sbindir}/do-kexec.sh -%attr(755,root,root) %{_sbindir}/kexec_test -%attr(755,root,root) /sbin/kexec +%doc AUTHORS TODO News README +%attr(755,root,root) %{_sbindir}/* +%attr(755,root,root) %{_libdir}/%{name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 08:13:53 arekm +- up to 1.101 + Revision 1.8 2004/12/14 20:56:49 glen - updated to 1.98 - put kexec to /sbin (rc.shutdown expects it there) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.8&r2=1.9&f=u From arekm at pld-linux.org Sun Aug 28 10:14:04 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: kexec-tools-1.101.tar.gz README Message-ID: <3428.1125216844@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz Size: 206785 bytes ALREADY GOT: http://www.xmission.com/~ebiederm/files/kexec/README b80e99096ec4ef37b09ecb5707233fb3 README -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: proxytunnel-1.5.0.tgz Message-ID: <9445.1125217106@distfiles.pld-linux.org> Files fetched: 1 STORED: http://proxytunnel.sourceforge.net/files/proxytunnel-1.5.0.tgz 2a36409580391e25421fc06e82eed4ce proxytunnel-1.5.0.tgz Size: 56775 bytes -- Virtually Yours: distfiles. From areq at pld-linux.org Sun Aug 28 10:18:26 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: proxytunnel.spec (NEW) - Init PLD spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 08:18:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Init PLD spec ---- Files affected: SPECS: proxytunnel.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u /dev/null SPECS/proxytunnel.spec:1.1 --- /dev/null Sun Aug 28 10:18:26 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 10:18:20 2005 @@ -0,0 +1,60 @@ +# $Revision$, $Date$ +Summary: Proxy Tunnel ssh-over-https hack +Name: proxytunnel +Version: 1.5.0 +Release: 0.1 +License: GPL +Group: Applications +Source0: http://proxytunnel.sourceforge.net/files/%{name}-%{version}.tgz +# Source0-md5: 2a36409580391e25421fc06e82eed4ce +URL: http://proxytunnel.sourceforge.net/ +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ProxyTunnel is a program that connects stdin and stdout to a server +somewhere on the network, through a standard HTTPS proxy. We mostly +use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to +do many things that wouldn't be possible without ProxyTunnel. +Proxytunnel can currently do the following: +- Create tunnels using HTTP and HTTPS proxies (That understand the + HTTP CONNECT command). +- Work as a back-end driver for an OpenSSH client, and create SSH + connections through HTTP(S) proxies. +- Work as a stand-alone application, listening on a port for + connections, and then tunneling these connections to a specified + destination. + +%prep +%setup -q + +%build + +%{__make} \ + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" + +%install +rm -rf $RPM_BUILD_ROOT + +install -D proxytunnel $RPM_BUILD_ROOT%{_bindir}/proxytunnel +install -D debian/proxytunnel.1 $RPM_BUILD_ROOT%{_mandir}/man1/proxytunnel.1 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc CREDITS CHANGES README +%attr(755,root,root) %{_bindir}/* +%{_mandir}/man1/* + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 08:18:20 areq +- Init PLD spec + ================================================================ From arekm at pld-linux.org Sun Aug 28 10:22:06 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: kexec-tools.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:22:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: kexec-tools.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.9 SPECS/kexec-tools.spec:1.10 --- SPECS/kexec-tools.spec:1.9 Sun Aug 28 10:13:53 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:22:00 2005 @@ -3,7 +3,7 @@ Summary(pl): Narz?dzie pozwalaj?ce za?adowa? nowe j?dro bez konieczno?ci restartu Name: kexec-tools Version: 1.101 -Release: 0.1 +Release: 1 License: GPL Group: Applications/System Source0: http://www.xmission.com/~ebiederm/files/kexec/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 08:22:00 arekm +- rel 1 + Revision 1.9 2005/08/28 08:13:53 arekm - up to 1.101 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.9&r2=1.10&f=u From arekm at pld-linux.org Sun Aug 28 10:26:17 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: mysqlcc.spec - rel 9; drop charset patch (use mysql-client.... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:26:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 9; drop charset patch (use mysql-client.conf for charset) ---- Files affected: SPECS: mysqlcc.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/mysqlcc.spec diff -u SPECS/mysqlcc.spec:1.28 SPECS/mysqlcc.spec:1.29 --- SPECS/mysqlcc.spec:1.28 Sat May 28 22:24:29 2005 +++ SPECS/mysqlcc.spec Sun Aug 28 10:26:12 2005 @@ -7,7 +7,7 @@ Name: mysqlcc Group: Applications/Databases Version: 0.9.4 -Release: 8 +Release: 9 License: GPL Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLCC/%{name}-%{version}-src.tar.gz # Source0-md5: 26ee3528dce690b227d8bfb71b46ae66 @@ -16,7 +16,6 @@ Patch1: %{name}-m4.patch Patch2: %{name}-shutdown.patch Patch3: %{name}-enablessl.patch -Patch4: %{name}-utf8-4.1.patch URL: http://www.mysql.com/products/mysqlcc/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -43,7 +42,6 @@ %patch1 -p1 %{?!with_mysql40:%patch2 -p1} %patch3 -p1 -%patch4 -p1 %build cp -f /usr/share/automake/config.sub . @@ -95,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.29 2005/08/28 08:26:12 arekm +- rel 9; drop charset patch (use mysql-client.conf for charset) + Revision 1.28 2005/05/28 20:24:29 twittner - added bcond --with mysql40 - for building with mysql-4.0.x ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysqlcc.spec?r1=1.28&r2=1.29&f=u From arekm at pld-linux.org Sun Aug 28 10:28:35 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: kexec-tools.spec - update BR In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:28:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - update BR ---- Files affected: SPECS: kexec-tools.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.10 SPECS/kexec-tools.spec:1.11 --- SPECS/kexec-tools.spec:1.10 Sun Aug 28 10:22:00 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 10:28:30 2005 @@ -12,7 +12,8 @@ Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 URL: http://www.xmission.com/~ebiederm/files/kexec/ -BuildRequires: glibc-static +BuildRequires: glibc-devel +BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -65,6 +66,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.11 2005/08/28 08:28:30 arekm +- update BR + Revision 1.10 2005/08/28 08:22:00 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.10&r2=1.11&f=u From qboosh at pld-linux.org Sun Aug 28 10:31:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: uClibc-targetcpu.patch - don't add extra / at the end of ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:31:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - don't add extra / at the end of prefixes ---- Files affected: SOURCES: uClibc-targetcpu.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/uClibc-targetcpu.patch diff -u SOURCES/uClibc-targetcpu.patch:1.4 SOURCES/uClibc-targetcpu.patch:1.5 --- SOURCES/uClibc-targetcpu.patch:1.4 Tue Feb 3 20:30:54 2004 +++ SOURCES/uClibc-targetcpu.patch Sun Aug 28 10:31:14 2005 @@ -5,7 +5,7 @@ config RUNTIME_PREFIX string "uClibc runtime library directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc" help RUNTIME_PREFIX is the directory into which the uClibc runtime libraries will be installed. The result will look something @@ -14,7 +14,7 @@ config DEVEL_PREFIX string "uClibc development environment directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" -+ default "/usr/$(TARGET_CPU)-linux-uclibc/usr/" ++ default "/usr/$(TARGET_CPU)-linux-uclibc/usr" help DEVEL_PREFIX is the directory into which the uClibc development environment will be installed. The result will look something ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-targetcpu.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 10:32:24 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: uClibc-toolchain-wrapper.patch - add runtime lib dir to -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:32:24 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add runtime lib dir to -rpath-link/-rpath (to catch ld-uClibc.so) ---- Files affected: SOURCES: uClibc-toolchain-wrapper.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/uClibc-toolchain-wrapper.patch diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.3 SOURCES/uClibc-toolchain-wrapper.patch:1.4 --- SOURCES/uClibc-toolchain-wrapper.patch:1.3 Sat Jan 15 23:36:50 2005 +++ SOURCES/uClibc-toolchain-wrapper.patch Sun Aug 28 10:32:19 2005 @@ -1,7 +1,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c --- uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c 2003-08-28 07:51:04.000000000 +0200 -@@ -0,0 +1,660 @@ +@@ -0,0 +1,666 @@ +/* vi: set sw=4 ts=4: */ +/* + * Copyright (C) 2000 Manuel Novoa III @@ -190,6 +190,7 @@ + char *dlstr; + char *incstr; + char *devprefix; ++ char *runprefix; + char *builddir; + char *libstr; + char *build_dlstr = 0; @@ -253,6 +254,11 @@ + devprefix = UCLIBC_DEVEL_PREFIX; + } + ++ runprefix = getenv("UCLIBC_RUNTIME_PREFIX"); ++ if (!runprefix) { ++ runprefix = UCLIBC_RUNTIME_PREFIX; ++ } ++ + builddir = getenv("UCLIBC_BUILD_DIR"); + if (!builddir) { + builddir = UCLIBC_BUILD_DIR; @@ -275,10 +281,10 @@ + } + + -+ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath_link[1]), "-Wl,-rpath-link,", builddir, "/lib", NULL); + -+ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL); ++ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib:", runprefix, "/lib", NULL); + xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL); + + xstrcat(&(uClibc_inc[0]), devprefix, "/include/", NULL); @@ -665,7 +671,7 @@ diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile uClibc-0.9.26/extra/gcc-uClibc/Makefile --- uClibc-0.9.26.org/extra/gcc-uClibc/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-25 16:06:22.372828491 +0100 -@@ -0,0 +1,92 @@ +@@ -0,0 +1,93 @@ +# Makefile for building a fake gcc/binutils toolchain +# that simply spoofs the location of the C library +# @@ -686,6 +692,7 @@ + @echo "/* this file was autogenerated by make */" > gcc-uClibc.h + @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h ++ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >> gcc-uClibc.h + @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h + @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h + @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 10:33:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: uClibc.spec - updated targetcpu, toolchain-wrapper patches -... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 08:33:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ---- Files affected: SPECS: uClibc.spec (1.113 -> 1.114) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.113 SPECS/uClibc.spec:1.114 --- SPECS/uClibc.spec:1.113 Sun Aug 28 09:54:20 2005 +++ SPECS/uClibc.spec Sun Aug 28 10:33:15 2005 @@ -110,7 +110,7 @@ s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/; s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set/; s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/; - s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"/ + s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)/lib", ' .config.tmp > .config %{?debug:echo 'DODEBUG=y' >> .config} %{?debug:echo 'SUPPORT_LD_DEBUG=y' >> .config} @@ -194,6 +194,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.114 2005/08/28 08:33:15 qboosh +- updated targetcpu,toolchain-wrapper patches - now dynamic linking works again + Revision 1.113 2005/08/28 07:54:20 qboosh - fix ldso prefix (use runtime, not devel) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.113&r2=1.114&f=u From arekm at pld-linux.org Sun Aug 28 10:41:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: mysqlcc-utf8-4.1.patch (REMOVED) - drop In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 08:41:43 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - drop ---- Files affected: SOURCES: mysqlcc-utf8-4.1.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:15:39 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: mysql-administrator-termcap.patch (NEW), mysql-administra... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:15:38 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - new ---- Files affected: SOURCES: mysql-administrator-termcap.patch (NONE -> 1.1) (NEW), mysql-administrator-lua.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mysql-administrator-termcap.patch diff -u /dev/null SOURCES/mysql-administrator-termcap.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-termcap.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,20 @@ +diff -urN mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 11:00:00.974042616 +0200 +@@ -28,7 +28,7 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + + +@@ -39,6 +39,6 @@ + $(UUID_LIB)\ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ +- -lncurses -lreadline -lhistory -ltermcap\ ++ -lncurses -lreadline -lhistory\ + @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ Index: SOURCES/mysql-administrator-lua.patch diff -u /dev/null SOURCES/mysql-administrator-lua.patch:1.1 --- /dev/null Sun Aug 28 11:15:38 2005 +++ SOURCES/mysql-administrator-lua.patch Sun Aug 28 11:15:33 2005 @@ -0,0 +1,73 @@ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in mysql-administrator-1.0.22a/mysql-gui-common/configure.in +--- mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in 2005-06-02 05:20:50.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/configure.in 2005-08-28 10:58:26.907342928 +0200 +@@ -77,14 +77,14 @@ + + + # Lua Stuff +-LUA_CFLAGS= +-LUA_LDFLAGS=-llua ++LUA_CFLAGS=-I/usr/include/lua50 ++LUA_LDFLAGS="-llua50 -llualib50" + AC_ARG_WITH(lua-includes, + [ --with-lua-includes directory where Lua headers are located], + [LUA_CFLAGS=-I$withval]) + AC_ARG_WITH(lua-libs, + [ --with-lua-libs directory where Lua libraries are located], +- [LUA_LDFLAGS="$withval -llua"]) ++ [LUA_LDFLAGS="$withval -llua50 -llualib50"]) + AC_SUBST(LUA_CFLAGS) + AC_SUBST(LUA_LDFLAGS) + +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am 2005-04-14 04:48:08.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -8,7 +8,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrt_a_SOURCES=myx_grt.c\ + myx_grt_module.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-04-30 01:25:58.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am 2005-08-28 10:58:05.487599224 +0200 +@@ -10,7 +10,7 @@ + -I$(top_srcdir)/library/shared_include \ + -I$(top_srcdir)/library/include \ + @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ +- @PYTHON_CFLAGS@ @ENABLED_MODULES@ ++ @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@ + + libgrtmods_a_SOURCES=\ + myx_grt_base.c\ +diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am +--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 2005-05-16 15:12:10.000000000 +0200 ++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am 2005-08-28 10:59:08.801973976 +0200 +@@ -18,7 +18,7 @@ + $(JAVA_INC)\ + @GTHREAD_CFLAGS@ @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @JNI_CFLAGS@\ + @PYTHON_CFLAGS@ @ENABLED_MODULES@\ +- @GTK_CFLAGS@ ++ @GTK_CFLAGS@ @LUA_CFLAGS@ + + + grtsh_LDADD=\ +@@ -29,7 +29,7 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@ @GTK_LIBS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + + + agentest_LDADD=\ +@@ -40,5 +40,5 @@ + @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \ + @JNI_LDFLAGS@\ + -lncurses -lreadline -lhistory -ltermcap\ +- -llua -llualib -ldl -lstdc++ ++ @LUA_LDFLAGS@ -ldl -lstdc++ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:18:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: xpdf-intoverflow.patch (REMOVED), xpdf-freetype-includes.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:18:59 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: xpdf-intoverflow.patch (1.1 -> NONE) (REMOVED), xpdf-freetype-includes.patch (1.1 -> NONE) (REMOVED), xpdf-3.00pl2.patch (1.3 -> NONE) (REMOVED), xpdf-3.00pl3.patch (1.1 -> NONE) (REMOVED), xpdf-CAN-2005-2097.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From arekm at pld-linux.org Sun Aug 28 11:19:09 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: mysql-administrator.spec - up to 1.0.22a In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 09:19:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.0.22a ---- Files affected: SPECS: mysql-administrator.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/mysql-administrator.spec diff -u SPECS/mysql-administrator.spec:1.11 SPECS/mysql-administrator.spec:1.12 --- SPECS/mysql-administrator.spec:1.11 Tue May 24 20:58:52 2005 +++ SPECS/mysql-administrator.spec Sun Aug 28 11:19:02 2005 @@ -1,19 +1,27 @@ # $Revision$, $Date$ +%bcond_with canvas +%bcond_with grt Summary: A MySQL server management, configuration and monitoring tool Summary(pl): Narz?dzie do zarz?dzania, konfiguracji i monitorowania pracy serwera MySQL Name: mysql-administrator -Version: 1.0.19 -Release: 0.2 +Version: 1.0.22a +Release: 1 License: GPL Group: Applications/Databases Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/%{name}-%{version}.tar.gz -# Source0-md5: b495755208b55333cb9c060c09246fe2 +# Source0-md5: ed0f1af3eb7be03c2785ad9057492b75 +Patch0: %{name}-lua.patch +Patch1: %{name}-termcap.patch URL: http://www.mysql.com/products/administrator/ -BuildRequires: gtkmm-devel <= 2.2.0 +BuildRequires: autoconf +BuildRequires: automake +%{?with_canvas:BuildRequires: ftgl-devel} +BuildRequires: gtkmm22-devel BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: pcre-devel >= 3.9 BuildRequires: pkgconfig BuildRequires: mysql-devel +BuildRequires: lua50-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -27,15 +35,22 @@ %description -l pl MySQL Administrator jest pot??nym graficznym narz?dziem umo?liwiaj?cym ?atwe administrowanie ca?ym ?rodowiskiem MySQL. Dzi?ki przejrzystemu -interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy -i intuicyjny w obs?udze. +interfejsowi i logicznemu usytuowaniu element?w jest bardzo ?atwy i +intuicyjny w obs?udze. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build cd mysql-gui-common +%{__aclocal} +%{__autoconf} +%{__automake} %configure \ + %{?with_canvas:--enable-canvas} \ + %{?with_grt:--enable-grt} \ --with-commondirname=administrator %{__make} @@ -50,21 +65,19 @@ %{__make} -C mysql-gui-common install \ DESTDIR=$RPM_BUILD_ROOT -cd ../%{name} %{__make} -C %{name} install \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator -cp -a doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator +cp -a mysql-administrator/doc/* $RPM_BUILD_ROOT%{_datadir}/mysql-gui/doc/administrator %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog res/FAQ -%attr(755,root,root) %{_bindir}/mysql-administrator -%attr(755,root,root) %{_bindir}/mysql-administrator-bin +%doc mysql-administrator/ChangeLog mysql-administrator/res/FAQ +%attr(755,root,root) %{_bindir}/* %{_desktopdir}/*.desktop %{_datadir}/mysql-gui/*.png %dir %{_datadir}/mysql-gui/administrator @@ -78,6 +91,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:19:02 arekm +- up to 1.0.22a + Revision 1.11 2005/05/24 18:58:52 darekr - use _desktopdir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql-administrator.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 11:19:15 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: mysql-administrator-1.0.22a.tar.gz Message-ID: <32473.1125220755@distfiles.pld-linux.org> Files fetched: 1 STORED: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLAdministrationSuite/mysql-administrator-1.0.22a.tar.gz ed0f1af3eb7be03c2785ad9057492b75 mysql-administrator-1.0.22a.tar.gz Size: 7444056 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:19:41 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: xpdf-remove_protections.patch - updated for 3.01 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:19:41 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 3.01 ---- Files affected: SOURCES: xpdf-remove_protections.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/xpdf-remove_protections.patch diff -u SOURCES/xpdf-remove_protections.patch:1.4 SOURCES/xpdf-remove_protections.patch:1.5 --- SOURCES/xpdf-remove_protections.patch:1.4 Wed Mar 26 18:34:22 2003 +++ SOURCES/xpdf-remove_protections.patch Sun Aug 28 11:19:36 2005 @@ -1,40 +1,19 @@ -diff -Nur xpdf-2.01.orig/xpdf/XPDFCore.cc xpdf-2.01/xpdf/XPDFCore.cc ---- xpdf-2.01.orig/xpdf/XPDFCore.cc Sun Nov 3 23:15:37 2002 -+++ xpdf-2.01/xpdf/XPDFCore.cc Mon Nov 4 21:08:51 2002 -@@ -906,9 +906,6 @@ - // global variables (currentSelection and currentSelectionOwner). +--- xpdf-3.01/xpdf/XPDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/XPDFCore.cc 2005-08-28 11:07:57.279864520 +0200 +@@ -377,9 +377,6 @@ + int pg; + double ulx, uly, lrx, lry; - void XPDFCore::copySelection() { - if (!doc->okToCopy()) { - return; - } - if (currentSelection) { - delete currentSelection; - } -@@ -947,9 +944,6 @@ - } - - GString *XPDFCore::extractText(int xMin, int yMin, int xMax, int yMax) { -- if (!doc->okToCopy()) { -- return NULL; -- } - return out->getText(xMin, yMin, xMax, yMax); - } - -@@ -958,9 +952,6 @@ - TextOutputDev *textOut; - GString *s; - -- if (!doc->okToCopy()) { -- return NULL; -- } - textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse); - if (!textOut->isOk()) { - delete textOut; -@@ -1585,10 +1576,9 @@ + if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { + //~ for multithreading: need a mutex here + if (currentSelection) { +@@ -1108,10 +1105,9 @@ #ifndef NO_TEXT_SELECT - if (core->selectXMin != core->selectXMax && - core->selectYMin != core->selectYMax) { + if (core->selectULX != core->selectLRX && + core->selectULY != core->selectLRY) { - if (core->doc->okToCopy()) { - core->copySelection(); - } else { @@ -86,3 +65,15 @@ } // construct text file name +--- xpdf-3.01/xpdf/PDFCore.cc.orig 2005-08-17 07:34:31.000000000 +0200 ++++ xpdf-3.01/xpdf/PDFCore.cc 2005-08-28 11:08:37.884691648 +0200 +@@ -1273,9 +1273,6 @@ + int x0, y0, x1, y1, t; + GString *s; + +- if (!doc->okToCopy()) { +- return NULL; +- } + if ((page = findPage(pg))) { + cvtUserToDev(pg, xMin, yMin, &x0, &y0); + cvtUserToDev(pg, xMax, yMax, &x1, &y1); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/xpdf-remove_protections.patch?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 11:22:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: uClibc-x86_64.patch (NEW) - gcc (3.3.6) doesn't allow ' i... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:22:09 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - gcc (3.3.6) doesn't allow ' in warning #without quotes ---- Files affected: SOURCES: uClibc-x86_64.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/uClibc-x86_64.patch diff -u /dev/null SOURCES/uClibc-x86_64.patch:1.1 --- /dev/null Sun Aug 28 11:22:09 2005 +++ SOURCES/uClibc-x86_64.patch Sun Aug 28 11:22:04 2005 @@ -0,0 +1,11 @@ +--- uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c.orig 2005-08-28 10:59:32.000000000 +0200 ++++ uClibc-0.9.28/libc/sysdeps/linux/x86_64/sigaction.c 2005-08-28 10:58:49.000000000 +0200 +@@ -27,7 +27,7 @@ + + + #if defined __NR_rt_sigaction +-#warning Yes there are two warnings here. Don't worry about it. ++#warning "Yes there are two warnings here. Don't worry about it." + static void restore_rt (void) asm ("__restore_rt"); + static void restore (void) asm ("__restore"); + ================================================================ From qboosh at pld-linux.org Sun Aug 28 11:23:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: uClibc.spec - disable shared on x86_64 (not ready yet), add... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:23:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable shared on x86_64 (not ready yet), added x86_64 patch; builds now - more docs (and base docs moved to base) ---- Files affected: SPECS: uClibc.spec (1.114 -> 1.115) ---- Diffs: ================================================================ Index: SPECS/uClibc.spec diff -u SPECS/uClibc.spec:1.114 SPECS/uClibc.spec:1.115 --- SPECS/uClibc.spec:1.114 Sun Aug 28 10:33:15 2005 +++ SPECS/uClibc.spec Sun Aug 28 11:23:31 2005 @@ -15,6 +15,7 @@ Patch3: %{name}-targetcpu.patch Patch4: %{name}-O_DIRECT.patch Patch5: %{name}-sparc.patch +Patch6: %{name}-x86_64.patch URL: http://uclibc.org/ BuildRequires: gcc >= 3.0 BuildRequires: sed >= 4.0 @@ -23,7 +24,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # note: the 2nd '\' is needed (some shell expansions?) -%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/') +%define TARGET_ARCH %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon\\|pentium./i386/;s/ppc/powerpc/;s/amd64\\|ia32e/x86_64/') %description Small libc for building embedded applications. @@ -67,8 +68,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -sed -e ' +sed -i -e ' %ifarch sparc sparc64 sparcv9 s/default TARGET_i386/default TARGET_sparc/ %endif @@ -81,13 +83,12 @@ %ifarch %{x8664} s/default TARGET_i386/default TARGET_x86_64/ %endif - ' extra/Configs/Config.in > Conf.in.tmp -mv -f Conf.in.tmp extra/Configs/Config.in + ' extra/Configs/Config.in -grep -v 'HAVE_NO_SHARED\|ARCH_HAS_NO_LDSO' extra/Configs/Config.sparc > C.tmp -mv -f C.tmp extra/Configs/Config.sparc -grep -v 'HAS_NO_THREADS' extra/Configs/Config.alpha > C.tmp -mv -f C.tmp extra/Configs/Config.alpha +# ldso on x86_64 not ready yet (missing resolve.S) +sed -i -e '/HAS_NO_THREADS/a\\n\tselect HAVE_NO_SHARED\n\tselect ARCH_HAS_NO_LDSO' \ + extra/Configs/Config.x86_64 +sed -i -e '/HAS_NO_THREADS/d' extra/Configs/Config.alpha %ifarch sparc sparc64 sparcv9 ln -sf /usr/include/asm-sparc include/asm-sparc @@ -164,22 +165,23 @@ %files %defattr(644,root,root,755) +%doc Changelog* DEDICATION.mjn3 MAINTAINERS README TODO docs/threads.txt %dir %{_prefix}/*-linux-uclibc -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %dir %{_prefix}/*-linux-uclibc/lib %attr(755,root,root) %{_prefix}/*-linux-uclibc/lib/*.so* %endif %files devel %defattr(644,root,root,755) -%doc README TODO docs/threads.txt docs/uclibc.org/*.html +%doc docs/uclibc.org/* %attr(755,root,root) %{_bindir}/* %{_prefix}/*-linux-uclibc/usr/lib/*.o %dir %{_prefix}/*-linux-uclibc/usr %dir %{_prefix}/*-linux-uclibc/usr/bin %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/bin/* %dir %{_prefix}/*-linux-uclibc/usr/lib -%ifarch %{ix86} ppc sparc sparc64 sparcv9 %{x8664} +%ifarch %{ix86} ppc sparc sparc64 sparcv9 %attr(755,root,root) %{_prefix}/*-linux-uclibc/usr/lib/*.so %endif %{_prefix}/*-linux-uclibc/usr/include @@ -194,6 +196,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.115 2005/08/28 09:23:31 qboosh +- disable shared on x86_64 (not ready yet), added x86_64 patch; builds now +- more docs (and base docs moved to base) + Revision 1.114 2005/08/28 08:33:15 qboosh - updated targetcpu,toolchain-wrapper patches - now dynamic linking works again ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/uClibc.spec?r1=1.114&r2=1.115&f=u From qboosh at pld-linux.org Sun Aug 28 11:25:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xpdf.spec - updated to 3.01 - removed obsolete intoverflow, ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:25:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.01 - removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches - updated remove_protections patch ---- Files affected: SPECS: xpdf.spec (1.90 -> 1.91) ---- Diffs: ================================================================ Index: SPECS/xpdf.spec diff -u SPECS/xpdf.spec:1.90 SPECS/xpdf.spec:1.91 --- SPECS/xpdf.spec:1.90 Tue Aug 16 10:29:04 2005 +++ SPECS/xpdf.spec Sun Aug 28 11:25:53 2005 @@ -3,7 +3,6 @@ # Conditional build: %bcond_without protections # remove protections against fair use (printing and copying) # - Summary: Portable Document Format (PDF) file viewer Summary(es): Visualizador de archivos PDF Summary(ja): X Window System ???? PDF ???????????????? @@ -12,24 +11,19 @@ Summary(ru): ????????? ??? ????????? PDF ?????? Summary(uk): ???????? ??? ????????? PDF ?????? Name: xpdf -Version: 3.00 -Release: 10 +Version: 3.01 +Release: 1 License: GPL Group: X11/Applications Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz -# Source0-md5: 95294cef3031dd68e65f331e8750b2c2 +# Source0-md5: e004c69c7dddef165d768b1362b44268 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}rc Patch0: %{name}-remove_protections.patch -Patch1: %{name}-freetype-includes.patch -Patch2: %{name}-fontdirs.patch +Patch1: %{name}-fontdirs.patch # probably obsolete -Patch3: %{name}-nonumericlocale.patch -Patch4: %{name}-intoverflow.patch -Patch5: %{name}-%{version}pl2.patch -Patch6: %{name}-%{version}pl3.patch -Patch7: %{name}-CAN-2005-2097.patch +Patch2: %{name}-nonumericlocale.patch URL: http://www.foolabs.com/xpdf/ Icon: xpdfIcon.gif BuildRequires: XFree86-devel @@ -107,11 +101,6 @@ %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %build %{__autoconf} @@ -172,6 +161,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.91 2005/08/28 09:25:53 qboosh +- updated to 3.01 +- removed obsolete intoverflow,freetype-includes,3.00pl2,3.00pl3,CAN-2005-2097 patches +- updated remove_protections patch + Revision 1.90 2005/08/16 08:29:04 adamg - fix for a DoS vulnerability (CAN-2005-2097) - release 10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf.spec?r1=1.90&r2=1.91&f=u From qboosh at pld-linux.org Sun Aug 28 11:26:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: xpdf-3.01.tar.gz Message-ID: <10072.1125221164@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.01.tar.gz e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz Size: 599778 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: xpdf-chinese-simplified-2004-jul-27.tar.gz Message-ID: <4839.1125222366@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz 6c3b04008000948e62530b8582e7f37c xpdf-chinese-simplified-2004-jul-27.tar.gz Size: 835960 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:17 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xpdf-chinese-traditional.spec - updated to 2004-jul-27, rel... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:17 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 5 ---- Files affected: SPECS: xpdf-chinese-traditional.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-traditional.spec diff -u SPECS/xpdf-chinese-traditional.spec:1.11 SPECS/xpdf-chinese-traditional.spec:1.12 --- SPECS/xpdf-chinese-traditional.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-chinese-traditional.spec Sun Aug 28 11:46:11 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania Big5 i Big5ascii dla xpdf Name: xpdf-chinese-traditional Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 1dd68bc924273e30534031d66f8a37c7 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: b7fa7f1850f7cfa28498701507079abb URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:11 qboosh +- updated to 2004-jul-27, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-traditional.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xpdf-japanese.spec - updated to 2004-jul-27, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 4 ---- Files affected: SPECS: xpdf-japanese.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-japanese.spec diff -u SPECS/xpdf-japanese.spec:1.11 SPECS/xpdf-japanese.spec:1.12 --- SPECS/xpdf-japanese.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-japanese.spec Sun Aug 28 11:46:22 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-JP, EUC-JP i Shift-JIS dla xpdf Name: xpdf-japanese Version: 1.0 -Release: 3 +Release: 4 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 2fe6d4701482af0d69084c574fe14d90 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: a11ee6476d0f381983664fc614f7a95e URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:46:22 qboosh +- updated to 2004-jul-27, release 4 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-japanese.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xpdf-chinese-simplified.spec - updated to 2004-jul-27, rele... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:46:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2004-jul-27, release 6 ---- Files affected: SPECS: xpdf-chinese-simplified.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/xpdf-chinese-simplified.spec diff -u SPECS/xpdf-chinese-simplified.spec:1.12 SPECS/xpdf-chinese-simplified.spec:1.13 --- SPECS/xpdf-chinese-simplified.spec:1.12 Wed Aug 25 11:49:22 2004 +++ SPECS/xpdf-chinese-simplified.spec Sun Aug 28 11:45:57 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-CN, EUC-CN i GBK dla xpdf Name: xpdf-chinese-simplified Version: 1.0 -Release: 5 +Release: 6 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 7a92500278d4aa8089024d5d7266f4ac +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2004-jul-27.tar.gz +# Source0-md5: 6c3b04008000948e62530b8582e7f37c URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -99,6 +99,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 09:45:57 qboosh +- updated to 2004-jul-27, release 6 + Revision 1.12 2004/08/25 09:49:22 qboosh - typo, release 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-chinese-simplified.spec?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 11:46:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: xpdf-chinese-traditional-2004-jul-27.tar.gz Message-ID: <5469.1125222382@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz b7fa7f1850f7cfa28498701507079abb xpdf-chinese-traditional-2004-jul-27.tar.gz Size: 794604 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:46:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: xpdf-japanese-2004-jul-27.tar.gz Message-ID: <5706.1125222392@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz a11ee6476d0f381983664fc614f7a95e xpdf-japanese-2004-jul-27.tar.gz Size: 494803 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: xpdf-korean-2005-jul-07.tar.gz Message-ID: <13228.1125222718@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz 3c1e00f3b9d5fa713df8a3d763d12f3a xpdf-korean-2005-jul-07.tar.gz Size: 470455 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 11:51:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xpdf-korean.spec - updated to 2005-jul-07, release 5 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 09:51:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2005-jul-07, release 5 ---- Files affected: SPECS: xpdf-korean.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/xpdf-korean.spec diff -u SPECS/xpdf-korean.spec:1.11 SPECS/xpdf-korean.spec:1.12 --- SPECS/xpdf-korean.spec:1.11 Sun Jan 25 02:23:14 2004 +++ SPECS/xpdf-korean.spec Sun Aug 28 11:51:48 2005 @@ -3,11 +3,11 @@ Summary(pl): Wsparcie kodowania ISO-2022-KR (KSX1001) dla xpdf Name: xpdf-korean Version: 1.0 -Release: 4 +Release: 5 License: GPL Group: X11/Applications -Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}.tar.gz -# Source0-md5: 01c1b151119ba96da6bc021ea2916256 +Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-2005-jul-07.tar.gz +# Source0-md5: 3c1e00f3b9d5fa713df8a3d763d12f3a URL: http://www.foolabs.com/xpdf/ Requires(post,preun): grep Requires(post,preun): xpdf @@ -89,6 +89,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 09:51:48 qboosh +- updated to 2005-jul-07, release 5 + Revision 1.11 2004/01/25 01:23:14 gotar - updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpdf-korean.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:18:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: kexec-tools-opt.patch - updated for 1.101 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:18:01 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.101 ---- Files affected: SOURCES: kexec-tools-opt.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/kexec-tools-opt.patch diff -u SOURCES/kexec-tools-opt.patch:1.2 SOURCES/kexec-tools-opt.patch:1.3 --- SOURCES/kexec-tools-opt.patch:1.2 Tue Dec 14 23:28:16 2004 +++ SOURCES/kexec-tools-opt.patch Sun Aug 28 12:17:56 2005 @@ -1,11 +1,13 @@ ---- kexec-tools-1.98/Makefile.main.orig 2004-09-15 09:49:17.000000000 +0000 -+++ kexec-tools-1.98/Makefile.main 2004-12-14 22:25:32.325270400 +0000 -@@ -2,7 +2,7 @@ - VERSION="1.98" - DATE="15 September 2004" - CPPFLAGS:= -I./util_lib/include -DVERSION='$(VERSION)' -DRELEASE_DATE='$(DATE)' $(EXTRA_FLAGS) --CFLAGS:=-Wall -g -O2 -fno-strict-aliasing $(CPPFLAGS) -+CFLAGS:=-Wall -fno-strict-aliasing $(CPPFLAGS) $(OPTFLAGS) +--- kexec-tools-1.101/configure.ac.orig 2005-01-09 02:36:57.000000000 +0100 ++++ kexec-tools-1.101/configure.ac 2005-08-28 12:12:20.729530896 +0200 +@@ -93,8 +93,8 @@ - PREFIX:=$(OBJDIR)/build - SBINDIR=$(PREFIX)/sbin + dnl ---Hard codes + +-CFLAGS='-Wall -g -fno-strict-aliasing $(CPPFLAGS)' +-BUILD_CFLAGS='-O2 -Wall $(CPPFLAGS)' ++CFLAGS="$CFLAGS -Wall -fno-strict-aliasing \$(CPPFLAGS)" ++BUILD_CFLAGS="$CFLAGS -Wall \$(CPPFLAGS)" + + dnl ---Sanity checks + if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]) fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kexec-tools-opt.patch?r1=1.2&r2=1.3&f=u From qboosh at pld-linux.org Sun Aug 28 12:21:59 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: proxytunnel.spec - pl In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:21:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl ---- Files affected: SPECS: proxytunnel.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/proxytunnel.spec diff -u SPECS/proxytunnel.spec:1.1 SPECS/proxytunnel.spec:1.2 --- SPECS/proxytunnel.spec:1.1 Sun Aug 28 10:18:20 2005 +++ SPECS/proxytunnel.spec Sun Aug 28 12:21:53 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ Summary: Proxy Tunnel ssh-over-https hack +Summary(pl): Tunel proxy ssh-po-https Name: proxytunnel Version: 1.5.0 Release: 0.1 @@ -15,7 +16,7 @@ somewhere on the network, through a standard HTTPS proxy. We mostly use it to tunnel SSH sessions through HTTP(S) proxies, allowing us to do many things that wouldn't be possible without ProxyTunnel. -Proxytunnel can currently do the following: +ProxyTunnel can currently do the following: - Create tunnels using HTTP and HTTPS proxies (That understand the HTTP CONNECT command). - Work as a back-end driver for an OpenSSH client, and create SSH @@ -24,11 +25,23 @@ connections, and then tunneling these connections to a specified destination. +%description -l pl +ProxyTunnel to program ??cz?cy stdin i stdout do serwera gdzie? w +sieci poprzez standardowe proxy HTTPS. Jest u?ywany g??wnie do +tunelowania sesji SSH poprzez proxy HTTP(S), co pozwala na robienie +wielu rzeczy, kt?re nie by?yby mo?liwe bez niego. ProxyTunnel +aktualnie potrafi: +- tworzy? tunele przy u?yciu proxy HTTP i HTTPS (rozumiej?cych + polecenie HTTP CONNECT), +- dzia?a? jako sterownik backendu dla klienta OpenSSH i tworzy? + po??czenia SSH poprzez proxy HTTP(S), +- dzia?a? jako samodzielna aplikacja, nas?uchuj?c na jakim? porcie na + po??czenia, a nast?pnie tuneluj?c te po??czenia na podany adres. + %prep %setup -q %build - %{__make} \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" \ @@ -55,6 +68,8 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 10:21:53 qboosh +- pl + Revision 1.1 2005/08/28 08:18:20 areq - Init PLD spec - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/proxytunnel.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 12:22:57 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: kexec-tools.spec - readded opt patch - synced descs - tar h... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:22:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - readded opt patch - synced descs - tar hack to avoid messing outside build subdir ---- Files affected: SPECS: kexec-tools.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.11 SPECS/kexec-tools.spec:1.12 --- SPECS/kexec-tools.spec:1.11 Sun Aug 28 10:28:30 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 12:22:51 2005 @@ -11,9 +11,12 @@ Source1: do-kexec.sh Source2: http://www.xmission.com/~ebiederm/files/kexec/README # Source2-md5: b80e99096ec4ef37b09ecb5707233fb3 +Patch0: %{name}-opt.patch URL: http://www.xmission.com/~ebiederm/files/kexec/ +BuildRequires: autoconf BuildRequires: glibc-devel BuildRequires: zlib-devel +ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -25,22 +28,21 @@ generic code should work on any architecture. %description -l pl -Narz?dzie to pozwala wykorzysta? zaimplementowany w j?drach 2.5/2.6 -system pozwalaj?cy za?adowa? nast?pne j?dro bez konieczno?ci restartu -maszyny. Od momentu wydania polecenia kexec do startu nowego j?dra -up?ywa czas poni?ej 0.5 sekundy! - -Aktualna implementacja by?a testowana tylko na x86, ale og?lny kod -powinien dzia?a? na ka?dej architekturze. +kexec to zestaw wywo?a? systemowych pozwalaj?cych za?adowa? nast?pne +j?dro z poziomu aktualnie dzia?aj?cego j?dra Linuksa. Aktualna +implementacja by?a testowana tylko na x86, ale og?lny kod powinien +dzia?a? na ka?dej architekturze. %prep -%setup -q +%setup -q -c -T +# workaround for kexec-tools-%{version}.spec outside main directory in tarball +tar xzf %{SOURCE0} --strip-components=1 +%patch0 -p1 %build +%{__autoconf} %configure -%{__make} \ - CC="%{__cc}" \ - OPTFLAGS="%{rpmcflags}" +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -56,7 +58,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS TODO News README +%doc AUTHORS News README TODO %attr(755,root,root) %{_sbindir}/* %attr(755,root,root) %{_libdir}/%{name} @@ -66,6 +68,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 10:22:51 qboosh +- readded opt patch +- synced descs +- tar hack to avoid messing outside build subdir + Revision 1.11 2005/08/28 08:28:30 arekm - update BR ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 12:41:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xorg-app-twm.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:41:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-twm.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.5 SPECS/xorg-app-twm.spec:1.6 --- SPECS/xorg-app-twm.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:41:02 2005 @@ -1,11 +1,13 @@ # $Revision$, $Date$ -Summary: twm application -Summary(pl): Aplikacja twm +Summary: Tab Window Manager for the X Window System +Summary(pl): Twm - podstawowy zarz?dca okien dla X Window System +Summary(ru): ??????? ??????? ???????? +Summary(uk): ??????? ???????? ???????? Name: xorg-app-twm Version: 0.99.0 Release: 0.02 License: MIT -Group: X11/Applications +Group: X11/Window Managers Source0: http://xorg.freedesktop.org/X11R7.0-RC0/app/twm-%{version}.tar.bz2 # Source0-md5: 7441654fbffb6da17118948523401022 Patch0: twm-man.patch @@ -15,13 +17,28 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-twm +Obsoletes: XFree86-twm +Obsoletes: twm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -twm application. +Twm is a window manager for the X Window System. It provides +titlebars, shaped windows, several forms of icon management, +user-defined macro functions, click-to-type and pointerdriven keyboard +focus, and user-specified key and pointer button bindings. %description -l pl -Aplikacja twm. +Twm jest zarz?dc? okien dla X Window System. Daje belki tytu?owe, +ramki okien, par? form zarz?dzania ikonami, definiowalne makra, +ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, +definiowalne przypisania klawiszy i przycisk?w myszy. + +%description twm -l ru +??????? ?????????? ??????? ????????. + +%description twm -l uk +??????? ?????????? ???????? ????????. %prep %setup -q -n twm-%{version} @@ -56,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:41:02 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:47:37 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xorg-app-xauth.spec - merged descs from X11.spec, Obsoletes... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:47:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xauth.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xauth.spec diff -u SPECS/xorg-app-xauth.spec:1.5 SPECS/xorg-app-xauth.spec:1.6 --- SPECS/xorg-app-xauth.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xauth.spec Sun Aug 28 12:47:32 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -Summary: xauth application -Summary(pl): Aplikacja xauth +Summary: xauth - X authority file utility +Summary(pl): xauth - narz?dzie do plik?w X authority Name: xorg-app-xauth Version: 0.99.0 Release: 0.02 @@ -14,13 +14,24 @@ BuildRequires: pkgconfig >= 0.19 BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xauth +Obsoletes: XFree86-xauth +Obsoletes: xauth BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xauth application. +The xauth program is used to edit and display the authorization +information used in connecting to the X server. This program is +usually used to extract authorization records from one machine and +merge them in on another (as is the case when using remote logins or +granting access to other users). %description -l pl -Aplikacja xauth. +Program xauth s?u?y do edycji i wy?wietlania informacji +autoryzacyjnych u?ywanych przy ??czeniu z X serwerem. Ten program +przewa?nie jest u?ywany do wyci?gania rekord?w autoryzacji z jednej +maszyny i do??czania ich na innej (w celu umo?liwienia zdalnego +logowania lub udost?pnienia innym u?ytkownikom). %prep %setup -q -n xauth-%{version} @@ -54,6 +65,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:47:32 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xauth.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xorg-app-xfs.spec - merged descs from X11.spec, Obsoletes f... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ---- Files affected: SPECS: xorg-app-xfs.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xorg-app-xfs.spec diff -u SPECS/xorg-app-xfs.spec:1.5 SPECS/xorg-app-xfs.spec:1.6 --- SPECS/xorg-app-xfs.spec:1.5 Sat Aug 27 23:46:18 2005 +++ SPECS/xorg-app-xfs.spec Sun Aug 28 12:51:16 2005 @@ -1,6 +1,8 @@ # $Revision$, $Date$ -Summary: xfs application -Summary(pl): Aplikacja xfs +Summary: Font server for X Window System +Summary(pl): Serwer font?w dla X Window System +Summary(ru): ?????????? ??? X Window System +Summary(uk): ?????????? ??? X Window System Name: xorg-app-xfs Version: 0.99.0 Release: 0.02 @@ -17,13 +19,33 @@ BuildRequires: xorg-lib-libFS-devel BuildRequires: xorg-lib-libXfont-devel BuildRequires: xorg-util-util-macros +Obsoletes: X11-xfs +Obsoletes: XFree86-xfs +Obsoletes: xfs +Obsoletes: xfsft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -xfs application. +This is a font server for X Window System. You can serve fonts to +other X servers remotely with this package, and the remote system will +be able to use all fonts installed on the font server, even if they +are not installed on the remote computer. %description -l pl -Aplikacja xfs. +Pakiet zawiera serwer font?w dla X Window System. Mo?e udost?pnia? +fonty dla X serwer?w lokalnych lub zdalnych. + +%description -l ru +xfs ???????? ?????? ??????? ??? X Window System. Xfs ????? ????? +????????????? ?????? ????????? X-????????. ????????? ??????? ????? +???????? ???????????? ??? ??????, ????????????? ?? ??????? ???????, +???? ???? ??? ?? ??????????? ?? ????????? ??????????. + +%description -l uk +xfs ??????? ?????? ??????? ??? X Window System. Xfs ????? ???? +???????? ?????? ?????????? X-????????. ????????? ??????? ????? +??????????????? ??? ??????, ??? ??????????? ?? ??????? ???????, ?????? +???? ???? ?? ??????????? ?? ??????????? ????'?????. %prep %setup -q -n xfs-%{version} @@ -60,6 +82,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 10:51:16 qboosh +- merged descs from X11.spec, Obsoletes for X.org/XFree86 packages + Revision 1.5 2005/08/27 21:46:18 qboosh - sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-xfs.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 12:51:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: xorg-app-twm.spec - copy-pastos In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:51:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - copy-pastos ---- Files affected: SPECS: xorg-app-twm.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/xorg-app-twm.spec diff -u SPECS/xorg-app-twm.spec:1.6 SPECS/xorg-app-twm.spec:1.7 --- SPECS/xorg-app-twm.spec:1.6 Sun Aug 28 12:41:02 2005 +++ SPECS/xorg-app-twm.spec Sun Aug 28 12:51:42 2005 @@ -34,10 +34,10 @@ ustawianie focusu klikni?ciem lub po?o?eniem wska?nika myszy, definiowalne przypisania klawiszy i przycisk?w myszy. -%description twm -l ru +%description -l ru ??????? ?????????? ??????? ????????. -%description twm -l uk +%description -l uk ??????? ?????????? ???????? ????????. %prep @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:51:42 qboosh +- copy-pastos + Revision 1.6 2005/08/28 10:41:02 qboosh - merged descs from X11.spec, Obsoletes for X.org/XFree86 packages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-app-twm.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:04 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: vigra.spec - updated to 1.3.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 10:55:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.3 ---- Files affected: SPECS: vigra.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/vigra.spec diff -u SPECS/vigra.spec:1.6 SPECS/vigra.spec:1.7 --- SPECS/vigra.spec:1.6 Sun Apr 3 00:30:48 2005 +++ SPECS/vigra.spec Sun Aug 28 12:54:58 2005 @@ -2,12 +2,12 @@ Summary: Generic Programming for Computer Vision Summary(pl): Og?lne programowanie obrazu komputerowego Name: vigra -Version: 1.3.2 +Version: 1.3.3 Release: 1 License: The VIGRA Artistic License Group: Libraries Source0: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz -# Source0-md5: 6a787f86df5e45be809ac97c86acddae +# Source0-md5: 518d546d5ebd9388fb0dc968c1e91280 Patch0: %{name}-ac.patch URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/ BuildRequires: autoconf @@ -17,7 +17,9 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libtiff-devel -BuildRequires: libtool >= 2:1.4d +BuildRequires: libtool >= 2:1.5 +#BuildRequires: python +#BuildRequires: python-devel BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -97,6 +99,8 @@ --with-tiff \ --with-zlib +# --with-python requires src/pythonbindings (missing in sources) + %{__make} %install @@ -141,6 +145,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 10:54:58 qboosh +- updated to 1.3.3 + Revision 1.6 2005/04/02 22:30:48 qboosh - updated to 1.3.2, updated ac patch - BR: fftw3-devel instead of fftw-devel (fftw3 is preferred in configure) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vigra.spec?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 12:55:27 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: vigra1.3.3.tar.gz Message-ID: <3016.1125226527@distfiles.pld-linux.org> Files fetched: 1 STORED: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/vigra1.3.3.tar.gz 518d546d5ebd9388fb0dc968c1e91280 vigra1.3.3.tar.gz Size: 12233525 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: sredird-2.2.2.tar.gz Message-ID: <10403.1125226831@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://metalab.unc.edu/pub/Linux/system/serial/sredird-2.2.2.tar.gz e541e4b1cb9fa8fc8ff0e76bb1127cda sredird-2.2.2.tar.gz Size: 25495 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:00:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: sredird.spec - updated to 2.2.2 (security fixes: remotely e... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:00:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) ---- Files affected: SPECS: sredird.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/sredird.spec diff -u SPECS/sredird.spec:1.11 SPECS/sredird.spec:1.12 --- SPECS/sredird.spec:1.11 Wed Sep 15 22:36:19 2004 +++ SPECS/sredird.spec Sun Aug 28 13:00:23 2005 @@ -1,15 +1,13 @@ # $Revision$, $Date$ -# TODO: -# - SECURITY: http://securitytracker.com/alerts/2004/Aug/1011038.html Summary: RFC 2217-compliant serial port redirector Summary(pl): Program przekierowuj?cy port szeregowy zgodny z RFC 2217 Name: sredird -Version: 2.2.1 +Version: 2.2.2 Release: 1 License: GPL Group: Networking Source0: ftp://metalab.unc.edu/pub/Linux/system/serial/%{name}-%{version}.tar.gz -# Source0-md5: a6b8f03ddb9657f533bd218110c3e635 +# Source0-md5: e541e4b1cb9fa8fc8ff0e76bb1127cda URL: http://www.ibiblio.org/pub/Linux/system/serial/!INDEX.html BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,6 +49,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 11:00:23 qboosh +- updated to 2.2.2 (security fixes: remotely exploitable format bug and stack overflow) + Revision 1.11 2004/09/15 20:36:19 blues - URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sredird.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 13:05:55 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: sox-12.17.8.tar.gz Message-ID: <18826.1125227155@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/sox/sox-12.17.8.tar.gz 735e9add6979bd6308f213abefe389e8 sox-12.17.8.tar.gz Size: 462079 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 13:05:56 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: sox.spec - updated to 12.17.8 (bugfixes, incl. SMP buffer o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 11:05:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) ---- Files affected: SPECS: sox.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/sox.spec diff -u SPECS/sox.spec:1.43 SPECS/sox.spec:1.44 --- SPECS/sox.spec:1.43 Sat Dec 25 22:51:41 2004 +++ SPECS/sox.spec Sun Aug 28 13:05:51 2005 @@ -13,12 +13,12 @@ Summary(tr): Genel ama?l? ses dosyas? ?evirme arac? Summary(uk): ??????? ?????????? ??????????? ??? ?????? ?? ????????? ??????? Name: sox -Version: 12.17.7 +Version: 12.17.8 Release: 1 License: distributable Group: Applications/Sound Source0: http://dl.sourceforge.net/sox/%{name}-%{version}.tar.gz -# Source0-md5: a6876289602c1f2896b39e6a88e2a574 +# Source0-md5: 735e9add6979bd6308f213abefe389e8 Patch0: %{name}-play.patch Patch1: %{name}-install.patch URL: http://sox.sourceforge.net/ @@ -140,6 +140,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 11:05:51 qboosh +- updated to 12.17.8 (bugfixes, incl. SMP buffer overflow) + Revision 1.43 2004/12/25 21:51:41 qboosh - updated to 12.17.7, updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sox.spec?r1=1.43&r2=1.44&f=u From wiget at pld-linux.org Sun Aug 28 13:27:37 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: asa-0.1.7.tar.gz Message-ID: <19159.1125228457@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apatsch.wroc.biz/asa/asa-0.1.7.tar.gz 2a754e9ab1220f79060a68a46a76cc6c asa-0.1.7.tar.gz Size: 24797 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:27:36 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: asa.spec - 0.1.7 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:27:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.1.7 ---- Files affected: SPECS: asa.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/asa.spec diff -u SPECS/asa.spec:1.17 SPECS/asa.spec:1.18 --- SPECS/asa.spec:1.17 Sat Jun 4 10:24:19 2005 +++ SPECS/asa.spec Sun Aug 28 13:27:30 2005 @@ -7,12 +7,12 @@ Summary: Jabber server component agent for sending SMS messages Summary(pl): Komponent serwera Jabbera do wysy?ania wiadomo?ci SMS Name: asa -Version: 0.1.6 -Release: 1.2 +Version: 0.1.7 +Release: 1 License: GPL Group: Applications/Communications Source0: http://www.apatsch.wroc.biz/asa/%{name}-%{version}.tar.gz -# Source0-md5: 1f758fe0f38e3dcd6863fbe93f7e814d +# Source0-md5: 2a754e9ab1220f79060a68a46a76cc6c Source1: jabber-asa-transport.init Source2: %{name}.sh Patch0: %{name}-PLD.patch @@ -105,6 +105,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 11:27:30 wiget +- 0.1.7 + Revision 1.17 2005/06/04 08:24:19 dzeus - added userrun.patch (runs as jabber user without su) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asa.spec?r1=1.17&r2=1.18&f=u From wiget at pld-linux.org Sun Aug 28 13:34:28 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: gnome-btdownload-0.0.22.tar.gz Message-ID: <28679.1125228868@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/gnome-bt/gnome-btdownload-0.0.22.tar.gz b52df0c8b0c28aa0cc8814ff4754cef9 gnome-btdownload-0.0.22.tar.gz Size: 154900 bytes -- Virtually Yours: distfiles. From wiget at pld-linux.org Sun Aug 28 13:34:27 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: gnome-btdownload.spec - updated to 0.0.22 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 11:34:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.0.22 ---- Files affected: SPECS: gnome-btdownload.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/gnome-btdownload.spec diff -u SPECS/gnome-btdownload.spec:1.5 SPECS/gnome-btdownload.spec:1.6 --- SPECS/gnome-btdownload.spec:1.5 Sun May 1 08:38:59 2005 +++ SPECS/gnome-btdownload.spec Sun Aug 28 13:34:21 2005 @@ -2,12 +2,12 @@ Summary: GNOME BitTorrent downloader Summary(pl): Narz?dzie do ?ci?gania protoko?em BitTorrent dla GNOME Name: gnome-btdownload -Version: 0.0.20 -Release: 2 +Version: 0.0.22 +Release: 1 License: BSD Group: X11/Applications Source0: http://dl.sourceforge.net/gnome-bt/%{name}-%{version}.tar.gz -# Source0-md5: dd7ad29c9c5689dc73a736d44dde2bef +# Source0-md5: b52df0c8b0c28aa0cc8814ff4754cef9 Patch0: %{name}-desktop.patch URL: http://gnome-bt.sourceforge.net/ BuildRequires: python-gnome-devel >= 2.10.0 @@ -73,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 11:34:21 wiget +- updated to 0.0.22 + Revision 1.5 2005/05/01 06:38:59 ankry - unified caps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-btdownload.spec?r1=1.5&r2=1.6&f=u From areq at pld-linux.org Sun Aug 28 13:49:41 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: mISDN.spec (NEW) - new ISDN stack of the linux kernel versi... In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 11:49:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY ---- Files affected: SPECS: mISDN.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u /dev/null SPECS/mISDN.spec:1.1 --- /dev/null Sun Aug 28 13:49:41 2005 +++ SPECS/mISDN.spec Sun Aug 28 13:49:36 2005 @@ -0,0 +1,141 @@ +%bcond_without dist_kernel # allow non-distribution kernel +%bcond_without smp # don't build SMP module +%bcond_with verbose # verbose build (V=1) + +%define mISDN_version CVS-2005-07-06 + +Summary: mISDN - modular ISDN +Name: mISDN +Version: 2005.07.06 +%define _rel 0.1 +Release: %{_rel} +License: GPL +Group: Base/Kernel +Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/%{name}-%{mISDN_version}.tar.bz2 +# Source0-md5: f8892d49e00e3fa26e65e22084edd472 +URL: http://www.isdn4linux.de/mISDN/ +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} +BuildRequires: rpmbuild(macros) >= 1.217 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. + +%package -n kernel-isdn-mISDN +Summary: Linux driver for mISDN +Summary(pl): Sterownik dla Linuksa do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_up +Requires(postun): %releq_kernel_up +%endif + +%description -n kernel-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux module. + +%description -n kernel-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa. + +%package -n kernel-smp-isdn-mISDN +Summary: Linux SMP driver for mISDN +Summary(pl): Sterownik dla Linuksa SMP do mISDN +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +%if %{with dist_kernel} +%requires_releq_kernel_smp +Requires(postun): %releq_kernel_smp +%endif + +%description -n kernel-smp-isdn-mISDN +This is driver for mISDN for Linux. + +This package contains Linux SMP module. + +%description -n kernel-smp-isdn-mISDN -l pl +Sterownik dla Linuksa do mISDN. + +Ten pakiet zawiera modu? j?dra Linuksa SMP. + +%prep +%setup -q -n %{name}-%{mISDN_version} + +mv Makefile.module Makefile + +%build + +for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then + exit 1 + fi + rm -rf include + install -d include/{linux,config} + ln -sf %{_kernelsrcdir}/config-$cfg .config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h + ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm + touch include/config/MARKER + + %{__make} -C %{_kernelsrcdir} clean \ + RCS_FIND_IGNORE="-name '*.ko' -o" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + %{__make} -C %{_kernelsrcdir} modules \ + CC="%{__cc}" CPP="%{__cpp}" \ + M=$PWD O=$PWD \ + %{?with_verbose:V=1} + +# mv mISDN{,-$cfg}.ko +done + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/drivers/isdn/hardware/mISDN +install mISDN-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/ +%if %{with smp} && %{with dist_kernel} +install mISDN-smp.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/ +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%postun -n kernel-isdn-mISDN +%depmod %{_kernel_ver} + +%post -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%postun -n kernel-smp-isdn-mISDN +%depmod %{_kernel_ver}smp + +%files -n kernel-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/drivers/isdn/hardware/mISDN/*.ko* + +%if %{with smp} && %{with dist_kernel} +%files -n kernel-smp-isdn-mISDN +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}smp/drivers/isdn/hardware/mISDN/*.ko* +%endif + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 11:49:36 areq +- new ISDN stack of the linux kernel version 2.6 +- raw PLD spec, NFY + ================================================================ From glen at pld-linux.org Sun Aug 28 13:55:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: kexec-tools.spec - BR for tar --strip-components=1 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 11:55:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR for tar --strip-components=1 ---- Files affected: SPECS: kexec-tools.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/kexec-tools.spec diff -u SPECS/kexec-tools.spec:1.12 SPECS/kexec-tools.spec:1.13 --- SPECS/kexec-tools.spec:1.12 Sun Aug 28 12:22:51 2005 +++ SPECS/kexec-tools.spec Sun Aug 28 13:55:43 2005 @@ -15,6 +15,7 @@ URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRequires: autoconf BuildRequires: glibc-devel +BuildRequires: tar >= 1:1.15.1 BuildRequires: zlib-devel ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -68,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.13 2005/08/28 11:55:43 glen +- BR for tar --strip-components=1 + Revision 1.12 2005/08/28 10:22:51 qboosh - readded opt patch - synced descs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kexec-tools.spec?r1=1.12&r2=1.13&f=u From areq at pld-linux.org Sun Aug 28 14:03:45 2005 From: areq at pld-linux.org (areq) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS (LINUX_2_6): kernel.spec - move mISDN to mISDN.spec In-Reply-To: References: Message-ID: Author: areq Date: Sun Aug 28 12:03:45 2005 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - move mISDN to mISDN.spec ---- Files affected: SPECS: kernel.spec (1.441.2.1169 -> 1.441.2.1170) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1169 SPECS/kernel.spec:1.441.2.1170 --- SPECS/kernel.spec:1.441.2.1169 Sat Aug 27 22:00:19 2005 +++ SPECS/kernel.spec Sun Aug 28 14:03:39 2005 @@ -115,7 +115,6 @@ %define pcmcia_version 3.1.22 %define drm_xfree_version 4.3.0 -%define mISDN_version CVS-2005-07-06 Summary: The Linux kernel (the core of the Linux operating system) Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems) @@ -169,10 +168,6 @@ Source95: kernel-linuxabi.config Source96: kernel-ocfs2.config -Source100: ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/mISDN-%{mISDN_version}.tar.bz2 -# Source100-md5: f8892d49e00e3fa26e65e22084edd472 - - Patch0: 2.6.0-ksyms-add.patch Patch1: linux-2.6-version.patch Patch2: linux-2.6-biarch-build.patch @@ -626,7 +621,7 @@ /usr/src/linux/Documentation. %prep -%setup -q -n linux-%{version}%{_rc} -a 100 +%setup -q -n linux-%{version}%{_rc} %patch0 -p1 %patch1 -p0 @@ -748,12 +743,6 @@ # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig -# mISDN -%ifarch %{ix86} -cd mISDN-%{mISDN_version} -./std2kern -k ../ -%endif - %build TuneUpConfigForIX86 () { %ifarch %{ix86} @@ -1501,6 +1490,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.441.2.1170 2005/08/28 12:03:39 areq +- move mISDN to mISDN.spec + Revision 1.441.2.1169 2005/08/27 20:00:19 areq - add mISDN (ix86 only) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1169&r2=1.441.2.1170&f=u From wiget at pld-linux.org Sun Aug 28 15:08:44 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: openldap.spec - updated to 2.3.6 In-Reply-To: References: Message-ID: Author: wiget Date: Sun Aug 28 13:08:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.3.6 ---- Files affected: SPECS: openldap.spec (1.207 -> 1.208) ---- Diffs: ================================================================ Index: SPECS/openldap.spec diff -u SPECS/openldap.spec:1.207 SPECS/openldap.spec:1.208 --- SPECS/openldap.spec:1.207 Mon Aug 15 17:19:20 2005 +++ SPECS/openldap.spec Sun Aug 28 15:08:38 2005 @@ -19,12 +19,12 @@ Summary(ru): ??????? ???????? LDAP Summary(uk): ?????? ???????? LDAP Name: openldap -Version: 2.3.5 +Version: 2.3.6 Release: 1 License: OpenLDAP Public License Group: Networking/Daemons Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz -# Source0-md5: 732b5ac8c638155f1f27196ac9e0b9e2 +# Source0-md5: 672ec287ce61a7dba56762e95252fd28 Source1: ldap.init Source2: %{name}.sysconfig Source3: ldap.conf @@ -1257,6 +1257,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.208 2005/08/28 13:08:38 wiget +- updated to 2.3.6 + Revision 1.207 2005/08/15 15:19:20 qboosh - updated to 2.3.5, updated make_man_link patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openldap.spec?r1=1.207&r2=1.208&f=u From wiget at pld-linux.org Sun Aug 28 15:09:11 2005 From: wiget at pld-linux.org (wiget) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: openldap-2.3.6.tgz Message-ID: <28875.1125234551@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.3.6.tgz 672ec287ce61a7dba56762e95252fd28 openldap-2.3.6.tgz Size: 3538388 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:11:16 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: wget-strptime.patch (REMOVED), wget-segv.patch (REMOVED) ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:16 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: wget-strptime.patch (1.1 -> NONE) (REMOVED), wget-segv.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 15:11:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: wget-ac.patch - more gettext and automake issues In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:11:52 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - more gettext and automake issues ---- Files affected: SOURCES: wget-ac.patch (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SOURCES/wget-ac.patch diff -u SOURCES/wget-ac.patch:1.12 SOURCES/wget-ac.patch:1.13 --- SOURCES/wget-ac.patch:1.12 Wed Jun 22 14:34:59 2005 +++ SOURCES/wget-ac.patch Sun Aug 28 15:11:47 2005 @@ -1,15 +1,19 @@ ---- wget-1.9.1/configure.in.orig 2003-11-08 20:15:35.000000000 +0100 -+++ wget-1.9.1/configure.in 2003-11-16 11:46:45.947950144 +0100 -@@ -541,7 +541,8 @@ - dnl new language was added. +--- wget-1.10.1/configure.in.orig 2005-08-11 23:35:27.000000000 +0200 ++++ wget-1.10.1/configure.in 2005-08-28 13:42:34.625493608 +0200 +@@ -437,6 +437,7 @@ + ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')` dnl internationalization macros --WGET_WITH_NLS +AM_GNU_GETTEXT -+WGET_WITH_NLS + WGET_WITH_NLS dnl - dnl Find makeinfo. We used to provide support for Emacs processing +@@ -473,5 +474,4 @@ + #include "config-post.h" + ]) + AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) +-AC_CONFIG_COMMANDS([default], [WGET_PROCESS_PO]) + AC_OUTPUT diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in --- wget-1.9-b5.org/Makefile.in 2003-10-12 23:55:54.000000000 +0200 +++ wget-1.9-b5/Makefile.in 2003-10-13 00:29:14.000000000 +0200 @@ -89,3 +93,32 @@ /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time +--- wget-1.10.1/m4/wget.m4.orig 2005-06-27 00:06:49.000000000 +0200 ++++ wget-1.10.1/m4/wget.m4 2005-08-28 13:31:58.190246472 +0200 +@@ -156,7 +156,7 @@ + # program @code{ansi2knr}, which comes with Ghostscript. + # @end defmac + +-AC_DEFUN(AM_PROG_CC_STDC, ++AC_DEFUN([AM_PROG_CC_STDC], + [AC_REQUIRE([AC_PROG_CC]) + AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) + AC_CACHE_VAL(am_cv_prog_cc_stdc, +@@ -390,7 +390,7 @@ + dnl This is not strictly an Autoconf macro, because it is run from + dnl within `config.status' rather than from within configure. This + dnl is why special rules must be applied for it. +-AC_DEFUN(WGET_PROCESS_PO, ++AC_DEFUN([WGET_PROCESS_PO], + [ + dnl I wonder what the following several lines do... + if test "x$srcdir" != "x."; then +@@ -426,7 +426,7 @@ + + dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, + dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-AC_DEFUN(AM_PATH_PROG_WITH_TEST, ++AC_DEFUN([AM_PATH_PROG_WITH_TEST], + [# Extract the first word of "$2", so it can be a program name with args. + set dummy $2; ac_word=[$]2 + AC_MSG_CHECKING([for $ac_word]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-ac.patch?r1=1.12&r2=1.13&f=u From qboosh at pld-linux.org Sun Aug 28 15:12:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: wget-pl.patch - real update for 1.10.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:12:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - real update for 1.10.1 ---- Files affected: SOURCES: wget-pl.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/wget-pl.patch diff -u SOURCES/wget-pl.patch:1.7 SOURCES/wget-pl.patch:1.8 --- SOURCES/wget-pl.patch:1.7 Wed Jun 22 11:47:15 2005 +++ SOURCES/wget-pl.patch Sun Aug 28 15:12:43 2005 @@ -1,71 +1,2323 @@ ---- wget-1.9/po/pl.po.orig 2003-10-20 16:57:45.000000000 +0200 -+++ wget-1.9/po/pl.po 2003-10-26 01:45:36.000000000 +0200 -@@ -8,10 +8,10 @@ +--- wget-1.10.1/po/pl.po.orig 2005-08-16 23:59:28.000000000 +0200 ++++ wget-1.10.1/po/pl.po 2005-08-28 15:02:42.270620456 +0200 +@@ -5,184 +5,220 @@ + # Arkadiusz Mi?kiewicz , 1998-2000. + # Wojciech Kotwica 2002-03-20 11:12+01:00 + # v. 1.9-b5 by Emil Nowak 2003-10-15 00:28+02:00 ++# Jakub Bogusz , 2005 # msgid "" msgstr "" -"Project-Id-Version: wget 1.9-b5\n" -+"Project-Id-Version: wget 1.10\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-06 09:11-0400\n" +-"POT-Creation-Date: 2003-10-11 16:21+0200\n" -"PO-Revision-Date: 2003-10-15 00:28+02:00\n" -+"PO-Revision-Date: 2003-10-26 01:20+0200\n" - "Last-Translator: Wojciech Kotwica \n" +-"Last-Translator: Wojciech Kotwica \n" ++"Project-Id-Version: wget 1.10.1\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2005-08-28 13:44+0200\n" ++"PO-Revision-Date: 2005-08-28 13:10+0200\n" ++"Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" -@@ -71,9 +71,9 @@ + "Content-Type: text/plain; charset=iso-8859-2\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: src/connect.c:88 ++#: src/connect.c:199 + #, c-format +-msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" +-msgstr "Nieudana konwersja `%s' na powi?zany adres. Powr?t do ANY.\n" ++msgid "%s: unable to resolve bind address `%s'; disabling bind.\n" ++msgstr "%s: nie mo?na rozwi?za? adresu bind `%s'; wy??czanie bind.\n" + +-#: src/connect.c:165 ++#: src/connect.c:271 + #, c-format +-msgid "Connecting to %s[%s]:%hu... " +-msgstr "??czenie si? z %s[%s]:%hu... " ++msgid "Connecting to %s|%s|:%d... " ++msgstr "??czenie si? z %s|%s|:%d... " + +-#: src/connect.c:168 ++#: src/connect.c:274 + #, c-format +-msgid "Connecting to %s:%hu... " +-msgstr "??czenie si? z %s:%hu... " ++msgid "Connecting to %s:%d... " ++msgstr "??czenie si? z %s:%d... " + +-#: src/connect.c:222 ++#: src/connect.c:335 + msgid "connected.\n" + msgstr "po??czono.\n" + +-#: src/convert.c:171 ++#: src/connect.c:347 src/host.c:789 src/host.c:818 + #, c-format +-msgid "Converted %d files in %.2f seconds.\n" +-msgstr "Przekonwertowano %d plik?w w %.2f sekund.\n" ++msgid "failed: %s.\n" ++msgstr "nieudane: %s.\n" ++ ++#: src/convert.c:176 ++#, c-format ++msgid "Converted %d files in %.*f seconds.\n" ++msgstr "Przekonwertowano %d plik?w w %.*f sekund.\n" + +-#: src/convert.c:197 ++#: src/convert.c:202 + #, c-format + msgid "Converting %s... " + msgstr "Konwertowanie %s... " + +-#: src/convert.c:210 ++#: src/convert.c:215 + msgid "nothing to do.\n" + msgstr "nic do roboty.\n" + +-#: src/convert.c:218 src/convert.c:242 ++#: src/convert.c:223 src/convert.c:247 + #, c-format + msgid "Cannot convert links in %s: %s\n" + msgstr "Nie mo?na przekonwertowa? odno?nik?w w %s: %s\n" + +-#: src/convert.c:233 ++#: src/convert.c:238 + #, c-format + msgid "Unable to delete `%s': %s\n" + msgstr "Nie uda?o si? usun?? `%s': %s\n" + +-#: src/convert.c:439 ++#: src/convert.c:447 + #, c-format + msgid "Cannot back up %s as %s: %s\n" + msgstr "Nie mo?na stworzy? kopii zapasowej %s jako %s: %s\n" + +-#: src/cookies.c:606 ++#: src/cookies.c:619 + #, c-format + msgid "Error in Set-Cookie, field `%s'" msgstr "B??d w Set-Cookie, w polu `%s'" - #: src/cookies.c:643 +-#: src/cookies.c:629 -#, fuzzy, c-format ++#: src/cookies.c:643 +#, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" -msgstr "B??d sk?adni w Set-Cookie: przedwczesny koniec ci?gu znak?w.\n" +msgstr "B??d sk?adni w Set-Cookie: %s na pozycji %d.\n" ++ ++#: src/cookies.c:881 ++#, c-format ++msgid "Cookie coming from %s attempted to set domain to %s\n" ++msgstr "Ciasteczko pochodz?ce z %s pr?bowa?o ustawi? domen? na %s\n" + +-#: src/cookies.c:1426 ++#: src/cookies.c:1328 src/cookies.c:1477 + #, c-format + msgid "Cannot open cookies file `%s': %s\n" + msgstr "Nie mo?na otworzy? pliku ciasteczek `%s': %s\n" + +-#: src/cookies.c:1438 ++#: src/cookies.c:1489 + #, c-format + msgid "Error writing to `%s': %s\n" + msgstr "B??d podczas zapisu do `%s': %s\n" + +-#: src/cookies.c:1442 ++#: src/cookies.c:1492 + #, c-format + msgid "Error closing `%s': %s\n" + msgstr "B??d podczas zamykania `%s': %s\n" + +-#: src/ftp-ls.c:812 ++#: src/ftp-ls.c:843 + msgid "Unsupported listing type, trying Unix listing parser.\n" +-msgstr "Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" ++msgstr "" ++"Nieobs?ugiwany typ listy plik?w, pr?bowanie analizatora list Uniksowych.\n" + +-#: src/ftp-ls.c:857 src/ftp-ls.c:859 ++#: src/ftp-ls.c:889 src/ftp-ls.c:891 + #, c-format + msgid "Index of /%s on %s:%d" + msgstr "Indeks /%s na %s:%d" + +-#: src/ftp-ls.c:882 ++#: src/ftp-ls.c:914 ++#, c-format + msgid "time unknown " + msgstr "czas nieznany " + +-#: src/ftp-ls.c:886 ++#: src/ftp-ls.c:918 ++#, c-format + msgid "File " + msgstr "Plik " + +-#: src/ftp-ls.c:889 ++#: src/ftp-ls.c:921 ++#, c-format + msgid "Directory " + msgstr "Katalog " + +-#: src/ftp-ls.c:892 ++#: src/ftp-ls.c:924 ++#, c-format + msgid "Link " + msgstr "Odno?nik " + +-#: src/ftp-ls.c:895 ++#: src/ftp-ls.c:927 ++#, c-format + msgid "Not sure " + msgstr "Nie pewny " + +-#: src/ftp-ls.c:913 ++#: src/ftp-ls.c:945 + #, c-format + msgid " (%s bytes)" + msgstr " (%s bajt?w)" + +-#. Second: Login with proper USER/PASS sequence. +-#: src/ftp.c:202 ++#: src/ftp.c:226 ++#, c-format ++msgid "Length: %s" ++msgstr "D?ugo??: %s" ++ ++#: src/ftp.c:232 src/http.c:1862 ++#, c-format ++msgid ", %s (%s) remaining" ++msgstr ", pozosta?o %s (%s)" ++ ++#: src/ftp.c:236 src/http.c:1866 ++#, c-format ++msgid ", %s remaining" ++msgstr ", pozosta?o %s" ++ ++#: src/ftp.c:239 ++msgid " (unauthoritative)\n" ++msgstr " (nie autorytatywne)\n" ++ ++#: src/ftp.c:314 + #, c-format + msgid "Logging in as %s ... " + msgstr "Logowanie si? jako %s ... " + +-#: src/ftp.c:215 src/ftp.c:268 src/ftp.c:299 src/ftp.c:353 src/ftp.c:468 +-#: src/ftp.c:519 src/ftp.c:551 src/ftp.c:611 src/ftp.c:675 src/ftp.c:748 +-#: src/ftp.c:796 ++#: src/ftp.c:327 src/ftp.c:373 src/ftp.c:402 src/ftp.c:454 src/ftp.c:566 ++#: src/ftp.c:612 src/ftp.c:640 src/ftp.c:698 src/ftp.c:759 src/ftp.c:819 ++#: src/ftp.c:866 + msgid "Error in server response, closing control connection.\n" + msgstr "B??d w odpowiedzi serwera, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:223 ++#: src/ftp.c:334 + msgid "Error in server greeting.\n" + msgstr "B??d w powitaniu serwera.\n" + +-#: src/ftp.c:231 src/ftp.c:362 src/ftp.c:477 src/ftp.c:560 src/ftp.c:621 +-#: src/ftp.c:685 src/ftp.c:758 src/ftp.c:806 ++#: src/ftp.c:341 src/ftp.c:462 src/ftp.c:574 src/ftp.c:648 src/ftp.c:708 ++#: src/ftp.c:769 src/ftp.c:829 src/ftp.c:876 + msgid "Write failed, closing control connection.\n" + msgstr "Niepowodzenie podczas zapisu, zamykanie po??czenia steruj?cego.\n" + +-#: src/ftp.c:238 ++#: src/ftp.c:347 + msgid "The server refuses login.\n" + msgstr "Serwer nie pozwala na zalogowanie si?.\n" + +-#: src/ftp.c:245 ++#: src/ftp.c:353 + msgid "Login incorrect.\n" + msgstr "Nieprawid?owy login lub has?o.\n" + +-#: src/ftp.c:252 ++#: src/ftp.c:359 + msgid "Logged in!\n" + msgstr "Zalogowano si?!\n" + +-#: src/ftp.c:277 ++#: src/ftp.c:381 + msgid "Server error, can't determine system type.\n" + msgstr "B??d serwera, nie mo?na ustali? typu systemu.\n" + +-#: src/ftp.c:287 src/ftp.c:596 src/ftp.c:659 src/ftp.c:716 ++#: src/ftp.c:390 src/ftp.c:685 src/ftp.c:742 src/ftp.c:785 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:341 src/ftp.c:498 src/ftp.c:533 src/ftp.c:779 src/ftp.c:827 ++#: src/ftp.c:442 src/ftp.c:591 src/ftp.c:624 src/ftp.c:849 src/ftp.c:895 + msgid "done.\n" + msgstr "zrobiono.\n" + +-#: src/ftp.c:370 ++#: src/ftp.c:469 + #, c-format + msgid "Unknown type `%c', closing control connection.\n" + msgstr "Nieznany typ `%c', zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:383 ++#: src/ftp.c:481 + msgid "done. " + msgstr "zrobiono. " + +-#: src/ftp.c:389 ++#: src/ftp.c:487 + msgid "==> CWD not needed.\n" + msgstr "==> CWD nie jest potrzebne.\n" + +-#: src/ftp.c:484 ++#: src/ftp.c:580 + #, c-format + msgid "" + "No such directory `%s'.\n" +@@ -191,43 +227,33 @@ + "Nie ma katalogu `%s'.\n" + "\n" + +-#. do not CWD +-#: src/ftp.c:502 ++#: src/ftp.c:595 + msgid "==> CWD not required.\n" + msgstr "==> CWD nie wymagane.\n" + +-#: src/ftp.c:567 ++#: src/ftp.c:654 + msgid "Cannot initiate PASV transfer.\n" + msgstr "Nie mo?na zainicjowa? przesy?ania typu PASV.\n" + +-#: src/ftp.c:571 ++#: src/ftp.c:658 + msgid "Cannot parse PASV response.\n" + msgstr "Nie mo?na przeanalizowa? sk?adni odpowiedzi PASV.\n" + +-#: src/ftp.c:588 ++#: src/ftp.c:676 + #, c-format +-msgid "couldn't connect to %s:%hu: %s\n" +-msgstr "nie uda?o si? po??czy? z %s:%hu: %s\n" ++msgid "couldn't connect to %s port %d: %s\n" ++msgstr "nie uda?o si? po??czy? z %s na port %d: %s\n" + +-#: src/ftp.c:638 ++#: src/ftp.c:724 + #, c-format + msgid "Bind error (%s).\n" + msgstr "B??d Bind (%s).\n" + +-#: src/ftp.c:645 ++#: src/ftp.c:730 + msgid "Invalid PORT.\n" + msgstr "Nieprawid?owe PORT.\n" + +-#: src/ftp.c:698 +-#, c-format +-msgid "" +-"\n" +-"REST failed; will not truncate `%s'.\n" +-msgstr "" +-"\n" +-"REST nieudane; zawarto?? `%s' nie zostanie obci?ta.\n" +- +-#: src/ftp.c:705 ++#: src/ftp.c:776 + msgid "" + "\n" + "REST failed, starting from scratch.\n" +@@ -235,7 +261,7 @@ + "\n" + "REST nieudane, rozpoczynanie od pocz?tku.\n" + +-#: src/ftp.c:766 ++#: src/ftp.c:837 + #, c-format + msgid "" + "No such file `%s'.\n" +@@ -244,7 +270,7 @@ + "Nie ma pliku `%s'.\n" + "\n" + +-#: src/ftp.c:814 ++#: src/ftp.c:884 + #, c-format + msgid "" + "No such file or directory `%s'.\n" +@@ -253,86 +279,75 @@ + "Nie ma pliku ani katalogu `%s'.\n" + "\n" + +-#: src/ftp.c:898 src/ftp.c:906 ++#: src/ftp.c:946 src/http.c:1923 + #, c-format +-msgid "Length: %s" +-msgstr "D?ugo??: %s" ++msgid "%s has sprung into existence.\n" ++msgstr "%s zacz?? istnie?.\n" + +-#: src/ftp.c:900 src/ftp.c:908 +-#, c-format +-msgid " [%s to go]" +-msgstr " [%s do ko?ca]" +- +-#: src/ftp.c:910 +-msgid " (unauthoritative)\n" +-msgstr " (nie autorytatywne)\n" +- +-#: src/ftp.c:936 ++#: src/ftp.c:1008 + #, c-format + msgid "%s: %s, closing control connection.\n" + msgstr "%s: %s, zamykanie po??czenienia steruj?cego.\n" + +-#: src/ftp.c:944 ++#: src/ftp.c:1016 + #, c-format + msgid "%s (%s) - Data connection: %s; " + msgstr "%s (%s) - Po??czenie danych: %s; " + +-#: src/ftp.c:961 ++#: src/ftp.c:1030 + msgid "Control connection closed.\n" + msgstr "Zamkni?to po??czenie steruj?ce.\n" + +-#: src/ftp.c:979 ++#: src/ftp.c:1049 + msgid "Data transfer aborted.\n" + msgstr "Przerwano przesy?anie danych.\n" + +-#: src/ftp.c:1044 ++#: src/ftp.c:1117 + #, c-format +-msgid "File `%s' already there, not retrieving.\n" ++msgid "File `%s' already there; not retrieving.\n" + msgstr "Plik `%s' ju? istnieje, bez pobierania.\n" + +-#: src/ftp.c:1114 src/http.c:1716 ++#: src/ftp.c:1185 src/http.c:2146 + #, c-format + msgid "(try:%2d)" + msgstr "(pr?ba:%2d)" + +-#: src/ftp.c:1180 src/http.c:1975 ++#: src/ftp.c:1255 src/http.c:2423 + #, c-format + msgid "" +-"%s (%s) - `%s' saved [%ld]\n" ++"%s (%s) - `%s' saved [%s]\n" + "\n" + msgstr "" +-"%s (%s) - zapisano `%s' [%ld]\n" ++"%s (%s) - zapisano `%s' [%s]\n" + "\n" + +-#: src/ftp.c:1222 src/main.c:890 src/recur.c:377 src/retr.c:596 ++#: src/ftp.c:1297 src/main.c:948 src/recur.c:376 src/retr.c:844 + #, c-format + msgid "Removing %s.\n" + msgstr "Usuwanie %s.\n" + +-#: src/ftp.c:1264 ++#: src/ftp.c:1339 + #, c-format + msgid "Using `%s' as listing tmp file.\n" + msgstr "U?ycie `%s' jako tymczasowego pliku dla listy.\n" + +-#: src/ftp.c:1279 ++#: src/ftp.c:1354 + #, c-format + msgid "Removed `%s'.\n" + msgstr "Usuni?to `%s'.\n" + +-#: src/ftp.c:1314 ++#: src/ftp.c:1389 + #, c-format + msgid "Recursion depth %d exceeded max. depth %d.\n" + msgstr "G??boko?? rekurencji %d przekroczy?a maksymaln? g??boko?? %d.\n" + +-#. Remote file is older, file sizes can be compared and +-#. are both equal. +-#: src/ftp.c:1384 ++#: src/ftp.c:1459 + #, c-format + msgid "Remote file no newer than local file `%s' -- not retrieving.\n" +-msgstr "Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" ++msgstr "" ++"Plik po stronie serwera nie jest nowszy ni? lokalny `%s' -- bez pobierania.\n" + +-#. Remote file is newer or sizes cannot be matched +-#: src/ftp.c:1391 ++#: src/ftp.c:1466 + #, c-format + msgid "" + "Remote file is newer than local file `%s' -- retrieving.\n" +@@ -341,21 +356,20 @@ + "Plik po stronie serwera jest nowszy ni? lokalny `%s' -- pobieranie.\n" + "\n" + +-#. Sizes do not match +-#: src/ftp.c:1398 ++#: src/ftp.c:1473 + #, c-format + msgid "" +-"The sizes do not match (local %ld) -- retrieving.\n" ++"The sizes do not match (local %s) -- retrieving.\n" + "\n" + msgstr "" +-"Rozmiary si? r??ni? (lokalny %ld) -- pobieranie.\n" ++"Rozmiary si? r??ni? (lokalny %s) -- pobieranie.\n" + "\n" + +-#: src/ftp.c:1415 ++#: src/ftp.c:1491 + msgid "Invalid name of the symlink, skipping.\n" + msgstr "Nieprawid?owa nazwa dowi?zania symbolicznego, pomijanie.\n" + +-#: src/ftp.c:1432 ++#: src/ftp.c:1508 + #, c-format + msgid "" + "Already have correct symlink %s -> %s\n" +@@ -364,70 +378,62 @@ + "Ju? istnieje poprawne dowi?zanie symboliczne %s -> %s\n" + "\n" + +-#: src/ftp.c:1440 ++#: src/ftp.c:1516 + #, c-format + msgid "Creating symlink %s -> %s\n" + msgstr "Tworzenie dowi?zania symbolicznego %s -> %s\n" + +-#: src/ftp.c:1451 ++#: src/ftp.c:1526 + #, c-format + msgid "Symlinks not supported, skipping symlink `%s'.\n" +-msgstr "Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" ++msgstr "" ++"Dowi?zania symboliczne nie s? obs?ugiwane, pomijanie symb. dowi?zania `%s'.\n" + +-#: src/ftp.c:1463 ++#: src/ftp.c:1538 + #, c-format + msgid "Skipping directory `%s'.\n" + msgstr "Pomijanie katalogu `%s'.\n" + +-#: src/ftp.c:1472 ++#: src/ftp.c:1547 + #, c-format + msgid "%s: unknown/unsupported file type.\n" + msgstr "%s: nieznany/nieobs?ugiwany typ pliku.\n" + +-#: src/ftp.c:1499 ++#: src/ftp.c:1574 + #, c-format + msgid "%s: corrupt time-stamp.\n" + msgstr "%s: znacznik czasowy uszkodzony.\n" + +-#: src/ftp.c:1524 ++#: src/ftp.c:1602 + #, c-format + msgid "Will not retrieve dirs since depth is %d (max %d).\n" + msgstr "Nie b?d? pobierane katalogi, gdy? g??boko?? wynosi %d (maks. %d).\n" + +-#: src/ftp.c:1574 ++#: src/ftp.c:1652 + #, c-format + msgid "Not descending to `%s' as it is excluded/not-included.\n" + msgstr "Bez wchodzenia do `%s', poniewa? jest on wy??czony/nie-w??czony.\n" + +-#: src/ftp.c:1639 src/ftp.c:1652 ++#: src/ftp.c:1718 src/ftp.c:1732 + #, c-format + msgid "Rejecting `%s'.\n" + msgstr "Odrzucanie `%s'.\n" + +-#. No luck. +-#. #### This message SUCKS. We should see what was the +-#. reason that nothing was retrieved. +-#: src/ftp.c:1698 ++#: src/ftp.c:1778 + #, c-format + msgid "No matches on pattern `%s'.\n" + msgstr "Brak pasuj?cych do wzorca `%s'.\n" + +-#: src/ftp.c:1764 ++#: src/ftp.c:1844 + #, c-format +-msgid "Wrote HTML-ized index to `%s' [%ld].\n" +-msgstr "Zapisano indeks w postaci HTML-u w `%s' [%ld].\n" ++msgid "Wrote HTML-ized index to `%s' [%s].\n" ++msgstr "Zapisano indeks w postaci HTML-a w `%s' [%s].\n" + +-#: src/ftp.c:1769 ++#: src/ftp.c:1849 + #, c-format + msgid "Wrote HTML-ized index to `%s'.\n" + msgstr "Zapisano indeks w postaci HTML-u w `%s'.\n" + +-#: src/gen_sslfunc.c:117 +-msgid "Could not seed OpenSSL PRNG; disabling SSL.\n" +-msgstr "" +-"Nie da?o si? ustali? ziarna generatora liczb pseudolosowych dla OpenSSL;\n" +-"wy??czenie SSL.\n" +- + #: src/getopt.c:675 + #, c-format + msgid "%s: option `%s' is ambiguous\n" +@@ -448,19 +454,16 @@ + msgid "%s: option `%s' requires an argument\n" + msgstr "%s: opcja `%s' wymaga argumentu\n" + +-#. --option + #: src/getopt.c:752 + #, c-format + msgid "%s: unrecognized option `--%s'\n" + msgstr "%s: nierozpoznana opcja `--%s'\n" + <> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/wget-pl.patch?r1=1.7&r2=1.8&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:00 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: wget.spec - updated to 1.10.1, removed obsolete strptime, se... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:14:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches ---- Files affected: SPECS: wget.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/wget.spec diff -u SPECS/wget.spec:1.121 SPECS/wget.spec:1.122 --- SPECS/wget.spec:1.121 Wed Jul 13 21:04:02 2005 +++ SPECS/wget.spec Sun Aug 28 15:13:54 2005 @@ -8,12 +8,12 @@ Summary(uk): ??????? ??? ????????? ?????? ?? ?????????? HTTP ?? FTP Summary(zh_CN): [????]??????????????????,???????????? Name: wget -Version: 1.10 -Release: 2 +Version: 1.10.1 +Release: 1 License: GPL Group: Networking/Utilities Source0: ftp://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz -# Source0-md5: caddc199d2cb31969e32b19fd365b0c5 +# Source0-md5: 879a15cc9093796b8a5035ff0d0d25ad Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f Patch0: %{name}-info.patch @@ -21,13 +21,10 @@ Patch2: %{name}-pl.patch Patch3: %{name}-wgetrc_path.patch Patch4: %{name}-home_etc.patch -Patch5: %{name}-strptime.patch -Patch6: %{name}-segv.patch URL: http://sunsite.dk/wget/ -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: intltool BuildRequires: libtool BuildRequires: openssl-devel >= 0.9.7d BuildRequires: texinfo @@ -114,18 +111,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 rm -f doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion mv -f po/{no,nb}.po %build -mv ac{local,include}.m4 %{__libtoolize} %{__gettextize} -intltoolize --copy --force -%{__aclocal} +%{__aclocal} -I m4 %{__autoheader} %{__autoconf} %configure \ @@ -161,7 +154,7 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS TODO README MAILING-LIST rmold.README -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/%{name}rc +%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}rc %attr(755,root,root) %{_bindir}/* %{_mandir}/man1/* %lang(hu) %{_mandir}/hu/man1/* @@ -174,6 +167,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 13:13:54 qboosh +- updated to 1.10.1, removed obsolete strptime,segv patches, updated ac,pl patches + Revision 1.121 2005/07/13 19:04:02 qboosh - added segv patch, release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wget.spec?r1=1.121&r2=1.122&f=u From qboosh at pld-linux.org Sun Aug 28 15:14:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: wget-1.10.1.tar.gz wget-non-english-man-pages.tar.bz2 Message-ID: <4092.1125234847@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnu.org/gnu/wget/wget-1.10.1.tar.gz 879a15cc9093796b8a5035ff0d0d25ad wget-1.10.1.tar.gz Size: 1212784 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/wget-non-english-man-pages.tar.bz2 d8b2b56ec7461606c22edbafaf8a418f wget-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:17:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: mISDN.spec - pl desc In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:17:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl desc ---- Files affected: SPECS: mISDN.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/mISDN.spec diff -u SPECS/mISDN.spec:1.1 SPECS/mISDN.spec:1.2 --- SPECS/mISDN.spec:1.1 Sun Aug 28 13:49:36 2005 +++ SPECS/mISDN.spec Sun Aug 28 15:17:36 2005 @@ -1,10 +1,14 @@ +# $Revision$, $Date$ +# +# Conditional build: %bcond_without dist_kernel # allow non-distribution kernel %bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) - +# %define mISDN_version CVS-2005-07-06 Summary: mISDN - modular ISDN +Summary(pl): mISDN - modularny ISDN Name: mISDN Version: 2005.07.06 %define _rel 0.1 @@ -19,7 +23,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6. +mISDN (modular ISDN) is the new ISDN stack of the Linux kernel version +2.6. + +%description -l pl +mISDN (modularny ISDN) to nowy stos ISDN dla j?dra Linuksa w wersji +2.6. %package -n kernel-isdn-mISDN Summary: Linux driver for mISDN @@ -135,7 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 13:17:36 qboosh +- pl desc + Revision 1.1 2005/08/28 11:49:36 areq - new ISDN stack of the linux kernel version 2.6 - raw PLD spec, NFY - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mISDN.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 15:26:43 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: audit-1.0.3.tar.gz Message-ID: <23401.1125235603@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.redhat.com/sgrubb/audit/audit-1.0.3.tar.gz 950daad97adfa3134289aa5b4e885f8f audit-1.0.3.tar.gz Size: 98835 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 15:26:42 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: audit.spec - updated to 1.0.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:26:42 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.3 ---- Files affected: SPECS: audit.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.4 SPECS/audit.spec:1.5 --- SPECS/audit.spec:1.4 Sat Jun 18 00:06:19 2005 +++ SPECS/audit.spec Sun Aug 28 15:26:36 2005 @@ -2,12 +2,12 @@ Summary: User space tools for 2.6 kernel auditing Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit -Version: 0.9.7 +Version: 1.0.3 Release: 0.1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz -# Source0-md5: 8548fbe16c3c44bdcc045fba0f35a070 +# Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h URL: http://people.redhat.com/sgrubb/audit/ @@ -166,6 +166,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 13:26:36 qboosh +- updated to 1.0.3 + Revision 1.4 2005/06/17 22:06:19 qboosh - added missing update info to last commit message ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:09 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: libassuan.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libassuan.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/libassuan.spec diff -u SPECS/libassuan.spec:1.19 SPECS/libassuan.spec:1.20 --- SPECS/libassuan.spec:1.19 Thu Jun 23 21:54:59 2005 +++ SPECS/libassuan.spec Sun Aug 28 15:58:03 2005 @@ -15,7 +15,7 @@ # Source0-md5: 4cde037c3fcb2f0eeb695b1db6e56bba Patch0: %{name}-shared.patch Patch1: %{name}-info.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libassuan/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9.3 BuildRequires: libtool @@ -117,6 +117,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2005/08/28 13:58:03 qboosh +- more specific URL + Revision 1.19 2005/06/23 19:54:59 qboosh - updated to 0.6.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libassuan.spec?r1=1.19&r2=1.20&f=u From qboosh at pld-linux.org Sun Aug 28 15:58:49 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: libgpg-error.spec - more specific URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:58:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more specific URL ---- Files affected: SPECS: libgpg-error.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/libgpg-error.spec diff -u SPECS/libgpg-error.spec:1.17 SPECS/libgpg-error.spec:1.18 --- SPECS/libgpg-error.spec:1.17 Thu Jun 23 22:01:41 2005 +++ SPECS/libgpg-error.spec Sun Aug 28 15:58:44 2005 @@ -9,7 +9,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz # Source0-md5: ee23cdd5fbbb1483676647a8e091ff8e Patch0: %{name}-pl.po-update.patch -URL: http://www.gnupg.org/ +URL: http://www.gnupg.org/related_software/libgpg-error/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.7.6 BuildRequires: gettext-devel >= 0.12.1 @@ -127,6 +127,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 13:58:44 qboosh +- more specific URL + Revision 1.17 2005/06/23 20:01:41 qboosh - updated to 1.1 (bugfixes) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgpg-error.spec?r1=1.17&r2=1.18&f=u From qboosh at pld-linux.org Sun Aug 28 15:59:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: libksba.spec - added URL In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 13:59:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added URL ---- Files affected: SPECS: libksba.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/libksba.spec diff -u SPECS/libksba.spec:1.26 SPECS/libksba.spec:1.27 --- SPECS/libksba.spec:1.26 Sat Aug 13 16:37:39 2005 +++ SPECS/libksba.spec Sun Aug 28 15:59:45 2005 @@ -12,6 +12,7 @@ # Source0-md5: 4d40a09134c5a0d2dcc6416f9abdcc98 Patch0: %{name}-info.patch Patch1: %{name}-link.patch +URL: http://www.gnupg.org/related_software/libksba/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1:1.9.3 BuildRequires: libgpg-error-devel >= 0.7 @@ -124,6 +125,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 13:59:45 qboosh +- added URL + Revision 1.26 2005/08/13 14:37:39 qboosh - updated to 0.9.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libksba.spec?r1=1.26&r2=1.27&f=u From qboosh at pld-linux.org Sun Aug 28 16:23:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: gsti-link.patch (NEW) - linking fix In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:23:54 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - linking fix ---- Files affected: SOURCES: gsti-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gsti-link.patch diff -u /dev/null SOURCES/gsti-link.patch:1.1 --- /dev/null Sun Aug 28 16:23:54 2005 +++ SOURCES/gsti-link.patch Sun Aug 28 16:23:49 2005 @@ -0,0 +1,10 @@ +--- gsti-0.3.0/src/Makefile.am.orig 2005-07-13 11:00:45.000000000 +0200 ++++ gsti-0.3.0/src/Makefile.am 2005-08-28 16:13:05.131648000 +0200 +@@ -29,6 +29,7 @@ + + AM_CFLAGS = @GPG_ERROR_CFLAGS@ @LIBGCRYPT_CFLAGS@ + ++libgsti_la_LIBADD = $(LIBGCRYPT_LIBS) + libgsti_la_LDFLAGS = -version-info \ + @LIBGSTI_LT_CURRENT@:@LIBGSTI_LT_REVISION@:@LIBGSTI_LT_AGE@ + ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:24:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: gsti-0.3.0.tar.bz2 Message-ID: <7016.1125239088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/gsti-0.3.0.tar.bz2 e748f986f621b3d8d8579368ba7e4b1f gsti-0.3.0.tar.bz2 Size: 311569 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:24:50 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: gsti.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:24:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: gsti.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/gsti.spec diff -u /dev/null SPECS/gsti.spec:1.1 --- /dev/null Sun Aug 28 16:24:50 2005 +++ SPECS/gsti.spec Sun Aug 28 16:24:45 2005 @@ -0,0 +1,101 @@ +# $Revision$, $Date$ +Summary: GNU Secure Transport Initiative +Summary(pl): GNU Secure Transport Initiative - biblioteka bezpiecznego transportu +Name: gsti +Version: 0.3.0 +Release: 1 +License: GPL v2+ +Group: Libraries +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gsti/%{name}-%{version}.tar.bz2 +# Source0-md5: e748f986f621b3d8d8579368ba7e4b1f +Patch0: %{name}-link.patch +URL: http://www.gnupg.org/ +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1.9.3 +BuildRequires: libgcrypt-devel >= 1.2.0 +BuildRequires: libgpg-error-devel >= 1.0 +BuildRequires: libtool +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This is a library which implements a basic part of the protocol used +by SSH to create a secure transport channel. + +%description -l pl +Ta biblioteka implementuje podstawow? cz??? protoko?u u?ywanego przez +SSH do stworzenia bezpiecznego kana?u transportowego. + +%package devel +Summary: Header files for GSTI library +Summary(pl): Pliki nag??wkowe biblioteki GSTI +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for GSTI library. + +%description devel -l pl +Pliki nag??wkowe biblioteki GSTI. + +%package static +Summary: Static GSTI library +Summary(pl): Statyczna biblioteka GSTI +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static GSTI library. + +%description static -l pl +Statyczna biblioteka GSTI. + +%prep +%setup -q +%patch0 -p1 + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure +%{__make} + +%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(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README* TODO doc/*.txt +%attr(755,root,root) %{_libdir}/libgsti.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gsti-config +%attr(755,root,root) %{_libdir}/libgsti.so +%{_libdir}/libgsti.la +%{_includedir}/gsti.h +%{_aclocaldir}/gsti.m4 + +%files static +%defattr(644,root,root,755) +%{_libdir}/libgsti.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 14:24:45 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:39:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: linux-libc-headers-audit.patch (NEW) - change References: Message-ID: Author: qboosh Date: Sun Aug 28 14:39:32 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - change to userspace version + little update (from 2.6.13-something?) to get usable ---- Files affected: SOURCES: linux-libc-headers-audit.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-libc-headers-audit.patch diff -u /dev/null SOURCES/linux-libc-headers-audit.patch:1.1 --- /dev/null Sun Aug 28 16:39:32 2005 +++ SOURCES/linux-libc-headers-audit.patch Sun Aug 28 16:39:26 2005 @@ -0,0 +1,123 @@ +--- linux-libc-headers-2.6.12.0/include/linux/audit.h.orig 2005-07-06 02:17:21.000000000 +0200 ++++ linux-libc-headers-2.6.12.0/include/linux/audit.h 2005-08-28 16:35:11.219052000 +0200 +@@ -24,21 +24,53 @@ + #ifndef _LINUX_AUDIT_H_ + #define _LINUX_AUDIT_H_ + +-#include +-#include ++#include + +-#include +-#include ++/* The netlink messages for the audit system is divided into blocks: ++ * 1000 - 1099 are for commanding the audit system ++ * 1100 - 1199 user space trusted application messages ++ * 1200 - 1299 messages internal to the audit daemon ++ * 1300 - 1399 audit event messages ++ * 1400 - 1499 SE Linux use ++ * 1500 - 1999 future use ++ * 2000 is for otherwise unclassified kernel audit messages ++ * ++ * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user ++ * space. Anything over that is kernel --> user space communication. ++ */ ++#define AUDIT_GET 1000 /* Get status */ ++#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ ++#define AUDIT_LIST 1002 /* List syscall filtering rules */ ++#define AUDIT_ADD 1003 /* Add syscall filtering rule */ ++#define AUDIT_DEL 1004 /* Delete syscall filtering rule */ ++#define AUDIT_USER 1005 /* Message from userspace -- deprecated */ ++#define AUDIT_LOGIN 1006 /* Define the login id and information */ ++#define AUDIT_WATCH_INS 1007 /* Insert file/dir watch entry */ ++#define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ ++#define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ ++#define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ ++ ++#define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages uninteresting to kernel */ ++#define AUDIT_LAST_USER_MSG 1199 ++ ++#define AUDIT_DAEMON_START 1200 /* Daemon startup record */ ++#define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ ++#define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */ ++#define AUDIT_DAEMON_CONFIG 1203 /* Daemon config change */ ++ ++#define AUDIT_SYSCALL 1300 /* Syscall event */ ++#define AUDIT_FS_WATCH 1301 /* Filesystem watch event */ ++#define AUDIT_PATH 1302 /* Filname path information */ ++#define AUDIT_IPC 1303 /* IPC record */ ++#define AUDIT_SOCKETCALL 1304 /* sys_socketcall arguments */ ++#define AUDIT_CONFIG_CHANGE 1305 /* Audit system configuration change */ ++#define AUDIT_SOCKADDR 1306 /* sockaddr copied as syscall arg */ ++ ++#define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ ++#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ ++#define AUDIT_AVC_PATH 1402 /* dentry, vfsmount pair from avc */ + +-/* Request and reply types */ +-#define AUDIT_GET 1000 /* Get status */ +-#define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ +-#define AUDIT_LIST 1002 /* List filtering rules */ +-#define AUDIT_ADD 1003 /* Add filtering rule */ +-#define AUDIT_DEL 1004 /* Delete filtering rule */ +-#define AUDIT_USER 1005 /* Send a message from user-space */ +-#define AUDIT_LOGIN 1006 /* Define the login id and informaiton */ +-#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ ++#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ + + /* Rule flags */ + #define AUDIT_PER_TASK 0x01 /* Apply rule at task creation (not syscall) */ +@@ -55,7 +87,7 @@ + * AUDIT_LIST commands must be implemented. */ + #define AUDIT_MAX_FIELDS 64 + #define AUDIT_BITMASK_SIZE 64 +-#define AUDIT_WORD(nr) ((__u32)((nr)/32)) ++#define AUDIT_WORD(nr) ((uint32_t)((nr)/32)) + #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) + + /* Rule fields */ +@@ -135,29 +167,24 @@ + #define AUDIT_ARCH_V850 (EM_V850|__AUDIT_ARCH_LE) + #define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + +-struct audit_message { +- struct nlmsghdr nlh; +- char data[1200]; +-}; +- + struct audit_status { +- __u32 mask; /* Bit mask for valid entries */ +- __u32 enabled; /* 1 = enabled, 0 = disbaled */ +- __u32 failure; /* Failure-to-log action */ +- __u32 pid; /* pid of auditd process */ +- __u32 rate_limit; /* messages rate limit (per second) */ +- __u32 backlog_limit; /* waiting messages limit */ +- __u32 lost; /* messages lost */ +- __u32 backlog; /* messages waiting in queue */ ++ uint32_t mask; /* Bit mask for valid entries */ ++ uint32_t enabled; /* 1 = enabled, 0 = disabled */ ++ uint32_t failure; /* Failure-to-log action */ ++ uint32_t pid; /* pid of auditd process */ ++ uint32_t rate_limit; /* messages rate limit (per second) */ ++ uint32_t backlog_limit; /* waiting messages limit */ ++ uint32_t lost; /* messages lost */ ++ uint32_t backlog; /* messages waiting in queue */ + }; + + struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ +- __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ +- __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ +- __u32 field_count; +- __u32 mask[AUDIT_BITMASK_SIZE]; +- __u32 fields[AUDIT_MAX_FIELDS]; +- __u32 values[AUDIT_MAX_FIELDS]; ++ uint32_t flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ ++ uint32_t action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ ++ uint32_t field_count; ++ uint32_t mask[AUDIT_BITMASK_SIZE]; ++ uint32_t fields[AUDIT_MAX_FIELDS]; ++ uint32_t values[AUDIT_MAX_FIELDS]; + }; + +-#endif ++#endif /* _LINUX_AUDIT_H_ */ ================================================================ From qboosh at pld-linux.org Sun Aug 28 16:40:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: linux-libc-headers.spec - added audit patch, release 4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:40:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added audit patch, release 4 ---- Files affected: SPECS: linux-libc-headers.spec (1.100 -> 1.101) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.100 SPECS/linux-libc-headers.spec:1.101 --- SPECS/linux-libc-headers.spec:1.100 Tue Aug 23 19:48:17 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 16:39:56 2005 @@ -3,7 +3,7 @@ Summary(pl): Nag??wki j?dra Linuksa do u?ytku z bibliotekami C Name: linux-libc-headers Version: 2.6.12.0 -Release: 3 +Release: 4 Epoch: 7 License: GPL Group: Development @@ -16,6 +16,8 @@ Patch4: %{name}-tc-u32-mark.patch Patch5: %{name}-imq.patch Patch6: %{name}-endian.patch +# based on http://people.redhat.com/sgrubb/audit/audit.h +Patch7: %{name}-audit.patch AutoReqProv: no BuildRequires: rpmbuild(macros) >= 1.213 Requires(pre): fileutils @@ -60,6 +62,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %ifarch %{x8664} @@ -174,6 +177,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.101 2005/08/28 14:39:56 qboosh +- added audit patch, release 4 + Revision 1.100 2005/08/23 17:48:17 qboosh - bugfix in endian patch, release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.100&r2=1.101&f=u From qboosh at pld-linux.org Sun Aug 28 16:48:34 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: gplflash2-link.patch - updated for 20050828 snap In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:48:34 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 20050828 snap ---- Files affected: SOURCES: gplflash2-link.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/gplflash2-link.patch diff -u SOURCES/gplflash2-link.patch:1.1 SOURCES/gplflash2-link.patch:1.2 --- SOURCES/gplflash2-link.patch:1.1 Sat Jun 11 20:27:27 2005 +++ SOURCES/gplflash2-link.patch Sun Aug 28 16:48:28 2005 @@ -1,16 +1,16 @@ ---- gplflash2/plugins/mozilla/Makefile.am.orig 2005-04-24 22:51:39.000000000 +0200 -+++ gplflash2/plugins/mozilla/Makefile.am 2005-06-11 18:30:08.627104256 +0200 +--- gplflash2/plugins/mozilla/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/plugins/mozilla/Makefile.am 2005-08-28 15:36:07.130835376 +0200 @@ -13,15 +13,8 @@ OPTIMIZER=$(OPTFLAGS) SHARED=-shared -libnpflash_la_LIBADD = ../../lib/libflash2.la -+libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) -lXt ++libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) -lXt libnpflash_la_SOURCES = flash_interface.cc plugin.c npunix.c -libnpflash_la_CFLAGS = -fpic -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) +libnpflash_la_CFLAGS = -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS) - libnpflash_la_CXXFLAGS = $(FREETYPE_CFLAGS) --libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) + libnpflash_la_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) +-libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) - -install-pluginLTLIBRARIES: $(plugin_LIBRARIES) - mkdir -p $(PLUGIN_DIR) @@ -19,8 +19,8 @@ -uninstall-pluginLTLIBRARIES: $(plugin_LIBRARIES) - rm -f $(PLUGIN_DIR)/libnpflash.so +libnpflash_la_LDFLAGS = -avoid-version ---- gplflash2/player/Makefile.am.orig 2005-04-24 22:51:38.000000000 +0200 -+++ gplflash2/player/Makefile.am 2005-06-11 19:08:01.235615248 +0200 +--- gplflash2/player/Makefile.am.orig 2005-08-28 11:31:14.000000000 +0200 ++++ gplflash2/player/Makefile.am 2005-08-28 15:36:58.912963296 +0200 @@ -1,13 +1,12 @@ bin_PROGRAMS = flashplayer @@ -32,8 +32,8 @@ flashplayer.cc - flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBSDL) $(LIBXML2) + flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(SDL_LIBS) $(XML_LIBS) -flashplayer_includedir = $(includedir) +flashplayer_includedir = $(includedir) - flashplayer_CXXFLAGS = $(FREETYPE_CFLAGS) + flashplayer_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS) flashplayer_LDADD = ../lib/libflash2.la $(LIBFFMPEG) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gplflash2-link.patch?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 16:50:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: DISTFILES: gplflash2-20050828.tar.bz2 Message-ID: <11469.1125240605@distfiles.pld-linux.org> Files fetched: 1 STORED: no-url://gplflash2-20050828.tar.bz2 865d6ae3795523343b9d51ee23772613 gplflash2-20050828.tar.bz2 Size: 332038 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 16:50:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: gplflash2.spec - updated to todays snap (20050828), updated... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 14:50:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to todays snap (20050828), updated link patch ---- Files affected: SPECS: gplflash2.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/gplflash2.spec diff -u SPECS/gplflash2.spec:1.3 SPECS/gplflash2.spec:1.4 --- SPECS/gplflash2.spec:1.3 Sat Jun 11 20:28:27 2005 +++ SPECS/gplflash2.spec Sun Aug 28 16:50:01 2005 @@ -1,27 +1,27 @@ # $Revision$, $Date$ -%define _snap 20050605 +%define _snap 20050828 Summary: Flash animations redering library Summary(pl): Biblioteka renderuj?ca animacje Flash Name: gplflash2 Version: 0.1.0 -Release: 1 +Release: 0.%{_snap}.1 License: GPL Group: Libraries -Source0: %{name}-%{_snap}.tar.gz -# Source0-md5: 2f307955c081689c294f664ff90313ee +Source0: %{name}-%{_snap}.tar.bz2 +# Source0-md5: 865d6ae3795523343b9d51ee23772613 Patch0: %{name}-link.patch URL: http://gplflash.sourceforge.net/ BuildRequires: OpenGL-devel BuildRequires: SDL-devel >= 1.2.8 BuildRequires: XFree86-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: ffmpeg-devel -BuildRequires: freetype-devel >= 2.0 +BuildRequires: freetype-devel >= 2.1.7 BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel >= 1.1.4 Obsoletes: flash @@ -47,9 +47,9 @@ Summary(pl): Pliki nag??wkowe wymagane przez programy u?ywaj?ce gplflash2 Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: freetype-devel >= 2.0 +Requires: freetype-devel >= 2.1.7 Requires: libstdc++-devel -Requires: libxml2-devel +Requires: libxml2-devel >= 2.6.0 Requires: zlib-devel >= 1.1.4 Obsoletes: flash-devel @@ -144,6 +144,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 14:50:01 qboosh +- updated to todays snap (20050828), updated link patch + Revision 1.3 2005/06/11 18:28:27 qboosh - added link patch, some install hacks not needed now ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gplflash2.spec?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 16:53:06 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use without macro In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 14:53:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use without macro ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.23 SPECS/fonts-TTF-microsoft.spec:1.24 --- SPECS/fonts-TTF-microsoft.spec:1.23 Fri Jul 22 11:18:37 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 16:53:01 2005 @@ -59,7 +59,7 @@ %description Microsoft free True Type fonts collection. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: @@ -70,7 +70,7 @@ %description -l pl Kolekcja darmowych font?w True Type firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: @@ -90,7 +90,7 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install @@ -192,6 +192,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.24 2005/08/28 14:53:01 glen +- use without macro + Revision 1.23 2005/07/22 09:18:37 deejay1 - rel up to 5 @@ -252,7 +255,7 @@ - make spec non-interactive; release 3 Revision 1.5 2002/11/27 19:36:46 juandon -- new %%doc +- new %doc Revision 1.4 2002/09/11 16:19:30 adgor - Updated source URLs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.23&r2=1.24&f=u From glen at pld-linux.org Sun Aug 28 17:08:10 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: fonts-TTF-microsoft.spec - removed ftp url, which is 1) poi... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:08:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.24 SPECS/fonts-TTF-microsoft.spec:1.25 --- SPECS/fonts-TTF-microsoft.spec:1.24 Sun Aug 28 16:53:01 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:08:05 2005 @@ -65,7 +65,6 @@ with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl @@ -76,7 +75,6 @@ pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -192,6 +190,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.25 2005/08/28 15:08:05 glen +- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) + Revision 1.24 2005/08/28 14:53:01 glen - use without macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.24&r2=1.25&f=u From qboosh at pld-linux.org Sun Aug 28 17:20:03 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: auditd.init (NEW), auditd.sysconfig (NEW) - PLDified from... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:20:02 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - PLDified from files included in package ---- Files affected: SOURCES: auditd.init (NONE -> 1.1) (NEW), auditd.sysconfig (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/auditd.init diff -u /dev/null SOURCES/auditd.init:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.init Sun Aug 28 17:19:57 2005 @@ -0,0 +1,86 @@ +#!/bin/sh +# +# auditd This starts and stops auditd +# +# chkconfig: 2345 18 87 +# description: This starts the Linux Auditing System Daemon +# +# processname: /sbin/auditd +# config: /etc/sysconfig/auditd +# config: /etc/auditd.conf +# pidfile: /var/run/auditd.pid + +PATH=/sbin:/bin:/usr/bin:/usr/sbin + +# Source function library +. /etc/rc.d/init.d/functions + +AUDITD_CLEAN_STOP=yes +EXTRAOPTIONS= + +# Get service config - may override defaults +[ -f /etc/sysconfig/auditd ] && . /etc/sysconfig/auditd + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + if [ ! -f /var/lock/subsys/auditd ]; then + # show "Starting %s service" auditd + msg_starting auditd + unset HOME MAIL USER USERNAME + daemon auditd "$EXTRAOPTIONS" + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd + # Load the default rules + [ -f /etc/audit.rules ] && /sbin/auditctl -R /etc/audit.rules >/dev/null + else + # show "%s service is already running." auditd + msg_already_running auditd + fi + ;; + stop) + if [ -f /var/lock/subsys/auditd ]; then + # Stop daemons. + # show "Stopping %s service" auditd + msg_stopping auditd + killproc auditd + rm -f /var/lock/subsys/auditd + # Remove watches so shutdown works cleanly + if ! is_no "$AUDITD_CLEAN_STOP"; then + /sbin/auditctl -D >/dev/null + fi + else + # show "%s service is not running." auditd + msg_not_running auditd + fi + ;; + restart) + $0 stop + $0 start + exit $? + ;; + reload|force-reload) + if [ -f /var/lock/subsys/auditd ]; then + # show "Reload %s service" auditd + msg_reloading auditd + killproc auditd -HUP + RETVAL=$? + else + # show "%s service is not running." auditd + msg_not_running auditd >&2 + RETVAL=7 + fi + ;; + status) + status auditd + RETVAL=$? + ;; + *) + # show "Usage: %s {start|stop|restart|reload|force-reload|status}" + msg_usage "$0 {start|stop|restart|reload|force-reload|status}" + RETVAL=3 +esac + +exit $RETVAL ================================================================ Index: SOURCES/auditd.sysconfig diff -u /dev/null SOURCES/auditd.sysconfig:1.1 --- /dev/null Sun Aug 28 17:20:03 2005 +++ SOURCES/auditd.sysconfig Sun Aug 28 17:19:57 2005 @@ -0,0 +1,15 @@ +# Customized settings for auditd + +# Nice level for auditd +# SERVICE_RUN_NICE_LEVEL=0 + +# Extra options for auditd +# EXTRAOPTIONS= + +# You can set audit locale here +# LC_ALL=C + +# This option is used to determine if rules & watches should be deleted on +# shutdown. This is beneficial in most cases so that a watch doesn't linger +# on a drive that is being unmounted. If set to no, it will NOT be cleaned up. +AUDITD_CLEAN_STOP=yes ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:21:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: audit.spec - fixed libaudit.so symlink - replace init/sysco... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:21:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed libaudit.so symlink - replace init/sysconfig with our versions - -devel R: llh with audit update - release 1 ---- Files affected: SPECS: audit.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/audit.spec diff -u SPECS/audit.spec:1.5 SPECS/audit.spec:1.6 --- SPECS/audit.spec:1.5 Sun Aug 28 15:26:36 2005 +++ SPECS/audit.spec Sun Aug 28 17:21:17 2005 @@ -3,13 +3,15 @@ Summary(pl): Narz?dzia przestrzeni u?ytkownika do audytu j?der 2.6 Name: audit Version: 1.0.3 -Release: 0.1 +Release: 1 License: GPL Group: Daemons Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz # Source0-md5: 950daad97adfa3134289aa5b4e885f8f # http://people.redhat.com/sgrubb/audit/audit.h Source1: audit.h +Source2: %{name}d.init +Source3: %{name}d.sysconfig URL: http://people.redhat.com/sgrubb/audit/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -52,6 +54,7 @@ License: LGPL Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +Requires: linux-libc-headers >= 7:2.6.12.0-4 %description libs-devel The audit-libs-devel package contains the header files needed for @@ -102,13 +105,16 @@ install -d $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib} -ln -sf $(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ +ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libaudit.so # We manually install this since Makefile doesn't install -d $RPM_BUILD_ROOT%{_includedir} install lib/libaudit.h $RPM_BUILD_ROOT%{_includedir} +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd +install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd + %clean rm -rf $RPM_BUILD_ROOT @@ -166,6 +172,12 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:21:17 qboosh +- fixed libaudit.so symlink +- replace init/sysconfig with our versions +- -devel R: llh with audit update +- release 1 + Revision 1.5 2005/08/28 13:26:36 qboosh - updated to 1.0.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.5&r2=1.6&f=u From glen at pld-linux.org Sun Aug 28 17:28:49 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:41 2005 Subject: SOURCES: license-installer.sh - @LICENSE@ expansions for fonts-mic... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:28:49 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - @LICENSE@ expansions for fonts-microsoft packages ---- Files affected: SOURCES: license-installer.sh (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.3 SOURCES/license-installer.sh:1.4 --- SOURCES/license-installer.sh:1.3 Tue Aug 23 21:20:31 2005 +++ SOURCES/license-installer.sh Sun Aug 28 17:28:44 2005 @@ -38,11 +38,17 @@ fi fi else - echo " + if [ "@LICENSE@" != '@'LICENSE'@' ]; then + cat @LICENSE@ + echo " +If you accept the above license rebuild the package using: +" + else + echo " License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with the following command: - -$0 --with license_agreement @SPECFILE@ " + fi + echo "$0 --with license_agreement @SPECFILE@" fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.3&r2=1.4&f=u From glen at pld-linux.org Sun Aug 28 17:30:26 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:41 2005 Subject: SPECS: fonts-TTF-microsoft.spec - use shared license-installer.sh ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:26 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.25 SPECS/fonts-TTF-microsoft.spec:1.26 --- SPECS/fonts-TTF-microsoft.spec:1.25 Sun Aug 28 17:08:05 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:21 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 5%{?with_license_agreement:wla} +Release: 6%{?with_license_agreement:wla} License: Microsoft EULA (for non-commercial use) Group: Fonts %if %{with license_agreement} @@ -39,6 +39,7 @@ Source10: http://dl.sourceforge.net/corefonts/webdin32.exe # NoSource10-md5: 230a1d13a365b22815f502eb24d9149b %else +Source0: license-installer.sh # extracted from one of the above Source20: Microsoft-EULA.txt %endif @@ -91,58 +92,14 @@ %if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -If you accept the above license rebuild the package using: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Microsoft-EULA.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -190,8 +147,13 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 15:30:21 glen +- use shared license-installer.sh script from SOURCES + Revision 1.25 2005/08/28 15:08:05 glen -- removed ftp url, which is 1) pointing to src.rpm in RPMS dir, 2) the -installer src.rpm doesn't contain nothing more than pure .spec (ie no sourceX inside anyway) +- removed ftp url from %description, because + 1) it's pointing to inexistent src.rpm in RPMS dir, + 2) the -installer .src.rpm doesn't contain sourceX-s inside anyway Revision 1.24 2005/08/28 14:53:01 glen - use without macro @@ -200,7 +162,9 @@ - rel up to 5 Revision 1.22 2004/12/08 05:47:33 roman -- added R: cabextract to the case of building without license agreement (rationale: cabextract will be needed to get the fonts anyway, which is the only possible use of the package) +- added R: cabextract to the case of building without license + agreement (rationale: cabextract will be needed to get the fonts + anyway, which is the only possible use of the package) Revision 1.21 2004/11/17 06:14:48 ankry - message fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.25&r2=1.26&f=u From glen at pld-linux.org Sun Aug 28 17:30:44 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fonts-TTF-microsoft.spec - rel 6 In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:30:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 6 ---- Files affected: SPECS: fonts-TTF-microsoft.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft.spec diff -u SPECS/fonts-TTF-microsoft.spec:1.26 SPECS/fonts-TTF-microsoft.spec:1.27 --- SPECS/fonts-TTF-microsoft.spec:1.26 Sun Aug 28 17:30:21 2005 +++ SPECS/fonts-TTF-microsoft.spec Sun Aug 28 17:30:39 2005 @@ -147,6 +147,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 15:30:39 glen +- rel 6 + Revision 1.26 2005/08/28 15:30:21 glen - use shared license-installer.sh script from SOURCES ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft.spec?r1=1.26&r2=1.27&f=u From glen at pld-linux.org Sun Aug 28 17:36:48 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fonts-TTF-microsoft-tahoma.spec - use shared license-instal... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:36:48 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-microsoft-tahoma.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-microsoft-tahoma.spec diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 SPECS/fonts-TTF-microsoft-tahoma.spec:1.7 --- SPECS/fonts-TTF-microsoft-tahoma.spec:1.6 Sun Jun 5 23:19:02 2005 +++ SPECS/fonts-TTF-microsoft-tahoma.spec Sun Aug 28 17:36:42 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of IE update - may require Windows license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Tahoma True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires Windows license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Tahoma firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na Windows). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 15:36:42 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.6 2005/06/05 21:19:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft-tahoma.spec?r1=1.6&r2=1.7&f=u From glen at pld-linux.org Sun Aug 28 17:40:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec - use shared license-... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2 ---- Files affected: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Microsoft-ArialUnicode.spec diff -u SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.6 --- SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 Mon Jun 6 10:18:56 2005 +++ SPECS/fonts-TTF-Microsoft-ArialUnicode.spec Sun Aug 28 17:39:57 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of MS Office - may require Office license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Arial Unicode True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires MS Office license). If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Arial Unicode firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w (prawdopodobnie wymaga licencji na MS Office). Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ] -then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "$3" $SPECDIR; then - exit 1 - fi - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U $RPMDIR/$RPMNAME || \ - echo -e "Install manually the file:\n $RPMDIR/$RPMNAME" ) - if [ "$BACKUP_SPEC" -eq 1 ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default (it probably requires Windows license). If you want to -create full working package please build it with the following command: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:39:57 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.5 2005/06/06 08:18:56 glen - simplification fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Microsoft-ArialUnicode.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 17:41:19 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: jakarta-regexp-build.patch - updated for 1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:41:19 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 1.4 ---- Files affected: SOURCES: jakarta-regexp-build.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/jakarta-regexp-build.patch diff -u SOURCES/jakarta-regexp-build.patch:1.1 SOURCES/jakarta-regexp-build.patch:1.2 --- SOURCES/jakarta-regexp-build.patch:1.1 Tue Dec 14 15:07:57 2004 +++ SOURCES/jakarta-regexp-build.patch Sun Aug 28 17:41:14 2005 @@ -1,11 +1,11 @@ ---- jakarta-regexp-1.3/build.xml~ 2003-09-02 20:56:46.000000000 +0200 -+++ jakarta-regexp-1.3/build.xml 2004-12-14 15:04:17.955572757 +0100 -@@ -36,7 +36,7 @@ +--- jakarta-regexp-1.4/build.xml.orig 2005-08-17 03:19:03.000000000 +0200 ++++ jakarta-regexp-1.4/build.xml 2005-08-28 17:12:43.723619328 +0200 +@@ -54,7 +54,7 @@ -- -+ +- ++ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/jakarta-regexp-build.patch?r1=1.1&r2=1.2&f=u From glen at pld-linux.org Sun Aug 28 17:42:38 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - removed superfluous O... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 15:42:38 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed superfluous Obsoletes itself ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.3 Sun Jun 5 23:17:02 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 17:42:32 2005 @@ -32,7 +32,6 @@ Requires: rpm-build-tools Requires: wget %endif -Obsoletes: fonts-TTF-Bitstream-Cyberfonts BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -175,6 +174,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.4 2005/08/28 15:42:32 glen +- removed superfluous Obsoletes itself + Revision 1.3 2005/06/05 21:17:02 qboosh - bcond header cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.3&r2=1.4&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:20 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: jakarta-regexp.spec - updated to 1.4, updated build patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:43:20 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4, updated build patch ---- Files affected: SPECS: jakarta-regexp.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/jakarta-regexp.spec diff -u SPECS/jakarta-regexp.spec:1.22 SPECS/jakarta-regexp.spec:1.23 --- SPECS/jakarta-regexp.spec:1.22 Tue Dec 14 15:21:24 2004 +++ SPECS/jakarta-regexp.spec Sun Aug 28 17:43:15 2005 @@ -2,12 +2,12 @@ Summary: Java Regular Expression Summary(pl): Wyra?enia regularne do Javy Name: jakarta-regexp -Version: 1.3 +Version: 1.4 Release: 1 -License: Apache +License: Apache v2.0 Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/regexp/source/%{name}-%{version}.tar.gz -# Source0-md5: 4322f82bea908ca4a7db270f7fa4850d +# Source0-md5: d903d84c949df848009f3bf205b32c97 Patch0: %{name}-build.patch URL: http://jakarta.apache.org/regexp/index.html BuildRequires: jakarta-ant @@ -46,7 +46,6 @@ %setup -q %patch0 -p1 find . -name "*.jar" -exec rm -f {} \; -mkdir -p jakarta-site2/lib %build ant jar javadocs @@ -63,7 +62,7 @@ %files %defattr(644,root,root,755) -%doc LICENSE.txt +%doc LICENSE %{_javadir}/*.jar %files doc @@ -76,6 +75,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 15:43:15 qboosh +- updated to 1.4, updated build patch + Revision 1.22 2004/12/14 14:21:24 baggins - fixed files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-regexp.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 17:43:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: jakarta-regexp-1.4.tar.gz Message-ID: <19951.1125243801@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz Size: 137768 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 17:45:36 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: pwdutils-pl.po-update.patch (REMOVED), pwdutils-slp.patch... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:45:36 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: pwdutils-pl.po-update.patch (1.5 -> NONE) (REMOVED), pwdutils-slp.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 17:48:01 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: pwdutils.spec - updated to 3.0.4, removed obsolete pl.po-up... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 15:48:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.0.4, removed obsolete pl.po-update,slp patches - build audit log plugin ---- Files affected: SPECS: pwdutils.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/pwdutils.spec diff -u SPECS/pwdutils.spec:1.61 SPECS/pwdutils.spec:1.62 --- SPECS/pwdutils.spec:1.61 Thu Jul 28 11:00:49 2005 +++ SPECS/pwdutils.spec Sun Aug 28 17:47:56 2005 @@ -2,6 +2,7 @@ # TODO: review default login.defs # # Conditional build: +%bcond_without audit # don't build audit log plugin %bcond_without ldap # build without LDAP support %bcond_without selinux # build without SELinux support %bcond_with openssl # use OpenSSL instead of GnuTLS @@ -9,12 +10,12 @@ Summary: Utilities to manage the passwd and shadow user information Summary(pl): Narz?dzia do zarz?dzania informacjami o u?ytkownikach z passwd i shadow Name: pwdutils -Version: 3.0.2 +Version: 3.0.4 Release: 1 License: GPL v2 Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2 -# Source0-md5: f56fd7d1b6ae64ea7e70734bc20c2718 +# Source0-md5: 10603d67f4959772544a76691310dfc8 Source1: %{name}.useradd Source2: %{name}.rpasswdd.init Source3: %{name}.login.defs @@ -25,11 +26,10 @@ Source8: useradd.pamd Source9: userdb.pamd Patch0: %{name}-f-option.patch -Patch1: %{name}-pl.po-update.patch -Patch2: %{name}-no_bash.patch -Patch3: %{name}-silent_crontab.patch -Patch4: %{name}-slp.patch +Patch1: %{name}-no_bash.patch +Patch2: %{name}-silent_crontab.patch URL: http://www.thkukuk.de/pam/pwdutils/ +%{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf BuildRequires: automake >= 1:1.7 BuildRequires: gcc >= 5:3.2 @@ -74,6 +74,18 @@ bezpiecznym po??czeniu SSL. Demon tak?e u?ywa PAM, wi?c mo?na zmienia? has?a niezale?nie od tego, gdzie s? przechowywane. +%package log-audit +Summary: audit log plugin for pwdutils +Summary(pl): Wtyczka loguj?ca audit dla pwdutils +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description log-audit +audit log plugin for pwdutils. + +%description log-audit -l pl +Wtyczka loguj?ca audit dla pwdutils. + %package -n rpasswdd Summary: Remote password update daemon Summary(pl): Demon do zdalnego uaktualniania hase? @@ -118,10 +130,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 - -rm -f po/stamp-po sed -i -e 's/-Werror //' configure.in @@ -132,12 +140,13 @@ %{__autoheader} %{__automake} %configure \ + %{?with_audit:--enable-audit-plugin} \ %{?with_openssl:--disable-gnutls} \ + --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ + --enable-nls \ --enable-pam_rpasswd \ --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \ --enable-slp \ - --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \ - --enable-nls \ --disable-rpath %{__make} @@ -243,6 +252,12 @@ %exclude %{_mandir}/man8/rpasswdd.8* %exclude %{_mandir}/man8/pam_rpasswd.8* +%if %{with audit} +%files log-audit +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/pwdutils/liblog_audit.so* +%endif + %files -n rpasswdd %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/rpasswdd @@ -261,6 +276,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.62 2005/08/28 15:47:56 qboosh +- updated to 3.0.4, removed obsolete pl.po-update,slp patches +- build audit log plugin + Revision 1.61 2005/07/28 09:00:49 qboosh - pwdutils 3.0.x prefers gnutls over openssl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pwdutils.spec?r1=1.61&r2=1.62&f=u From qboosh at pld-linux.org Sun Aug 28 17:48:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: pwdutils-3.0.4.tar.bz2 Message-ID: <26383.1125244088@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/pwdutils-3.0.4.tar.bz2 10603d67f4959772544a76691310dfc8 pwdutils-3.0.4.tar.bz2 Size: 458961 bytes -- Virtually Yours: distfiles. From glen at pld-linux.org Sun Aug 28 18:02:57 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec - use shared license-in... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:02:57 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script - make package build work on end-user - rel 2 ---- Files affected: SPECS: fonts-TTF-Bitstream-Cyberfonts.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Bitstream-Cyberfonts.spec diff -u SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.5 --- SPECS/fonts-TTF-Bitstream-Cyberfonts.spec:1.4 Sun Aug 28 17:42:32 2005 +++ SPECS/fonts-TTF-Bitstream-Cyberfonts.spec Sun Aug 28 18:02:51 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} License: Nondistributable but free (See Bitstream-Cyberfonts-licence.txt) Group: Fonts %if %{with license_agreement} @@ -23,11 +23,15 @@ # NoSource1-md5: 63a6f607ac5a78d34b67247b893faf5b Source2: ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/CyberCJK.ZIP # NoSource2-md5: 63a6f607ac5a78d34b67247b893faf5b -Source3: %{base_name}-licence.txt BuildRequires: unzip +# we need the -installer package as otherwise can't make end-user +# package to work. see also comments in %%prep section. +BuildRequires: %{base_name}-installer Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh +Source1: %{base_name}-licence.txt Requires: unzip Requires: rpm-build-tools Requires: wget @@ -39,25 +43,23 @@ %description Bitstream Cyberfonts True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default. If you want to create full working package please build it with one of the following command: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Cyberfonts firmy Bitstream. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusi?y nas do niedo??czania do tego pakietu istotnych plik?w. Je?li chcesz stworzy? w pe?ni funkcjonalny pakiet, zbuduj go za pomoc? polecenia: %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD//PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -66,76 +68,31 @@ /usr/bin/unzip -L %{SOURCE0} /usr/bin/unzip -L %{SOURCE1} /usr/bin/unzip -L %{SOURCE2} -install %{SOURCE3} ./ +# ugly hack, to work with -installer package, when it may not fetch this file +# from CVS with builder (-nc, -ncs) +install %{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt . %endif %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ] -then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "\$3" \$SPECDIR; then - exit 1 - fi - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U \$RPMDIR/\$RPMNAME || \ - echo -e Install manually the file:\\\n \$RPMDIR/\$RPMNAME ) - if [ "\$BACKUP_SPEC" -eq 1 ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - echo " -License issues made us not to include inherent files into this package -by default. If you want to -create full working package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@LICENSE@,%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt, +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %else install -d $RPM_BUILD_ROOT%{ttffontsdir} install *.ttf $RPM_BUILD_ROOT%{ttffontsdir} %endif -install -d $RPM_BUILD_ROOT%{_datadir}/%{base_name} -install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt %clean rm -rf $RPM_BUILD_ROOT @@ -162,11 +119,12 @@ %files %defattr(644,root,root,755) %if %{with license_agreement} +%doc Bitstream-Cyberfonts-licence.txt %{ttffontsdir}/* %else %attr(755,root,root) %{_bindir}/%{base_name}.install -%endif %{_datadir}/%{base_name} +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -174,6 +132,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.5 2005/08/28 16:02:51 glen +- use shared license-installer.sh script +- make package build work on end-user +- rel 2 + Revision 1.4 2005/08/28 15:42:32 glen - removed superfluous Obsoletes itself ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Bitstream-Cyberfonts.spec?r1=1.4&r2=1.5&f=u From qboosh at pld-linux.org Sun Aug 28 18:03:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: gsasl-pl.po-update.patch - updated for 0.2.7 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:03:40 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 0.2.7 ---- Files affected: SOURCES: gsasl-pl.po-update.patch (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SOURCES/gsasl-pl.po-update.patch diff -u SOURCES/gsasl-pl.po-update.patch:1.6 SOURCES/gsasl-pl.po-update.patch:1.7 --- SOURCES/gsasl-pl.po-update.patch:1.6 Sat Aug 13 19:36:46 2005 +++ SOURCES/gsasl-pl.po-update.patch Sun Aug 28 18:03:35 2005 @@ -1,5 +1,5 @@ ---- gsasl-0.2.6/po/pl.po.orig 2005-08-10 13:04:43.000000000 +0200 -+++ gsasl-0.2.6/po/pl.po 2005-08-13 19:27:33.476737256 +0200 +--- gsasl-0.2.7/po/pl.po.orig 2005-08-25 14:54:55.000000000 +0200 ++++ gsasl-0.2.7/po/pl.po 2005-08-28 17:56:55.773446472 +0200 @@ -1,21 +1,21 @@ # Polish translation for gsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -11,11 +11,11 @@ msgid "" msgstr "" -"Project-Id-Version: gsasl 0.1.4\n" -+"Project-Id-Version: gsasl 0.2.5\n" ++"Project-Id-Version: gsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:49+0200\n" -"PO-Revision-Date: 2004-08-25 22:41+0200\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgid "Choose SASL mechanism:\n" msgstr "Wyb?r mechanizm?w SASL:\n" ---- gsasl-0.2.6/lib/po/pl.po.orig 2005-08-10 13:04:50.000000000 +0200 -+++ gsasl-0.2.6/lib/po/pl.po 2005-08-13 19:28:08.191459816 +0200 +--- gsasl-0.2.7/lib/po/pl.po.orig 2005-08-25 14:55:02.000000000 +0200 ++++ gsasl-0.2.7/lib/po/pl.po 2005-08-28 17:57:31.753976600 +0200 @@ -1,14 +1,14 @@ # Polish translation for libgsasl. -# Copyright (C) 2004 Free Software Foundation, Inc. @@ -40,11 +40,11 @@ msgid "" msgstr "" -"Project-Id-Version: libgsasl 0.2.1\n" -+"Project-Id-Version: libgsasl 0.2.3\n" ++"Project-Id-Version: libgsasl 0.2.7\n" "Report-Msgid-Bugs-To: bug-gsasl@gnu.org\n" - "POT-Creation-Date: 2005-08-10 12:46+0200\n" + "POT-Creation-Date: 2005-08-25 14:50+0200\n" -"PO-Revision-Date: 2004-11-21 23:31+0100\n" -+"PO-Revision-Date: 2005-08-13 19:20+0200\n" ++"PO-Revision-Date: 2005-08-28 17:50+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/gsasl-pl.po-update.patch?r1=1.6&r2=1.7&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:13 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: gsasl.spec - updated to 0.2.7, updated pl.po-update patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:04:13 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.2.7, updated pl.po-update patch ---- Files affected: SPECS: gsasl.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/gsasl.spec diff -u SPECS/gsasl.spec:1.22 SPECS/gsasl.spec:1.23 --- SPECS/gsasl.spec:1.22 Sat Aug 13 19:37:25 2005 +++ SPECS/gsasl.spec Sun Aug 28 18:04:08 2005 @@ -8,12 +8,12 @@ Summary: GNU SASL - implementation of the Simple Authentication and Security Layer Summary(pl): GNU SASL - implementacja Simple Authentication and Security Layer Name: gsasl -Version: 0.2.6 +Version: 0.2.7 Release: 1 License: GPL Group: Libraries Source0: http://josefsson.org/gsasl/releases/%{name}-%{version}.tar.gz -# Source0-md5: 5e527147cea5cc776240f6d7a6820955 +# Source0-md5: ed52f2e5ac997503d0953be978e7a2f1 Patch0: %{name}-info.patch Patch1: %{name}-pl.po-update.patch URL: http://www.gnu.org/software/gsasl/ @@ -176,6 +176,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.23 2005/08/28 16:04:08 qboosh +- updated to 0.2.7, updated pl.po-update patch + Revision 1.22 2005/08/13 17:37:25 qboosh - updated to 0.2.6, updated pl.po-update patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gsasl.spec?r1=1.22&r2=1.23&f=u From qboosh at pld-linux.org Sun Aug 28 18:04:47 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: gsasl-0.2.7.tar.gz Message-ID: <19453.1125245087@distfiles.pld-linux.org> Files fetched: 1 STORED: http://josefsson.org/gsasl/releases/gsasl-0.2.7.tar.gz ed52f2e5ac997503d0953be978e7a2f1 gsasl-0.2.7.tar.gz Size: 2643936 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:31 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: daemon-1.0.1.tar.gz Message-ID: <21194.1125245131@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz Size: 301023 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 18:05:33 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: jakarta-commons-daemon.spec - updated to 1.0.1 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 16:05:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.0.1 ---- Files affected: SPECS: jakarta-commons-daemon.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/jakarta-commons-daemon.spec diff -u SPECS/jakarta-commons-daemon.spec:1.7 SPECS/jakarta-commons-daemon.spec:1.8 --- SPECS/jakarta-commons-daemon.spec:1.7 Sun May 8 19:10:19 2005 +++ SPECS/jakarta-commons-daemon.spec Sun Aug 28 18:05:27 2005 @@ -2,12 +2,12 @@ Summary: Jakarta Commons Daemon - controlling of Java daemons Summary(pl): Jakarta Commons Daemon - kontrolowanie demon?w w Javie Name: jakarta-commons-daemon -Version: 1.0 +Version: 1.0.1 Release: 1 License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz -# Source0-md5: 3054786aaba9631ec04fef0862023bc8 +# Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0 URL: http://jakarta.apache.org/commons/daemon/ BuildRequires: automake BuildRequires: jakarta-ant >= 1.4.1 @@ -86,6 +86,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 16:05:27 qboosh +- updated to 1.0.1 + Revision 1.7 2005/05/08 17:10:19 qboosh - updated to 1.0, removed obsolete nobat patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-commons-daemon.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 18:15:03 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: linux-libc-headers.spec - my build system doesn't generate ... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:15:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, in other words, add -r option to xargs ---- Files affected: SPECS: linux-libc-headers.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.101 SPECS/linux-libc-headers.spec:1.102 --- SPECS/linux-libc-headers.spec:1.101 Sun Aug 28 16:39:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:14:56 2005 @@ -151,7 +151,8 @@ cp -a linux $RPM_BUILD_ROOT%{_includedir} cp -a sound $RPM_BUILD_ROOT%{_includedir} -find $RPM_BUILD_ROOT%{_includedir} -type f -name '*.orig' | xargs rm +find $RPM_BUILD_ROOT%{_includedir} -type f \ + '(' -name '*.orig' -o -name '*~' ')' | xargs -r rm %clean rm -rf $RPM_BUILD_ROOT @@ -177,6 +178,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.102 2005/08/28 16:14:56 glen +- my build system doesn't generate .orig files on patching (but ~ instead) + and others could be off completely due $VERSION_CONTROL variable, + in other words, add -r option to xargs + Revision 1.101 2005/08/28 14:39:56 qboosh - added audit patch, release 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.101&r2=1.102&f=u From glen at pld-linux.org Sun Aug 28 18:21:39 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: linux-libc-headers.spec - there's no such tool to regenerat... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 16:21:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - there's no such tool to regenerate asm stub headers ---- Files affected: SPECS: linux-libc-headers.spec (1.102 -> 1.103) ---- Diffs: ================================================================ Index: SPECS/linux-libc-headers.spec diff -u SPECS/linux-libc-headers.spec:1.102 SPECS/linux-libc-headers.spec:1.103 --- SPECS/linux-libc-headers.spec:1.102 Sun Aug 28 18:14:56 2005 +++ SPECS/linux-libc-headers.spec Sun Aug 28 18:21:31 2005 @@ -101,7 +101,7 @@ # common header cat > asm/$h << EOF /* All asm/ files are generated and point to the corresponding - * file in asm-${a1} or asm-${a2}. To regenerate, run "generate-asm" + * file in asm-${a1} or asm-${a2}. */ #ifndef __ASM_STUB_${name}__ @@ -178,6 +178,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.103 2005/08/28 16:21:31 glen +- there's no such tool to regenerate asm stub headers + Revision 1.102 2005/08/28 16:14:56 glen - my build system doesn't generate .orig files on patching (but ~ instead) and others could be off completely due $VERSION_CONTROL variable, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-libc-headers.spec?r1=1.102&r2=1.103&f=u From qboosh at pld-linux.org Sun Aug 28 19:17:22 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: libdrm.spec (NEW) - new In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 17:17:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - new ---- Files affected: SPECS: libdrm.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/libdrm.spec diff -u /dev/null SPECS/libdrm.spec:1.1 --- /dev/null Sun Aug 28 19:17:22 2005 +++ SPECS/libdrm.spec Sun Aug 28 19:17:14 2005 @@ -0,0 +1,89 @@ +# $Revision$, $Date$ +Summary: Userspace interface to kernel DRM services +Summary(pl): Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra +Name: libdrm +Version: 1.0.3 +Release: 1 +License: MIT +Group: Libraries +Source0: http://people.freedesktop.org/~ajax/libdrm/%{name}-%{version}.tar.gz +# Source0-md5: 2fd32375b17fa80e3a962276f98d6440 +URL: http://dri.freedesktop.org/ +# currently uses +BuildRequires: XFree86-devel +#BuildRequires: xorg-lib-libX11-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Userspace interface to kernel DRM services. + +%description -l pl +Interfejs przestrzeni u?ytkownika do us?ug DRM j?dra. + +%package devel +Summary: Header files for libdrm library +Summary(pl): Pliki nag??wkowe biblioteki libdrm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for libdrm library. + +%description devel -l pl +Pliki nag??wkowe biblioteki libdrm. + +%package static +Summary: Static libdrm library +Summary(pl): Statyczna biblioteka libdrm +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static libdrm library. + +%description static -l pl +Statyczna biblioteka libdrm. + +%prep +%setup -q + +%build +%configure +%{__make} + +%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(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so.*.*.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libdrm.so +%{_libdir}/libdrm.la +%{_includedir}/xf86drm.h +%{_includedir}/drm +%{_pkgconfigdir}/libdrm.pc + +%files static +%defattr(644,root,root,755) +%{_libdir}/libdrm.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 17:17:14 qboosh +- new ================================================================ From qboosh at pld-linux.org Sun Aug 28 19:17:32 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: libdrm-1.0.3.tar.gz Message-ID: <25070.1125249452@distfiles.pld-linux.org> Files fetched: 1 STORED: http://people.freedesktop.org/~ajax/libdrm/libdrm-1.0.3.tar.gz 2fd32375b17fa80e3a962276f98d6440 libdrm-1.0.3.tar.gz Size: 417307 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 19:18:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: cairo.spec - rel 2; BC libpixman-devel doesn't belong here. In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:18:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; BC libpixman-devel doesn't belong here. ---- Files affected: SPECS: cairo.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/cairo.spec diff -u SPECS/cairo.spec:1.35 SPECS/cairo.spec:1.36 --- SPECS/cairo.spec:1.35 Fri Aug 26 20:46:28 2005 +++ SPECS/cairo.spec Sun Aug 28 19:18:22 2005 @@ -7,13 +7,12 @@ Summary(pl): Cairo - wieloplatformowa biblioteka graficzna 2D Name: cairo Version: 1.0.0 -Release: 1 +Release: 2 License: LGPL v2.1 or MPL v1.1 Group: Libraries Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz # Source0-md5: f0ff35c91983b7bf226154e68b280be3 URL: http://cairographics.org/ -BuildConflicts: libpixman-devel BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1.7 BuildRequires: fontconfig-devel @@ -155,6 +154,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 17:18:22 arekm +- rel 2; BC libpixman-devel doesn't belong here. + Revision 1.35 2005/08/26 18:46:28 qboosh - updated deps (ac/am, freetype for ps/pdf backends) - don't try to enable quartz backend (not available on Linux) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.35&r2=1.36&f=u From arekm at pld-linux.org Sun Aug 28 19:29:00 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: libsvg-cairo.spec -req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:29:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: -req final cairo ---- Files affected: SPECS: libsvg-cairo.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/libsvg-cairo.spec diff -u SPECS/libsvg-cairo.spec:1.11 SPECS/libsvg-cairo.spec:1.12 --- SPECS/libsvg-cairo.spec:1.11 Sun Jun 19 11:00:49 2005 +++ SPECS/libsvg-cairo.spec Sun Aug 28 19:28:55 2005 @@ -11,7 +11,7 @@ URL: http://www.xsvg.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel >= 1.0.0 BuildRequires: libsvg-devel >= 0.1.2 BuildRequires: libtool BuildRequires: pkgconfig @@ -103,6 +103,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 17:28:55 arekm +-req final cairo + Revision 1.11 2005/06/19 09:00:49 qboosh - don't include COPYING with a copy of LGPL text in doc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libsvg-cairo.spec?r1=1.11&r2=1.12&f=u From arekm at pld-linux.org Sun Aug 28 19:33:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: koffice.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:33:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: koffice.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/koffice.spec diff -u SPECS/koffice.spec:1.121 SPECS/koffice.spec:1.122 --- SPECS/koffice.spec:1.121 Mon Aug 8 12:42:57 2005 +++ SPECS/koffice.spec Sun Aug 28 19:33:20 2005 @@ -13,16 +13,13 @@ Summary(uk): ????? ??????? ??????? ??? KDE Summary(zh_CN): KDE ?????????????????? Name: koffice -# Version: %{_ver}.%{_snap} Version: %{_ver} -Release: 0.1 +Release: 1 Epoch: 5 License: GPL/LGPL Group: X11/Applications -# ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2.95/src Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2 # Source0-md5: 91a7b68757addc5934c5a8209a4926d5 -#Source0: http://ep09.pld-linux.org/~adgor/kde/%{name}-%{_snap}.tar.bz2 #Patch100: %{name}-branch.diff URL: http://www.koffice.org/ BuildRequires: ImageMagick-c++-devel @@ -835,6 +832,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.122 2005/08/28 17:33:20 arekm +- rel 1 + Revision 1.121 2005/08/08 10:42:57 blekot - more %%files (needs checkout) - log shorten ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.121&r2=1.122&f=u From arekm at pld-linux.org Sun Aug 28 19:41:12 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: poppler.spec - req final cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 17:41:12 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - req final cairo ---- Files affected: SPECS: poppler.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/poppler.spec diff -u SPECS/poppler.spec:1.17 SPECS/poppler.spec:1.18 --- SPECS/poppler.spec:1.17 Sat Aug 27 00:52:39 2005 +++ SPECS/poppler.spec Sun Aug 28 19:41:06 2005 @@ -4,7 +4,7 @@ %bcond_without cairo # disable Cairo backend %bcond_without qt # disable qt wrapper # -%define cairo_ver 0.5.0 +%define cairo_ver 1.0.0 # Summary: PDF rendering library Summary(pl): Biblioteka renderuj?ca PDF @@ -235,6 +235,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.18 2005/08/28 17:41:06 arekm +- req final cairo + Revision 1.17 2005/08/26 22:52:39 aflinta - 0.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poppler.spec?r1=1.17&r2=1.18&f=u From arekm at pld-linux.org Sun Aug 28 20:01:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: gnustep-back.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 18:01:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: gnustep-back.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/gnustep-back.spec diff -u SPECS/gnustep-back.spec:1.26 SPECS/gnustep-back.spec:1.27 --- SPECS/gnustep-back.spec:1.26 Thu Aug 11 11:46:18 2005 +++ SPECS/gnustep-back.spec Sun Aug 28 20:01:34 2005 @@ -1,15 +1,17 @@ # $Revision$, $Date$ -# TODO: symlink Helvetica from ghostscript-fonts-std? +# TODO: +# - symlink Helvetica from ghostscript-fonts-std? +# - reenable cairo as soon as versions >= 0.5 will be supported # # Conditional build: %bcond_without art # don't build art backend -%bcond_without cairo # don't build cairo backend +%bcond_with cairo # don't build cairo backend # Summary: The GNUstep backend bundle Summary(pl): Pakiet backendowy GNUstep Name: gnustep-back Version: 0.10.0 -Release: 1 +Release: 2 License: LGPL/GPL Vendor: The GNUstep Project Group: X11/Libraries @@ -216,6 +218,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.27 2005/08/28 18:01:34 arekm +- disable cairo + Revision 1.26 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-back.spec?r1=1.26&r2=1.27&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:05 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: freenx.spec - updated to 0.4.2 In-Reply-To: References: Message-ID: Author: mmazur Date: Sun Aug 28 18:07:05 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.4.2 ---- Files affected: SPECS: freenx.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/freenx.spec diff -u SPECS/freenx.spec:1.11 SPECS/freenx.spec:1.12 --- SPECS/freenx.spec:1.11 Fri Jun 17 13:55:20 2005 +++ SPECS/freenx.spec Sun Aug 28 20:07:00 2005 @@ -2,12 +2,12 @@ Summary: A free (GPL) implementation of the NX server Summary(pl): Darmowa (GPL) imlementacja serwera NX Name: freenx -Version: 0.4.0 +Version: 0.4.2 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz -# Source0-md5: a57046e79fb980b4720ec6ae67ed1f19 +# Source0-md5: 4b74709736ab1784403a61ba06cbde50 URL: http://freenx.berlios.de/ BuildRequires: sed >= 4.0 Requires: expect @@ -69,6 +69,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:07:00 mmazur +- updated to 0.4.2 + Revision 1.11 2005/06/17 11:55:20 charles - and Source0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/freenx.spec?r1=1.11&r2=1.12&f=u From mmazur at pld-linux.org Sun Aug 28 20:07:06 2005 From: mmazur at pld-linux.org (mmazur) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: freenx-0.4.2.tar.gz Message-ID: <7674.1125252426@distfiles.pld-linux.org> Files fetched: 1 STORED: http://download.berlios.de/freenx/freenx-0.4.2.tar.gz 4b74709736ab1784403a61ba06cbde50 freenx-0.4.2.tar.gz Size: 44169 bytes -- Virtually Yours: distfiles. From darekr at pld-linux.org Sun Aug 28 20:33:36 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: ntfsprogs.spec - fix pl desc In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:33:36 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix pl desc ---- Files affected: SPECS: ntfsprogs.spec (1.35 -> 1.36) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.35 SPECS/ntfsprogs.spec:1.36 --- SPECS/ntfsprogs.spec:1.35 Tue Aug 9 13:15:56 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:33:28 2005 @@ -49,7 +49,7 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu pe?n? obs?ug? NTFS pod Linuksem. +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2005/08/28 18:33:28 darekr +- fix pl desc + Revision 1.35 2005/08/09 11:15:56 qboosh - more pl ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.35&r2=1.36&f=u From darekr at pld-linux.org Sun Aug 28 20:38:30 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: most.spec - BR: perl-base - noreplace for %config, added %v... In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 18:38:30 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: perl-base - noreplace for %config, added %verify() ---- Files affected: SPECS: most.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/most.spec diff -u SPECS/most.spec:1.36 SPECS/most.spec:1.37 --- SPECS/most.spec:1.36 Mon Aug 1 14:16:12 2005 +++ SPECS/most.spec Sun Aug 28 20:38:24 2005 @@ -4,13 +4,14 @@ Name: most Version: 4.10.2 Release: 1 -License: GPL +License: GPL v2 Group: Applications/Text Source0: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 # Source0-md5: 99a24b6989ac81f436791b957b2e171a URL: http://www.jedsoft.org/most/ BuildRequires: autoconf >= 2.50 BuildRequires: automake +BuildRequires: perl-base BuildRequires: slang-devel >= 1.3.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,7 +58,7 @@ %files %defattr(644,root,root,755) %doc README *.rc *.txt -%config %{_sysconfdir}/most.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/most.conf %attr(755,root,root) %{_bindir}/most %{_mandir}/man1/*.1* @@ -67,6 +68,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:38:24 darekr +- BR: perl-base +- noreplace for %config, added %verify() + Revision 1.36 2005/08/01 12:16:12 blekot - up to 4.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/most.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:40:58 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: ntfsprogs.spec - formatting In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:40:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - formatting ---- Files affected: SPECS: ntfsprogs.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/ntfsprogs.spec diff -u SPECS/ntfsprogs.spec:1.36 SPECS/ntfsprogs.spec:1.37 --- SPECS/ntfsprogs.spec:1.36 Sun Aug 28 20:33:28 2005 +++ SPECS/ntfsprogs.spec Sun Aug 28 20:40:52 2005 @@ -49,8 +49,8 @@ You can find more information about these utilities in their manuals. %description -l pl -Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod Linuksem. -Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera +Projekt Linux-NTFS ma na celu dostarczy? pe?n? obs?ug? NTFS pod +Linuksem. Aktualnie sk?ada si? z biblioteki i narz?dzi. Pakiet zawiera nast?puj?ce narz?dzia: - ntfsfix - pr?buje naprawia? partycj? NTFS uszkodzone przez linuksowy @@ -209,6 +209,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 18:40:52 qboosh +- formatting + Revision 1.36 2005/08/28 18:33:28 darekr - fix pl desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntfsprogs.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 20:54:39 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: dirac-0.5.3.tar.gz Message-ID: <18351.1125255279@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/dirac/dirac-0.5.3.tar.gz 6882ac9fe9b39edc2a2e666d36d674c3 dirac-0.5.3.tar.gz Size: 703435 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 20:54:35 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: dirac.spec - updated to 0.5.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 18:54:35 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.5.3 ---- Files affected: SPECS: dirac.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/dirac.spec diff -u SPECS/dirac.spec:1.11 SPECS/dirac.spec:1.12 --- SPECS/dirac.spec:1.11 Sat Aug 13 20:04:34 2005 +++ SPECS/dirac.spec Sun Aug 28 20:54:28 2005 @@ -2,12 +2,12 @@ Summary: General purpose video codec Summary(pl): Kodek obrazu og?lnego przeznaczenia Name: dirac -Version: 0.5.2 -Release: 2 -License: MPL +Version: 0.5.3 +Release: 1 +License: MPL v1.1 or GPL v2 or LGPL v2.1 Group: Libraries Source0: http://dl.sourceforge.net/dirac/%{name}-%{version}.tar.gz -# Source0-md5: e83e3dc3025c04b3163fbcd1d5e6a328 +# Source0-md5: 6882ac9fe9b39edc2a2e666d36d674c3 Patch0: %{name}-am.patch URL: http://www.bbc.co.uk/rd/projects/dirac/ BuildRequires: autoconf >= 2.50 @@ -89,13 +89,13 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README TODO doc/faq.htm +%doc AUTHORS ChangeLog NEWS README TODO doc/faq.html %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.*.* %files devel %defattr(644,root,root,755) -%doc doc/api/html doc/programmers/programmers_guide.pdf doc/dirac_doc_howto.txt +%doc doc/documentation/code/api/html doc/dirac_bitstream.txt %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la %{_includedir}/%{name} @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.12 2005/08/28 18:54:28 qboosh +- updated to 0.5.3 + Revision 1.11 2005/08/13 18:04:34 qboosh - don't install unit testsuite program (avoid cppunit dependency) - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dirac.spec?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 21:22:14 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: gtk+2-bug312710.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:22:14 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: gtk+2-bug312710.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 21:23:08 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: gtk+2.spec - updated to 2.6.10 - removed obsolete bug312710... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 19:23:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.10 - removed obsolete bug312710 patch (alternative fix included) ---- Files affected: SPECS: gtk+2.spec (1.181 -> 1.182) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.181 SPECS/gtk+2.spec:1.182 --- SPECS/gtk+2.spec:1.181 Mon Aug 8 23:54:24 2005 +++ SPECS/gtk+2.spec Sun Aug 28 21:23:03 2005 @@ -15,17 +15,16 @@ Summary(pl): Gimp Toolkit Summary(tr): Gimp ToolKit aray?z kitapl??? Name: gtk+2 -Version: 2.6.9 -Release: 2 +Version: 2.6.10 +Release: 1 Epoch: 2 License: LGPL Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-%{version}.tar.bz2 -# Source0-md5: 26c3a0bea55353eed63348fb7be4153a +# Source0-md5: 520090ef291e35ba93397060e20f5025 Patch0: %{name}-insensitive-iain.patch Patch1: %{name}-menushadow.patch Patch2: %{name}-xlibs.patch -Patch3: %{name}-bug312710.patch URL: http://www.gtk.org/ Icon: gtk+.xpm %{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} @@ -145,7 +144,6 @@ %patch0 -p1 %{?with_menushadow:%patch1 -p1} %{?with_xlibs:%patch2 -p1} -%patch3 -p1 %build %{__gtkdocize} @@ -274,6 +272,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.182 2005/08/28 19:23:03 qboosh +- updated to 2.6.10 +- removed obsolete bug312710 patch (alternative fix included) + Revision 1.181 2005/08/08 21:54:24 freetz - http://bugzilla.gnome.org/show_bug.cgi?id=312710, rel.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.181&r2=1.182&f=u From qboosh at pld-linux.org Sun Aug 28 21:23:23 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: gtk+-2.6.10.tar.bz2 Message-ID: <27413.1125257003@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.10.tar.bz2 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 Size: 11521380 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 21:25:07 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: gstreamer-plugins.spec - disable cairo; fix cairo BR; rel 2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:25:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo; fix cairo BR; rel 2 ---- Files affected: SPECS: gstreamer-plugins.spec (1.159 -> 1.160) ---- Diffs: ================================================================ Index: SPECS/gstreamer-plugins.spec diff -u SPECS/gstreamer-plugins.spec:1.159 SPECS/gstreamer-plugins.spec:1.160 --- SPECS/gstreamer-plugins.spec:1.159 Mon Aug 8 16:42:26 2005 +++ SPECS/gstreamer-plugins.spec Sun Aug 28 21:25:02 2005 @@ -14,7 +14,7 @@ %bcond_without arts # don't build aRts audio output plugins %bcond_without audiofile # don't build audiofile plugin %bcond_without caca # don't build caca videosink plugin -%bcond_without cairo # don't build cairo plugin +%bcond_with cairo # build cairo plugin %bcond_without cdaudio # don't build cdaudio plugin %bcond_without cdio # don't build cdio plugin %bcond_without dirac # don't build dirac plugin @@ -55,7 +55,7 @@ Summary(pl): Wtyczki do ?rodowiska obr?bki strumieni GStreamer Name: gstreamer-plugins Version: 0.8.10 -Release: 1 +Release: 2 License: LGPL Group: Libraries Source0: http://gstreamer.freedesktop.org/src/gst-plugins/%{gstname}-%{version}.tar.bz2 @@ -86,7 +86,10 @@ %{?with_arts:BuildRequires: arts-devel >= 0.9.5} %{?with_arts:BuildRequires: artsc-devel >= 0.9.5} %{?with_audiofile:BuildRequires: audiofile-devel >= 1:0.2.3-5.20021108} -%{?with_cairo:BuildRequires: cairo-devel >= 0.5.0} +%if %{with cairo} +BuildRequires: cairo-devel >= 0.5.0 +BuildRequires: cairo-devel < 0.6.0 +%endif BuildRequires: cdparanoia-III-devel %{?with_dirac:BuildRequires: dirac-devel >= 0.5.0} %{?with_divx4linux:BuildRequires: divx4linux-devel >= 1:5.05.20030428} @@ -2208,6 +2211,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.160 2005/08/28 19:25:02 arekm +- disable cairo; fix cairo BR; rel 2 + Revision 1.159 2005/08/08 14:42:26 glen - wavpack bconded (not yet available on builders) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gstreamer-plugins.spec?r1=1.159&r2=1.160&f=u From arekm at pld-linux.org Sun Aug 28 21:26:01 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: mozilla.spec - disable cairo In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:26:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable cairo ---- Files affected: SPECS: mozilla.spec (1.372 -> 1.373) ---- Diffs: ================================================================ Index: SPECS/mozilla.spec diff -u SPECS/mozilla.spec:1.372 SPECS/mozilla.spec:1.373 --- SPECS/mozilla.spec:1.372 Sun Aug 14 08:53:13 2005 +++ SPECS/mozilla.spec Sun Aug 28 21:25:56 2005 @@ -10,7 +10,7 @@ %bcond_without gnomevfs # disable GnomeVFS support %bcond_without heimdal # disable heimdal support -%bcond_without svg # disable svg support +%bcond_with svg # enable svg support # Summary: Mozilla - web browser Summary(es): Navegador de Internet Mozilla @@ -19,7 +19,7 @@ Summary(ru): Web browser Name: mozilla Version: 1.7.11 -Release: 1 +Release: 2 Epoch: 5 License: Mozilla Public License Group: X11/Applications/Networking @@ -844,6 +844,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.373 2005/08/28 19:25:56 arekm +- disable cairo + Revision 1.372 2005/08/14 06:53:13 qboosh - require cairo only if built with svg support ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla.spec?r1=1.372&r2=1.373&f=u From arekm at pld-linux.org Sun Aug 28 21:41:10 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: gnome-doc-utils.spec - merged from DEVEL In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:41:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL ---- Files affected: SPECS: gnome-doc-utils.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/gnome-doc-utils.spec diff -u SPECS/gnome-doc-utils.spec:1.6 SPECS/gnome-doc-utils.spec:1.7 --- SPECS/gnome-doc-utils.spec:1.6 Tue Jul 12 14:01:17 2005 +++ SPECS/gnome-doc-utils.spec Sun Aug 28 21:41:03 2005 @@ -2,12 +2,13 @@ Summary: Documentation utilities for GNOME Summary(pl): Narz?dzia do budowania dokumentacji dla GNOME Name: gnome-doc-utils -Version: 0.2.1 +Version: 0.3.2 Release: 1 License: GPL v2+/LGPL v2+ Group: Development/Tools -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.2/%{name}-%{version}.tar.bz2 -# Source0-md5: 02c006ad31b2b878263025c12c4ff35a +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.3/%{name}-%{version}.tar.bz2 +# Source0-md5: d29a3e10ff8cba17dbb6d3aff2f30bb8 +Patch0: %{name}-no_scrollkeeper_update.patch URL: http://www.gnome.org/ BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: libxslt-devel >= 1.1.14 @@ -25,9 +26,11 @@ %prep %setup -q +%patch0 -p1 %build -%configure +%configure \ + --disable-scrollkeeper %{__make} %install @@ -51,13 +54,13 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%{_pkgconfigdir}/*.pc %{_aclocaldir}/*.m4 %{_datadir}/%{name} -%{_omf_dest_dir}/* -%{_datadir}/xml/gnome %{_datadir}/xml2po +%{_datadir}/xml/gnome %{_mandir}/man1/xml2po.1* +%{_omf_dest_dir}/* +%{_pkgconfigdir}/*.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -65,6 +68,18 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 19:41:03 arekm +- merged from DEVEL + +Revision 1.6.2.3 2005/07/27 07:19:24 paladine +- updated to 0.3.2 + +Revision 1.6.2.2 2005/07/25 19:06:21 freetz +- killed scrollkeeper-update call (patch), rel.2 + +Revision 1.6.2.1 2005/07/12 12:05:23 freetz +- 0.3.1 + Revision 1.6 2005/07/12 12:01:17 freetz - 0.2.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-doc-utils.spec?r1=1.6&r2=1.7&f=u From arekm at pld-linux.org Sun Aug 28 21:53:43 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: evince.spec - disable dbus for now; reenable when new dbus ... In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 19:53:43 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - disable dbus for now; reenable when new dbus goes into ac; rel 2 ---- Files affected: SPECS: evince.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/evince.spec diff -u SPECS/evince.spec:1.30 SPECS/evince.spec:1.31 --- SPECS/evince.spec:1.30 Sat Aug 27 16:24:16 2005 +++ SPECS/evince.spec Sun Aug 28 21:53:38 2005 @@ -2,11 +2,12 @@ # # TODO: fix t1lib build time misdetection (very low prio) # +%bcond_with dbus Summary: Document viewer for multiple document formats Summary(pl): Przegl?darka dokument?w w wielu formatach Name: evince Version: 0.4.0 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/gnome/sources/evince/0.4/%{name}-%{version}.tar.bz2 @@ -17,7 +18,7 @@ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: autoconf BuildRequires: automake -BuildRequires: dbus-glib-devel >= 0.36 +%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.36} BuildRequires: djvulibre-devel >= 3.5.15 BuildRequires: ghostscript BuildRequires: gnome-doc-utils >= 0.3.2 @@ -80,7 +81,7 @@ %configure \ --disable-static \ --disable-schemas-install \ - --enable-dbus \ + %{?with_dbus:--enable-dbus} \ --enable-djvu \ --enable-dvi \ --enable-nautilus \ @@ -142,6 +143,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.31 2005/08/28 19:53:38 arekm +- disable dbus for now; reenable when new dbus goes into ac; rel 2 + Revision 1.30 2005/08/27 14:24:16 paladine - removed disable_dbus patch - works for me, rel. 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evince.spec?r1=1.30&r2=1.31&f=u From troll at pld-linux.org Sun Aug 28 21:55:42 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: xchat-xchatlibdir.patch (NEW) - patch correcting XCHATLIB... In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:55:42 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - patch correcting XCHATLIBDIR variable on architectures using /usr/lib64 directory for plugins. this fixes autoloading them at startup. ---- Files affected: SOURCES: xchat-xchatlibdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xchat-xchatlibdir.patch diff -u /dev/null SOURCES/xchat-xchatlibdir.patch:1.1 --- /dev/null Sun Aug 28 21:55:42 2005 +++ SOURCES/xchat-xchatlibdir.patch Sun Aug 28 21:55:37 2005 @@ -0,0 +1,18 @@ +--- xchat-2.4.4/configure.in~ 2005-08-28 21:48:43.131905736 +0200 ++++ xchat-2.4.4/configure.in 2005-08-28 21:49:12.279474632 +0200 +@@ -635,13 +635,13 @@ + PLUGIN_INCLUDES='-I$(top_srcdir)/plugins' + AC_SUBST(PLUGIN_INCLUDES) + ++AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${libdir}/xchat") ++ + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PREFIX, "${ac_default_prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${ac_default_prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${ac_default_prefix}/share/xchat") + else + AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") +- AC_DEFINE_UNQUOTED(XCHATLIBDIR, "${prefix}/lib/xchat") + AC_DEFINE_UNQUOTED(XCHATSHAREDIR, "${prefix}/share/xchat") + fi + ================================================================ From darekr at pld-linux.org Sun Aug 28 21:56:19 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: multi-aterm.spec - fix Source0 In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 19:56:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fix Source0 ---- Files affected: SPECS: multi-aterm.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/multi-aterm.spec diff -u SPECS/multi-aterm.spec:1.9 SPECS/multi-aterm.spec:1.10 --- SPECS/multi-aterm.spec:1.9 Tue Sep 7 10:06:21 2004 +++ SPECS/multi-aterm.spec Sun Aug 28 21:56:14 2005 @@ -7,7 +7,7 @@ Release: 2 License: GPL Group: X11/Applications -Source0: http://www.nongnu.org/materm//%{name}-%{version}.tar.gz +Source0: http://www.nongnu.org/materm/%{name}-%{version}.tar.gz # Source0-md5: 52f9c25a6fad7f638f7064ff6cc74c62 Source1: %{name}.desktop Source2: %{name}.png @@ -95,6 +95,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2005/08/28 19:56:14 darekr +- fix Source0 + Revision 1.9 2004/09/07 08:06:21 blues - enabled mousewheel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/multi-aterm.spec?r1=1.9&r2=1.10&f=u From troll at pld-linux.org Sun Aug 28 21:56:59 2005 From: troll at pld-linux.org (troll) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: xchat.spec - added xchatlibdir patch, - rel 2 In-Reply-To: References: Message-ID: Author: troll Date: Sun Aug 28 19:56:59 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added xchatlibdir patch, - rel 2 ---- Files affected: SPECS: xchat.spec (1.164 -> 1.165) ---- Diffs: ================================================================ Index: SPECS/xchat.spec diff -u SPECS/xchat.spec:1.164 SPECS/xchat.spec:1.165 --- SPECS/xchat.spec:1.164 Mon Jun 20 21:02:52 2005 +++ SPECS/xchat.spec Sun Aug 28 21:56:53 2005 @@ -22,7 +22,7 @@ Summary(zh_CN): GTK+ IRC (????) ?????? Name: xchat Version: 2.4.4 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2 Group: X11/Applications/Networking @@ -33,6 +33,7 @@ Patch1: %{name}-locale_names.patch Patch2: %{name}-long-delimiter.patch Patch3: %{name}-domains.patch +Patch4: %{name}-xchatlibdir.patch Icon: xchat.xpm URL: http://www.xchat.org/ BuildRequires: autoconf @@ -134,6 +135,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} po/pl.po @@ -184,6 +186,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.165 2005/08/28 19:56:53 troll +- added xchatlibdir patch, +- rel 2 + Revision 1.164 2005/06/20 19:02:52 wolf - 2.4.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xchat.spec?r1=1.164&r2=1.165&f=u From arekm at pld-linux.org Sun Aug 28 22:04:45 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: gst-python-0.8.2.tar.gz Message-ID: <3010.1125259485@distfiles.pld-linux.org> Files fetched: 1 STORED: http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.8.2.tar.gz 35a735711f43551722b0dbcfc7895f3e gst-python-0.8.2.tar.gz Size: 418325 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:04:40 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: python-gstreamer.spec - up to 0.8.2 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:04:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.8.2 ---- Files affected: SPECS: python-gstreamer.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.7 SPECS/python-gstreamer.spec:1.8 --- SPECS/python-gstreamer.spec:1.7 Sun Jan 9 18:55:40 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:04:35 2005 @@ -3,12 +3,12 @@ Summary: GStreamer Python bindings Summary(pl): Wi?zania j?zyka Python do GStreamera Name: python-gstreamer -Version: 0.8.1 -Release: 2 +Version: 0.8.2 +Release: 1 License: GPL Group: Libraries/Python Source0: http://gstreamer.freedesktop.org/src/%{pname}/%{pname}-%{version}.tar.gz -# Source0-md5: 4666978d610b48f7f7481e41433a856c +# Source0-md5: 35a735711f43551722b0dbcfc7895f3e Patch0: %{pname}-py2pyc.patch URL: http://gstreamer.freedesktop.org/modules/gst-python.html BuildRequires: gstreamer-devel >= 0.8.0 @@ -70,6 +70,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.8 2005/08/28 20:04:35 arekm +- up to 0.8.2 + Revision 1.7 2005/01/09 17:55:40 saq - missing pyreqeq, rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.7&r2=1.8&f=u From glen at pld-linux.org Sun Aug 28 22:06:27 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: license-installer.sh - add @COPYSOURCES@ for adobe install In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:06:27 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - add @COPYSOURCES@ for adobe install ---- Files affected: SOURCES: license-installer.sh (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.4 SOURCES/license-installer.sh:1.5 --- SOURCES/license-installer.sh:1.4 Sun Aug 28 17:28:44 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:06:22 2005 @@ -12,6 +12,14 @@ BACKUP=1 mv -f $SPECDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec.prev fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i $SOURCEDIR/$i.prev + BACKUP=1 + fi + done + fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then ( cd $SRPMDIR if echo "$3" | grep '://' >/dev/null; then @@ -20,10 +28,25 @@ cp -f "$3" . fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) - ) + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + done + fi + ) cp -i $TMPDIR/@BASE_NAME@.spec $SPECDIR/@BASE_NAME@.spec || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i $TMPDIR/$i $SOURCEDIR/$i || exit 1 + done + fi else cp -i "$3" $SPECDIR || exit 1 + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1 + done + fi fi ( cd $SPECDIR /usr/bin/builder -nm -nc -ncs --with license_agreement --opts --target=@TARGET_CPU@ @BASE_NAME@.spec @@ -35,6 +58,14 @@ if [ "$BACKUP" -eq 1 ]; then if [ -f $SPECDIR/@BASE_NAME@.spec.prev ]; then mv -f $SPECDIR/@BASE_NAME@.spec.prev $SPECDIR/@BASE_NAME@.spec + fi + if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then + for i in @COPYSOURCES@; do + if [ -f $SOURCEDIR/$i ]; then + mv -f $SOURCEDIR/$i.prev $SOURCEDIR/$i + BACKUP=1 + fi + done fi fi else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.4&r2=1.5&f=u From glen at pld-linux.org Sun Aug 28 22:07:18 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: acroread.spec - use shared license-installer.sh from SOURCE... In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:07:18 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh from SOURCES - rel 2 ---- Files affected: SPECS: acroread.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/acroread.spec diff -u SPECS/acroread.spec:1.45 SPECS/acroread.spec:1.46 --- SPECS/acroread.spec:1.45 Fri Aug 19 13:31:03 2005 +++ SPECS/acroread.spec Sun Aug 28 22:07:12 2005 @@ -14,7 +14,7 @@ Name: %{base_name}-installer %endif Version: 7.0.1 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} Epoch: 1 License: distribution restricted (http://www.adobe.com/products/acrobat/distribute.html) # in short: @@ -23,6 +23,8 @@ Group: X11/Applications/Graphics %if %{with license_agreement} Source0: http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz +%else +Source0: license-installer.sh %endif Source1: %{base_name}.desktop Source2: %{base_name}.png @@ -81,89 +83,18 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "\$1" = "--with" -a "\$2" = "license_agreement" ]; then - TMPDIR=\`rpm --eval "%%{tmpdir}"\`; export TMPDIR - SPECDIR=\`rpm --eval "%%{_specdir}"\`; export SPECDIR - SRPMDIR=\`rpm --eval "%%{_srcrpmdir}"\`; export SRPMDIR - SOURCEDIR=\`rpm --eval "%%{_sourcedir}"\`; export SOURCEDIR - BUILDDIR=\`rpm --eval "%%{_builddir}"\`; export BUILDDIR - RPMDIR=\`rpm --eval "%%{_rpmdir}"\`; export RPMDIR - BACKUP=0 - mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR - if [ -f \$SPECDIR/%{base_name}.spec ]; then - BACKUP=1 - mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i ]; then - mv -f \$SOURCEDIR/\$i \$SOURCEDIR/\$i.prev - BACKUP=1 - fi - done - if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd \$SRPMDIR - if echo "\$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "\$3" - else - cp -f "\$3" . - fi - rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec ) - for i in %{base_name}.desktop %{base_name}.png; do - rpm2cpio \$i | ( cd \$TMPDIR; cpio -i \$i ) - done ) - cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \ - || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i \$TMPDIR/\$i \$SOURCEDIR/\$i || exit 1 - done - else - cp -i "\$3" \$SPECDIR || exit 1 - for i in %{base_name}.desktop %{base_name}.png; do - cp -i %{_datadir}/%{base_name}/\$i \$SOURCEDIR/\$i || exit 1 - done - fi - ( cd \$SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "\$?" -ne 0 ]; then - exit 2 - fi - RPMNAME1=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - RPMNAME2=mozilla-plugin-%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm - echo "Installing \$RPMNAME1" - RPMNAMES=\$RPMDIR/\$RPMNAME1 - if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then - RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2" - echo "Installing \$RPMNAME2" - else - echo "Not installing \$RPMNAME2" - fi - rpm -U \$RPMNAMES || \ - echo -e "Install manually the file(s):\n \$RPMNAMES" ) - if [ "\$BACKUP" -eq 1 ]; then - if [ -f \$SPECDIR/%{base_name}.spec.prev ]; then - mv -f \$SPECDIR/%{base_name}.spec.prev \$SPECDIR/%{base_name}.spec - fi - for i in %{base_name}.desktop %{base_name}.png %{base_name}-locale.patch; do - if [ -f \$SOURCEDIR/\$i.prev ]; then - mv -f \$SOURCEDIR/\$i.prev \$SOURCEDIR/\$i - fi - done - fi -else - echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -\$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + s-@VERSION@-%{version}-g + s-@RELEASE@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g + s,@DATADIR@,%{_datadir}/%{base_name},g + s/@COPYSOURCES@/%{base_name}{.desktop,.png}/g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -193,20 +124,14 @@ %clean rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} %pre -echo " -License issues made us not to include inherent files into -this package by default. If you want to create full working -package please build it with the following command: - -%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" +%{_bindir}/%{base_name}.install %endif %files %defattr(644,root,root,755) -%if ! %{with license_agreement} +%if %{without license_agreement} %attr(755,root,root) %{_bindir}/%{base_name}.install %{_datadir}/%{base_name} %else @@ -247,6 +172,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.46 2005/08/28 20:07:12 glen +- use shared license-installer.sh from SOURCES +- rel 2 + Revision 1.45 2005/08/19 11:31:03 blekot - up to 701 (7.0.1) (security bug fixed) @@ -312,7 +241,7 @@ - updated to 509 Revision 1.30 2003/09/26 14:03:20 adgor -- Desktop file moved to %%{_desktopdir} +- Desktop file moved to %{_desktopdir} Revision 1.29 2003/09/12 22:35:39 grzegol - added icon @@ -359,7 +288,7 @@ - security update to 506, updated patch Revision 1.15 2002/05/23 20:58:50 qboosh -- new %%doc +- new %doc - +x for nppdf.so (but it doesn't work for me anyway) Revision 1.14 2002/05/22 10:36:53 zagrodzki @@ -370,7 +299,7 @@ - ... and placed in an appropriate subpackage Revision 1.12 2002/04/25 15:41:38 arturs -fixed a small typo +- fixed a small typo Revision 1.11 2002/02/22 23:28:40 kloczek - removed all Group fields translations (our rpm now can handle translating @@ -381,7 +310,7 @@ - release 3 Revision 1.9 2002/01/18 02:12:18 kloczek -perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" +- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/" Revision 1.8 2001/10/31 10:50:37 qboosh - adapterized, cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.45&r2=1.46&f=u From qboosh at pld-linux.org Sun Aug 28 22:07:54 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: geos-2.1.4.tar.bz2 Message-ID: <10251.1125259674@distfiles.pld-linux.org> Files fetched: 1 STORED: http://geos.refractions.net/geos-2.1.4.tar.bz2 e00524abc2cb26c8fb9173b8696be3b7 geos-2.1.4.tar.bz2 Size: 506683 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:07:52 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: geos.spec - updated to 2.1.4 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:07:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.4 ---- Files affected: SPECS: geos.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/geos.spec diff -u SPECS/geos.spec:1.6 SPECS/geos.spec:1.7 --- SPECS/geos.spec:1.6 Mon Jul 25 08:34:29 2005 +++ SPECS/geos.spec Sun Aug 28 22:07:47 2005 @@ -2,12 +2,12 @@ Summary: Geometry Engine - Open Source Summary(pl): GEOS - silnik geometryczny z otwartymi ?r?d?ami Name: geos -Version: 2.1.3 +Version: 2.1.4 Release: 1 License: LGPL Group: Libraries Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2 -# Source0-md5: 29aa82867cb68fed607cd015b61499df +# Source0-md5: e00524abc2cb26c8fb9173b8696be3b7 Patch0: %{name}-config.patch URL: http://geos.refractions.net/ BuildRequires: automake @@ -100,6 +100,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.7 2005/08/28 20:07:47 qboosh +- updated to 2.1.4 + Revision 1.6 2005/07/25 06:34:29 qboosh - updated to 2.1.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/geos.spec?r1=1.6&r2=1.7&f=u From twittner at pld-linux.org Sun Aug 28 22:10:29 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: vdk.spec - libsigc++1-devel and libsigc++12-devel BRs remov... In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:10:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by vdk ---- Files affected: SPECS: vdk.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: SPECS/vdk.spec diff -u SPECS/vdk.spec:1.25 SPECS/vdk.spec:1.26 --- SPECS/vdk.spec:1.25 Sun Aug 28 09:16:28 2005 +++ SPECS/vdk.spec Sun Aug 28 22:10:24 2005 @@ -21,9 +21,6 @@ BuildRequires: freetype-devel >= 2.0.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: imlib-devel -# both??? -BuildRequires: libsigc++1-devel -BuildRequires: libsigc++12-devel >= 1.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: perl-devel >= 1:5.6 @@ -123,6 +120,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.26 2005/08/28 20:10:24 twittner +- libsigc++1-devel and libsigc++12-devel BRs removed - they aren't used by + vdk + Revision 1.25 2005/08/28 07:16:28 qboosh - updated gtk+2 epoch; sorted BRs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdk.spec?r1=1.25&r2=1.26&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:29 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: ecasound.spec - updated to 2.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:19:29 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.4.3 ---- Files affected: SPECS: ecasound.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/ecasound.spec diff -u SPECS/ecasound.spec:1.88 SPECS/ecasound.spec:1.89 --- SPECS/ecasound.spec:1.88 Sat Aug 13 21:03:45 2005 +++ SPECS/ecasound.spec Sun Aug 28 22:19:23 2005 @@ -9,12 +9,12 @@ Summary: Software package for multitrack audio processing Summary(pl): Oprogramowanie do wielo?cie?kowego przetwarzania d?wi?ku Name: ecasound -Version: 2.4.2 +Version: 2.4.3 Release: 1 License: GPL Group: Applications/Sound Source0: http://ecasound.seul.org/download/%{name}-%{version}.tar.gz -# Source0-md5: 77c10152f5a15da13f7876f0da30d592 +# Source0-md5: ea4af6ffa9f00743270151927f7b4584 Patch0: %{name}-link.patch URL: http://ecasound.seul.org/ %{?with_alsa:BuildRequires: alsa-lib-devel} @@ -217,6 +217,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.89 2005/08/28 20:19:23 qboosh +- updated to 2.4.3 + Revision 1.88 2005/08/13 19:03:45 qboosh - updated to 2.4.2, added URL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ecasound.spec?r1=1.88&r2=1.89&f=u From qboosh at pld-linux.org Sun Aug 28 22:19:40 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: ecasound-2.4.3.tar.gz Message-ID: <26938.1125260380@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ecasound.seul.org/download/ecasound-2.4.3.tar.gz ea4af6ffa9f00743270151927f7b4584 ecasound-2.4.3.tar.gz Size: 1112995 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:20:19 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: python-gstreamer.spec - add pth file; import gst works now In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:20:19 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - add pth file; import gst works now ---- Files affected: SPECS: python-gstreamer.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SPECS/python-gstreamer.spec diff -u SPECS/python-gstreamer.spec:1.8 SPECS/python-gstreamer.spec:1.9 --- SPECS/python-gstreamer.spec:1.8 Sun Aug 28 22:04:35 2005 +++ SPECS/python-gstreamer.spec Sun Aug 28 22:20:12 2005 @@ -49,6 +49,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +echo "gst" > $RPM_BUILD_ROOT%{py_sitedir}/gst.pth + cp -R examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %clean @@ -59,6 +61,7 @@ %doc AUTHORS ChangeLog NEWS README TODO %dir %{py_sitedir}/gst %attr(755,root,root) %{py_sitedir}/gst/*.so +%{py_sitedir}/*.pth %{py_sitescriptdir}/gst/*py[co] %{_pkgconfigdir}/*.pc %{_datadir}/%{pname} @@ -70,6 +73,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.9 2005/08/28 20:20:12 arekm +- add pth file; import gst works now + Revision 1.8 2005/08/28 20:04:35 arekm - up to 0.8.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/python-gstreamer.spec?r1=1.8&r2=1.9&f=u From glen at pld-linux.org Sun Aug 28 22:24:23 2005 From: glen at pld-linux.org (glen) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: license-installer.sh - fix for installing from local src.rpm In-Reply-To: References: Message-ID: Author: glen Date: Sun Aug 28 20:24:23 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix for installing from local src.rpm ---- Files affected: SOURCES: license-installer.sh (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SOURCES/license-installer.sh diff -u SOURCES/license-installer.sh:1.5 SOURCES/license-installer.sh:1.6 --- SOURCES/license-installer.sh:1.5 Sun Aug 28 22:06:22 2005 +++ SOURCES/license-installer.sh Sun Aug 28 22:24:17 2005 @@ -21,16 +21,18 @@ done fi if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR + ( if echo "$3" | grep '://' >/dev/null; then + cd $SRPMDIR wget --passive-ftp -t0 "$3" else - cp -f "$3" . + cp -f "$3" $SRPMDIR + cd $SRPMDIR fi rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME@.spec ) if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then for i in @COPYSOURCES@; do - rpm2cpio $i | ( cd $TMPDIR; cpio -i $i ) + rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i $i ) done fi ) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:21 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: fakeroot.spec - updated to 1.4.3 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:25:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.4.3 ---- Files affected: SPECS: fakeroot.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: SPECS/fakeroot.spec diff -u SPECS/fakeroot.spec:1.46 SPECS/fakeroot.spec:1.47 --- SPECS/fakeroot.spec:1.46 Mon Jul 18 21:23:16 2005 +++ SPECS/fakeroot.spec Sun Aug 28 22:25:16 2005 @@ -3,12 +3,12 @@ Summary(pl): Umo?liwia uzyskanie ,,podrobionego'' ?rodowiska roota Summary(pt_BR): Cria um falso ambiente de root Name: fakeroot -Version: 1.4.2 +Version: 1.4.3 Release: 1 License: GPL (see COPYING) Group: Development/Tools Source0: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz -# Source0-md5: 42f7b5fa763c9a302387d4228d9376c2 +# Source0-md5: bf9cd1d9b98adcf1a94741fc2db0442e BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: libtool @@ -97,6 +97,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.47 2005/08/28 20:25:16 qboosh +- updated to 1.4.3 + Revision 1.46 2005/07/18 19:23:16 darekr - updated to 1.4.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fakeroot.spec?r1=1.46&r2=1.47&f=u From qboosh at pld-linux.org Sun Aug 28 22:25:25 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: fakeroot_1.4.3.tar.gz Message-ID: <3788.1125260725@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.4.3.tar.gz bf9cd1d9b98adcf1a94741fc2db0442e fakeroot_1.4.3.tar.gz Size: 1141657 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:26:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: file-ia64.patch (REMOVED), file-4.14.patch1 (REMOVED) - o... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:26:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: file-ia64.patch (1.5 -> NONE) (REMOVED), file-4.14.patch1 (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From qboosh at pld-linux.org Sun Aug 28 22:27:05 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: file-debian.patch - updated for 4.15 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 4.15 ---- Files affected: SOURCES: file-debian.patch (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SOURCES/file-debian.patch diff -u SOURCES/file-debian.patch:1.11 SOURCES/file-debian.patch:1.12 --- SOURCES/file-debian.patch:1.11 Mon Jul 18 23:19:42 2005 +++ SOURCES/file-debian.patch Sun Aug 28 22:27:00 2005 @@ -1,8 +1,8 @@ ---- file-4.13.orig/doc/file.man -+++ file-4.13/doc/file.man +--- file-4.15/doc/file.man.orig 2005-08-18 17:18:22.000000000 +0200 ++++ file-4.15/doc/file.man 2005-08-28 22:16:00.615271312 +0200 @@ -1,4 +1,4 @@ -.TH FILE __CSECTION__ "Copyright but distributable" -+.TH FILE __CSECTION__ "January 2004" "Copyrighted but distributable" ++.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable" .\" $Id$ .SH NAME file @@ -31,7 +31,7 @@ magic file .I __MAGIC__.mgc , or -@@ -339,12 +340,6 @@ +@@ -368,12 +369,6 @@ The order of entries in the magic file is significant. Depending on what system you are using, the order that they are put together may be incorrect. @@ -44,7 +44,7 @@ .SH EXAMPLES .nf $ file file.c file /dev/{wd0a,hda} -@@ -498,3 +493,7 @@ +@@ -527,3 +522,7 @@ .B ftp.astron.com in the directory .I /pub/file/file-X.YZ.tar.gz ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/file-debian.patch?r1=1.11&r2=1.12&f=u From qboosh at pld-linux.org Sun Aug 28 22:27:48 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: file-4.15.tar.gz file-non-english-man-pages.tar.bz2 Message-ID: <7239.1125260868@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.astron.com/pub/file/file-4.15.tar.gz 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz Size: 546522 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/file-non-english-man-pages.tar.bz2 c157a183b64156f8baafaefd9cbf04c1 file-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 22:27:45 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: file.spec - updated to 4.15, updated debian patch, removed ... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:27:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches ---- Files affected: SPECS: file.spec (1.107 -> 1.108) ---- Diffs: ================================================================ Index: SPECS/file.spec diff -u SPECS/file.spec:1.107 SPECS/file.spec:1.108 --- SPECS/file.spec:1.107 Tue Jul 19 17:56:26 2005 +++ SPECS/file.spec Sun Aug 28 22:27:40 2005 @@ -28,25 +28,23 @@ Summary(zh_CN): ???????????????????? Summary(zh_TW): ?????M?w???????????@???u???{???C Name: file -Version: 4.14 +Version: 4.15 Release: 1 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz -# Source0-md5: 66983e60087e8bcd588c8ab38a861af0 +# Source0-md5: 09a6603dadbe06e577e98a2547201fab Source1: zisofs.magic Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source2-md5: c157a183b64156f8baafaefd9cbf04c1 Source3: %{name}-magic.mscompress Patch0: %{name}-debian.patch Patch1: %{name}-sparc.patch -Patch2: %{name}-ia64.patch -Patch3: %{name}-unicode.patch -Patch4: %{name}-dicom.patch -Patch5: %{name}-lmagic.patch -Patch6: %{name}-python2.4.patch -Patch7: %{name}-greedy-dump.patch -Patch8: ftp://ftp.astron.com/pub/file/%{name}-4.14.patch1 +Patch2: %{name}-unicode.patch +Patch3: %{name}-dicom.patch +Patch4: %{name}-lmagic.patch +Patch5: %{name}-python2.4.patch +Patch6: %{name}-greedy-dump.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -253,11 +251,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p0 - -# temporary workaround -touch magic/Magdir/mup %build %{__libtoolize} @@ -357,6 +350,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.108 2005/08/28 20:27:40 qboosh +- updated to 4.15, updated debian patch, removed obsolete ia64,4.14 patches + Revision 1.107 2005/07/19 15:56:26 qboosh - Conflicts: rpm-build < 4.4.1-9 (new .mgc format - needs internal file update in rpm) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/file.spec?r1=1.107&r2=1.108&f=u From paladine at pld-linux.org Sun Aug 28 22:30:49 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: epiphany-1.7.6.tar.bz2 Message-ID: <12086.1125261049@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/epiphany-1.7.6.tar.bz2 f03624c24f021b058136b46fbf54bc31 epiphany-1.7.6.tar.bz2 Size: 3345557 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:30:45 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS (DEVEL): epiphany.spec - updated to 1.7.6 - enabled dbus and... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:30:45 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.6 - enabled dbus and python support ---- Files affected: SPECS: epiphany.spec (1.99.2.10 -> 1.99.2.11) ---- Diffs: ================================================================ Index: SPECS/epiphany.spec diff -u SPECS/epiphany.spec:1.99.2.10 SPECS/epiphany.spec:1.99.2.11 --- SPECS/epiphany.spec:1.99.2.10 Sun Aug 21 11:53:35 2005 +++ SPECS/epiphany.spec Sun Aug 28 22:30:40 2005 @@ -6,12 +6,12 @@ Summary(es): Epiphany - navigador Web de GNOME basado en gecko Summary(pl): Epiphany - przegl?darka WWW dla GNOME Name: epiphany -Version: 1.7.5 +Version: 1.7.6 Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d27b716603b9c36be91430c366077423 +# Source0-md5: f03624c24f021b058136b46fbf54bc31 Patch0: %{name}-first-tab.patch Patch1: %{name}-desktop.patch Patch2: %{name}-mozilla_includes.patch @@ -22,6 +22,7 @@ BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 +BuildRequires: dbus-glib-devel >= 0.34 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gnome-desktop-devel >= 2.10.0-2 BuildRequires: gnome-doc-utils >= 0.3.2-1 @@ -45,8 +46,8 @@ BuildRequires: pango-devel >= 1:1.8.1 BuildRequires: pkgconfig # Requries but python package not present? -#BuildRequires: python-gnome-devel >= 2.6.0 -#BuildRequires: python-pygtk-devel >= 2.6.0 +BuildRequires: python-gnome-devel >= 2.6.0 +BuildRequires: python-pygtk-devel >= 2.6.0 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper Requires(post,preun): GConf2 @@ -113,7 +114,9 @@ %configure \ --disable-schemas-install \ + --enable-dbus \ --enable-gtk-doc \ + --enable-python \ --with-html-dir=%{_gtkdocdir} # CFLAGS is a hack for gcc 3.3 %{__make} \ @@ -179,6 +182,10 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.99.2.11 2005/08/28 20:30:40 paladine +- updated to 1.7.6 +- enabled dbus and python support + Revision 1.99.2.10 2005/08/21 09:53:35 wiget - update to 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.99.2.10&r2=1.99.2.11&f=u From arekm at pld-linux.org Sun Aug 28 22:31:52 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: flumotion-0.1.9.tar.bz2 Message-ID: <13569.1125261112@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.flumotion.net/src/flumotion/flumotion-0.1.9.tar.bz2 7f2b4abbabd7756d1d689b38fd477d3e flumotion-0.1.9.tar.bz2 Size: 655419 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 22:31:47 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: flumotion.spec (NEW) - raw In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 20:31:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - raw ---- Files affected: SPECS: flumotion.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u /dev/null SPECS/flumotion.spec:1.1 --- /dev/null Sun Aug 28 22:31:47 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:31:42 2005 @@ -0,0 +1,57 @@ +# $Revision$, $Date$ +# +Summary: the Fluendo Streaming Server +Name: flumotion +Version: 0.1.9 +Release: 0.1 +License: GPL +Group: Daemons +Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 +# Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e +URL: http://www.flumotion.net/ +BuildRequires: gstreamer-devel >= 0.8 +BuildRequires: python-pygtk-devel >= 2.4.0 +BuildRequires: python-gstreamer >= 0.8.2-1 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Flumotion is a streaming media server created with the backing of +Fluendo. It features intuitive graphical administration tools, making +the task of setting up and manipulating audio and video streams easy +for even novice system administrators. + +%prep +%setup -q + +%build +install %{_datadir}/automake/config.* . +%configure +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver +install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(644,root,root,755) + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team +All persons listed below can be reached at @pld-linux.org + +$Log$ +Revision 1.1 2005/08/28 20:31:42 arekm +- raw + ================================================================ From paladine at pld-linux.org Sun Aug 28 22:32:22 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES (DEVEL): epiphany-extensions-mozilla_includes.patch, epiph... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:32:22 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for 1.7.5 ---- Files affected: SOURCES: epiphany-extensions-mozilla_includes.patch (1.3 -> 1.3.2.1) , epiphany-extensions-locale-names.patch (1.8.2.2 -> 1.8.2.3) ---- Diffs: ================================================================ Index: SOURCES/epiphany-extensions-mozilla_includes.patch diff -u SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 SOURCES/epiphany-extensions-mozilla_includes.patch:1.3.2.1 --- SOURCES/epiphany-extensions-mozilla_includes.patch:1.3 Mon Mar 14 11:37:43 2005 +++ SOURCES/epiphany-extensions-mozilla_includes.patch Sun Aug 28 22:32:16 2005 @@ -1,20 +1,43 @@ -diff -urN aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am 2005-02-08 17:20:49.260647760 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am 2005-08-28 20:49:56.203735032 +0200 ++++ epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am 2005-08-28 22:02:24.092755432 +0200 +@@ -11,6 +11,8 @@ + content \ + docshell \ + dom \ ++ necko \ ++ webbrwsr \ + xpcom + + libadblockmozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:49:56.494690800 +0200 ++++ epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am 2005-08-28 20:56:30.391809336 +0200 +@@ -9,6 +9,7 @@ + content \ + docshell \ + dom \ ++ webbrwsr \ + xpcom + + libautoscrollermozilla_la_CPPFLAGS = \ +diff -urN epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:49:53.852092536 +0200 ++++ epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:54:26.401658704 +0200 @@ -16,7 +16,8 @@ . \ dom \ jsconsole \ - necko -+ necko \ ++ necko \ + webbrwsr liberrorviewermozilla_la_CPPFLAGS = \ -I.. \ -diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2004-12-08 16:33:52.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2005-02-08 17:25:38.975604392 +0100 -@@ -12,6 +12,7 @@ +diff -urN epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am 2005-08-28 20:49:53.625127040 +0200 ++++ epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am 2005-08-28 22:14:59.178964880 +0200 +@@ -14,6 +14,7 @@ layout \ nkcache \ necko \ @@ -22,14 +45,14 @@ uconv \ webbrwsr -diff -urN aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am ---- aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2004-12-08 16:33:53.000000000 +0100 -+++ epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2005-02-08 17:28:31.583364024 +0100 +diff -urN epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am +--- epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:49:55.301872136 +0200 ++++ epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:55:09.807060080 +0200 @@ -6,6 +6,7 @@ mozilla_include_subdirs = \ . \ -+ dom \ ++ dom \ necko \ nkcache \ webbrwsr ================================================================ Index: SOURCES/epiphany-extensions-locale-names.patch diff -u SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 SOURCES/epiphany-extensions-locale-names.patch:1.8.2.3 --- SOURCES/epiphany-extensions-locale-names.patch:1.8.2.2 Wed Jul 27 12:59:25 2005 +++ SOURCES/epiphany-extensions-locale-names.patch Sun Aug 28 22:32:17 2005 @@ -1,8 +1,8 @@ -diff -urN epiphany-extensions-1.7.3.orig/po/LINGUAS epiphany-extensions-1.7.3/po/LINGUAS ---- epiphany-extensions-1.7.3.orig/po/LINGUAS 2005-07-27 12:41:10.176624984 +0200 -+++ epiphany-extensions-1.7.3/po/LINGUAS 2005-07-27 12:41:54.018959936 +0200 +diff -urN epiphany-extensions-1.7.5.orig/po/LINGUAS epiphany-extensions-1.7.5/po/LINGUAS +--- epiphany-extensions-1.7.5.orig/po/LINGUAS 2005-08-28 19:21:04.768236424 +0200 ++++ epiphany-extensions-1.7.5/po/LINGUAS 2005-08-28 19:21:40.660779928 +0200 @@ -1,3 +1,3 @@ # please keep this list sorted alphabetically # --bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW -+bg ca cs da de el en_CA en_GB es fi fr hr hu it ja ko lt ne nb nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW +-bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ++bg ca cs da de el en_CA en_GB es fi fr gl hr hu it ja ko lt nb ne nl pa pl pt pt_BR ru rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/epiphany-extensions-mozilla_includes.patch?r1=1.3&r2=1.3.2.1&f=u http://cvs.pld-linux.org/SOURCES/epiphany-extensions-locale-names.patch?r1=1.8.2.2&r2=1.8.2.3&f=u From paladine at pld-linux.org Sun Aug 28 22:33:36 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: epiphany-extensions-1.7.5.tar.bz2 Message-ID: <16361.1125261216@distfiles.pld-linux.org> Files fetched: 1 STORED: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/epiphany-extensions-1.7.5.tar.bz2 ff01cb95c6348501fbd69c4203147204 epiphany-extensions-1.7.5.tar.bz2 Size: 606693 bytes -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 22:33:33 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - updated to 1.7.5 - updat... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 20:33:33 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.7.5 - updated patches - it's DEVEL, so lets enable really all extensions ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.6 -> 1.37.2.7) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.6 SPECS/epiphany-extensions.spec:1.37.2.7 --- SPECS/epiphany-extensions.spec:1.37.2.6 Mon Aug 22 21:38:11 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 22:33:28 2005 @@ -5,18 +5,18 @@ Summary: Collection of extensions for Epiphany Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions -Version: 1.7.4 -Release: 3 +Version: 1.7.5 +Release: 1 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 -# Source0-md5: d175f0747254595d369aa75baa64a0a4 +# Source0-md5: ff01cb95c6348501fbd69c4203147204 Patch0: %{name}-locale-names.patch Patch1: %{name}-mozilla_includes.patch URL: http://www.gnome.org/projects/epiphany/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -BuildRequires: epiphany-devel >= 1.7.5 +BuildRequires: epiphany-devel >= 1.7.6 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk+2-devel >= 2:2.6.4 BuildRequires: intltool >= 0.33 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=all + --with-extensions=really-all %{__make} %install @@ -94,6 +94,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.7 2005/08/28 20:33:28 paladine +- updated to 1.7.5 +- updated patches +- it's DEVEL, so lets enable really all extensions + Revision 1.37.2.6 2005/08/22 19:38:11 paladine - rel. 3 for epiphany 1.7.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.6&r2=1.37.2.7&f=u From darekr at pld-linux.org Sun Aug 28 22:37:09 2005 From: darekr at pld-linux.org (darekr) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: flumotion.spec - BR: automake; unify In-Reply-To: References: Message-ID: Author: darekr Date: Sun Aug 28 20:37:09 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - BR: automake; unify ---- Files affected: SPECS: flumotion.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.1 SPECS/flumotion.spec:1.2 --- SPECS/flumotion.spec:1.1 Sun Aug 28 22:31:42 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:37:03 2005 @@ -9,6 +9,7 @@ Source0: http://www.flumotion.net/src/flumotion/%{name}-%{version}.tar.bz2 # Source0-md5: 7f2b4abbabd7756d1d689b38fd477d3e URL: http://www.flumotion.net/ +BuildRequires: automake BuildRequires: gstreamer-devel >= 0.8 BuildRequires: python-pygtk-devel >= 2.4.0 BuildRequires: python-gstreamer >= 0.8.2-1 @@ -24,7 +25,7 @@ %setup -q %build -install %{_datadir}/automake/config.* . +install /usr/share/automake/config.* . %configure %{__make} @@ -52,6 +53,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.2 2005/08/28 20:37:03 darekr +- BR: automake; unify + Revision 1.1 2005/08/28 20:31:42 arekm - raw ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.1&r2=1.2&f=u From qboosh at pld-linux.org Sun Aug 28 22:44:10 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: flumotion.spec - pl, some files In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 20:44:10 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - pl, some files ---- Files affected: SPECS: flumotion.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SPECS/flumotion.spec diff -u SPECS/flumotion.spec:1.2 SPECS/flumotion.spec:1.3 --- SPECS/flumotion.spec:1.2 Sun Aug 28 22:37:03 2005 +++ SPECS/flumotion.spec Sun Aug 28 22:44:05 2005 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -# -Summary: the Fluendo Streaming Server +Summary: The Fluendo Streaming Server +Summary(pl): Serwer strumieni Fluendo Name: flumotion Version: 0.1.9 Release: 0.1 @@ -21,6 +21,12 @@ the task of setting up and manipulating audio and video streams easy for even novice system administrators. +%description -l pl +Flumotion to serwer strumieni multimedialnych stworzony przy poparciu +Fluendo. Ma intuicyjne graficzne narz?dzia administracyjne, czyni?ce +zadanie konfiguracji i obr?bki strumieni d?wi?ku i obrazu ?atwym nawet +dla pocz?tkuj?cych administrator?w system?w. + %prep %setup -q @@ -46,6 +52,8 @@ %files %defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/ffserver +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -53,9 +61,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2005/08/28 20:44:05 qboosh +- pl, some files + Revision 1.2 2005/08/28 20:37:03 darekr - BR: automake; unify Revision 1.1 2005/08/28 20:31:42 arekm - raw - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flumotion.spec?r1=1.2&r2=1.3&f=u From twittner at pld-linux.org Sun Aug 28 22:59:06 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: vdkbuilder.desktop (NEW) - desktop file for vdkbuilder In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:05 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - desktop file for vdkbuilder ---- Files affected: SOURCES: vdkbuilder.desktop (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/vdkbuilder.desktop diff -u /dev/null SOURCES/vdkbuilder.desktop:1.1 --- /dev/null Sun Aug 28 22:59:05 2005 +++ SOURCES/vdkbuilder.desktop Sun Aug 28 22:59:00 2005 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=VDK Builder IDE +Comment=VDK Builder IDE +Icon=vdkb2.png +Exec=vdkb2 +Terminal=false +Type=Application +Categories=GTK2;Development;IDE; +Encoding=UTF-8 +# vi: encoding=utf-8 ================================================================ From twittner at pld-linux.org Sun Aug 28 22:59:37 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: vdkbuilder.spec - added tutorial and desktop file In-Reply-To: References: Message-ID: Author: twittner Date: Sun Aug 28 20:59:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - added tutorial and desktop file ---- Files affected: SPECS: vdkbuilder.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/vdkbuilder.spec diff -u SPECS/vdkbuilder.spec:1.15 SPECS/vdkbuilder.spec:1.16 --- SPECS/vdkbuilder.spec:1.15 Sun Aug 28 02:26:44 2005 +++ SPECS/vdkbuilder.spec Sun Aug 28 22:59:32 2005 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +%define _tutver 1.1 Summary: A general purpose ide for constructing gui applications using VDK Summary(pl): IDE do konstruowania aplikacji graficznych u?ywaj?cych VDK Name: vdkbuilder @@ -8,6 +9,9 @@ Group: Development/Tools Source0: http://dl.sourceforge.net/vdkbuilder/%{name}2-%{version}.tar.gz # Source0-md5: 91216ce6659e447862b2bdc7335074fc +Source1: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-%{_tutver}.pdf.gz +# Source1-md5: 06d2e9b1dab6bec28d7ea3b6819dfb67 +Source2: %{name}.desktop Patch0: %{name}-ac_FLAGS.patch URL: http://vdkbuilder.sourceforge.net/ BuildRequires: autoconf @@ -60,6 +64,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install %{SOURCE1} . +install -D %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -68,10 +75,11 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello +%doc AUTHORS BUGS ChangeLog NEWS README TODO example/nls_HOWTO* example/hello vdktutorial-%{_tutver}.pdf.gz %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so* %{_mandir}/man1/* +%{_desktopdir}/%{name}.desktop %{_pixmapsdir}/*.png %{_datadir}/vdkb2 @@ -86,6 +94,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.16 2005/08/28 20:59:32 twittner +- added tutorial and desktop file + Revision 1.15 2005/08/28 00:26:44 twittner - up to 2.4.0 - added -ac_FLAGS.patch (don't introduce own flags - honor ordinary ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/vdkbuilder.spec?r1=1.15&r2=1.16&f=u From qboosh at pld-linux.org Sun Aug 28 23:02:06 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SOURCES: libfpx-fix.patch (REMOVED) - obsolete In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:06 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - obsolete ---- Files affected: SOURCES: libfpx-fix.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ From twittner at pld-linux.org Sun Aug 28 23:02:41 2005 From: twittner at pld-linux.org (twittner) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: vdkbuilder2-2.4.0.tar.gz vdktutorial-1.1.pdf.gz Message-ID: <19782.1125262961@distfiles.pld-linux.org> Files fetched: 1 ALREADY GOT: http://dl.sourceforge.net/vdkbuilder/vdkbuilder2-2.4.0.tar.gz 91216ce6659e447862b2bdc7335074fc vdkbuilder2-2.4.0.tar.gz STORED: http://kent.dl.sourceforge.net/sourceforge/vdkbuilder/vdktutorial-1.1.pdf.gz 06d2e9b1dab6bec28d7ea3b6819dfb67 vdktutorial-1.1.pdf.gz Size: 1602382 bytes -- Virtually Yours: distfiles. From qboosh at pld-linux.org Sun Aug 28 23:02:46 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: libfpx.spec - updated to 1.2.0.13, removed obsolete fix patch In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:02:46 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.2.0.13, removed obsolete fix patch ---- Files affected: SPECS: libfpx.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/libfpx.spec diff -u SPECS/libfpx.spec:1.36 SPECS/libfpx.spec:1.37 --- SPECS/libfpx.spec:1.36 Wed Jun 15 23:39:26 2005 +++ SPECS/libfpx.spec Sun Aug 28 23:02:40 2005 @@ -1,19 +1,19 @@ # $Revision$, $Date$ +# # Conditional build: %bcond_without static_libs # don't build static library # Summary: FlashPIX OpenSource Toolkit Summary(pl): Biblioteka do obr?bki obrazk?w FlashPIX Name: libfpx -Version: 1.2.0.12 +Version: 1.2.0.13 Release: 1 License: distributable (see COPYING) Group: Libraries # Strange... [URL] says you can order it (for money) and doesn't contain any # link, but sources can be freely redistributed. Can be found on any IM mirror. Source0: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/%{name}-%{version}.tar.bz2 -# Source0-md5: a82d33cc0ede71752802da0f410398b8 -Patch0: %{name}-fix.patch +# Source0-md5: 5e781a17ec96e8f9af8c2ff319e8d706 URL: http://www.i3a.org/i_flashpix.html BuildRequires: autoconf >= 2.55 BuildRequires: automake >= 1:1.9 @@ -62,7 +62,6 @@ %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -110,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37 2005/08/28 21:02:40 qboosh +- updated to 1.2.0.13, removed obsolete fix patch + Revision 1.36 2005/06/15 21:39:26 witekfl - added bcond_without static_libs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libfpx.spec?r1=1.36&r2=1.37&f=u From qboosh at pld-linux.org Sun Aug 28 23:09:02 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: libfpx-1.2.0.13.tar.bz2 Message-ID: <24114.1125263342@distfiles.pld-linux.org> Files fetched: 1 STORED: ftp://ftp.simplesystems.org/pub/ImageMagick/delegates/libfpx-1.2.0.13.tar.bz2 5e781a17ec96e8f9af8c2ff319e8d706 libfpx-1.2.0.13.tar.bz2 Size: 2259745 bytes -- Virtually Yours: distfiles. From arekm at pld-linux.org Sun Aug 28 23:14:27 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: aspell-pl-alt.spec - up to 20050828 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:14:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 20050828 ---- Files affected: SPECS: aspell-pl-alt.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/aspell-pl-alt.spec diff -u SPECS/aspell-pl-alt.spec:1.43 SPECS/aspell-pl-alt.spec:1.44 --- SPECS/aspell-pl-alt.spec:1.43 Mon Jul 25 11:44:45 2005 +++ SPECS/aspell-pl-alt.spec Sun Aug 28 23:14:21 2005 @@ -2,12 +2,12 @@ Summary: An alternative Polish dictionary for aspell by kurnik.pl Summary(pl): Alternatywny polski s?ownik dla aspella autorstwa kurnik.pl Name: aspell-pl-alt -Version: 20050725 +Version: 20050828 Release: 1 License: Creative Commons License (see legalcode.html) Group: Applications/Text Source0: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-%{version}.tar.bz2 -# Source0-md5: f48c44862fa9da9c9d109034702ab43c +# Source0-md5: 5d4b6fe220492e79290d64f27a0204ae Source1: http://creativecommons.org/licenses/sa/1.0/legalcode # Source1-md5: 0ed76e90db3d98d93cf6f7a610c10f77 Patch0: %{name}-configure.patch @@ -64,6 +64,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.44 2005/08/28 21:14:21 arekm +- up to 20050828 + Revision 1.43 2005/07/25 09:44:45 blekot - up to 20050725 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/aspell-pl-alt.spec?r1=1.43&r2=1.44&f=u From arekm at pld-linux.org Sun Aug 28 23:14:30 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: alt-aspell-pl-20050828.tar.bz2 legalcode Message-ID: <7759.1125263670@distfiles.pld-linux.org> Files fetched: 1 STORED: http://www.kurnik.pl/slownik/ort/alt-aspell-pl-20050828.tar.bz2 5d4b6fe220492e79290d64f27a0204ae alt-aspell-pl-20050828.tar.bz2 Size: 653409 bytes ALREADY GOT: http://creativecommons.org/licenses/sa/1.0/legalcode 0ed76e90db3d98d93cf6f7a610c10f77 legalcode -- Virtually Yours: distfiles. From paladine at pld-linux.org Sun Aug 28 23:35:31 2005 From: paladine at pld-linux.org (paladine) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS (DEVEL): epiphany-extensions.spec - disable adblock (epiphan... In-Reply-To: References: Message-ID: Author: paladine Date: Sun Aug 28 21:35:31 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - disable adblock (epiphany craches on exit) - disable net-monitor (experimental) - disable sample extensions - disable tabsmenu (doesn't work) - disable greasemonkey - rel. 2 ---- Files affected: SPECS: epiphany-extensions.spec (1.37.2.7 -> 1.37.2.8) ---- Diffs: ================================================================ Index: SPECS/epiphany-extensions.spec diff -u SPECS/epiphany-extensions.spec:1.37.2.7 SPECS/epiphany-extensions.spec:1.37.2.8 --- SPECS/epiphany-extensions.spec:1.37.2.7 Sun Aug 28 22:33:28 2005 +++ SPECS/epiphany-extensions.spec Sun Aug 28 23:35:22 2005 @@ -6,7 +6,7 @@ Summary(pl): Zbi?r rozszerze? dla Epiphany Name: epiphany-extensions Version: 1.7.5 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.7/%{name}-%{version}.tar.bz2 @@ -64,7 +64,7 @@ %{__autoconf} %{__automake} %configure \ - --with-extensions=really-all + --with-extensions=all,rss %{__make} %install @@ -94,6 +94,14 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.37.2.8 2005/08/28 21:35:22 paladine +- disable adblock (epiphany craches on exit) +- disable net-monitor (experimental) +- disable sample extensions +- disable tabsmenu (doesn't work) +- disable greasemonkey +- rel. 2 + Revision 1.37.2.7 2005/08/28 20:33:28 paladine - updated to 1.7.5 - updated patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.37.2.7&r2=1.37.2.8&f=u From qboosh at pld-linux.org Sun Aug 28 23:52:11 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: crossalpha-binutils.spec - updated to 2.16.91.0.3 (2.16.91.... In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:52:11 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) ---- Files affected: SPECS: crossalpha-binutils.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/crossalpha-binutils.spec diff -u SPECS/crossalpha-binutils.spec:1.18 SPECS/crossalpha-binutils.spec:1.19 --- SPECS/crossalpha-binutils.spec:1.18 Thu Jul 28 21:07:52 2005 +++ SPECS/crossalpha-binutils.spec Sun Aug 28 23:52:05 2005 @@ -6,12 +6,12 @@ Summary(pt_BR): Utilit?rios para desenvolvimento de bin?rios da GNU - ALPHA binutils Summary(tr): GNU geli?tirme ara?lar? - ALPHA binutils Name: crossalpha-binutils -Version: 2.16.91.0.2 +Version: 2.16.91.0.3 Release: 1 License: GPL Group: Development/Tools Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -# Source0-md5: bf01e3151b4cd74f2d52871fbc297215 +# Source0-md5: c737a5787927f60758b4960f10e44f93 URL: http://sources.redhat.com/binutils/ BuildRequires: automake BuildRequires: bash @@ -111,6 +111,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2005/08/28 21:52:05 qboosh +- updated to 2.16.91.0.3 (2.16.91.0.2 had alpha target broken) + Revision 1.18 2005/07/28 19:07:52 pluto - updated to 2.16.91.0.2. @@ -166,4 +169,3 @@ Revision 1.1 2004/06/12 10:57:11 ankry - initial - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/crossalpha-binutils.spec?r1=1.18&r2=1.19&f=u From arekm at pld-linux.org Sun Aug 28 23:52:55 2005 From: arekm at pld-linux.org (arekm) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: openclipart.spec - rel 1 In-Reply-To: References: Message-ID: Author: arekm Date: Sun Aug 28 21:52:55 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 1 ---- Files affected: SPECS: openclipart.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/openclipart.spec diff -u SPECS/openclipart.spec:1.5 SPECS/openclipart.spec:1.6 --- SPECS/openclipart.spec:1.5 Sat Aug 13 13:28:00 2005 +++ SPECS/openclipart.spec Sun Aug 28 23:52:50 2005 @@ -3,7 +3,7 @@ Summary(pl): Archiwum klipart?w, kt?re mo?na u?ywa? w dowolny spos?b za darmo Name: openclipart Version: 0.16 -Release: 0.1 +Release: 1 Epoch: 0 License: Creative Commons and/or Public Domain Group: Applications/Graphics @@ -122,6 +122,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2005/08/28 21:52:50 arekm +- rel 1 + Revision 1.5 2005/08/13 11:28:00 qboosh - Obsoletes for dropped subpackages ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openclipart.spec?r1=1.5&r2=1.6&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:07 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: SPECS: inkscape.spec - updated to 0.42.2 In-Reply-To: References: Message-ID: Author: qboosh Date: Sun Aug 28 21:58:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.42.2 ---- Files affected: SPECS: inkscape.spec (1.39 -> 1.40) ---- Diffs: ================================================================ Index: SPECS/inkscape.spec diff -u SPECS/inkscape.spec:1.39 SPECS/inkscape.spec:1.40 --- SPECS/inkscape.spec:1.39 Sun Jul 31 14:05:45 2005 +++ SPECS/inkscape.spec Sun Aug 28 23:58:00 2005 @@ -9,31 +9,33 @@ Summary: Scalable vector graphics editor Summary(pl): Edytor skalowalnej grafiki wektorowej Name: inkscape -Version: 0.42 -Release: 2 +Version: 0.42.2 +Release: 1 License: GPL v2, LGPL v2.1 Group: Applications/Graphics Source0: http://dl.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# Source0-md5: 4af587b942647bf9e27861e2238844c8 +# Source0-md5: a27172087018e850e92e97e52b5dad08 URL: http://www.inkscape.org/ BuildRequires: autoconf >= 2.59-3 BuildRequires: automake >= 1:1.9.4-2 BuildRequires: freetype-devel >= 2.0 BuildRequires: gc-devel >= 6.4 +BuildRequires: gcc-c++ >= 3.0 BuildRequires: gtk+2-devel >= 2:2.4.0 BuildRequires: gtkmm-devel >= 2.4 -BuildRequires: gtkspell-devel -BuildRequires: intltool +BuildRequires: gtkspell-devel >= 2.0 +BuildRequires: intltool >= 0.22 BuildRequires: libart_lgpl-devel >= 2.3.10 %{?with_gnome_print:BuildRequires: libgnomeprintui-devel >= 1.116.0} -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 1.2 BuildRequires: libsigc++-devel >= 2.0.3 BuildRequires: libtool -BuildRequires: libxml2-devel >= 2.4.24 +BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: libxslt-devel >= 1.0.15 BuildRequires: pkgconfig BuildRequires: popt-devel %{?with_xft:BuildRequires: xft-devel} +BuildRequires: zlib-devel Requires(post,postun): shared-mime-info Requires: gc >= 6.4 Requires: gtk+2 >= 2:2.4.0 @@ -116,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.40 2005/08/28 21:58:00 qboosh +- updated to 0.42.2 + Revision 1.39 2005/07/31 12:05:45 wolf - fix extensions - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/inkscape.spec?r1=1.39&r2=1.40&f=u From qboosh at pld-linux.org Sun Aug 28 23:58:30 2005 From: qboosh at pld-linux.org (qboosh) Date: Tue Dec 20 10:39:42 2005 Subject: DISTFILES: inkscape-0.42.2.tar.bz2 Message-ID: <19635.1125266310@distfiles.pld-linux.org> Files fetched: 1 STORED: http://dl.sourceforge.net/inkscape/inkscape-0.42.2.tar.bz2 a27172087018e850e92e97e52b5dad08 inkscape-0.42.2.tar.bz2 Size: 5724173 bytes -- Virtually Yours: distfiles.